commit_id,project,commit_message,type,url,git_diff
84ff885f72d1ec8228407b6cdc9c09d342b5a0dc,kotlin,Constructor body generation extracted as a method- (+ migrated to Printer for convenience)--,p,https://github.com/JetBrains/kotlin,"diff --git a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
index 6fc139585610e..a0af388cecfbc 100644
--- a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
+++ b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
@@ -16,15 +16,13 @@
 
 package org.jetbrains.jet.di;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.*;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.utils.Printer;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -281,70 +279,80 @@ private static DiType getEffectiveFieldType(Field field) {
     }
 
     private void generateConstructor(String injectorClassName, PrintStream out) {
-        String indent = ""        "";
+        Printer p = new Printer(out);
+        p.pushIndent();
 
         // Constructor parameters
         if (parameters.isEmpty()) {
-            out.println(""    public "" + injectorClassName + ""() {"");
+            p.println(""public "", injectorClassName, ""() {"");
         }
         else {
-            out.println(""    public "" + injectorClassName + ""("");
+            p.println(""public "", injectorClassName, ""("");
+            p.pushIndent();
             for (Iterator<Parameter> iterator = parameters.iterator(); iterator.hasNext(); ) {
                 Parameter parameter = iterator.next();
-                out.print(indent);
+                p.print(); // indent
                 if (parameter.isRequired()) {
-                    out.print(""@NotNull "");
+                    p.printWithNoIndent(""@NotNull "");
                 }
-                out.print(parameter.getType().getSimpleName() + "" "" + parameter.getName());
+                p.printWithNoIndent(parameter.getType().getSimpleName(), "" "", parameter.getName());
                 if (iterator.hasNext()) {
-                    out.println("","");
+                    p.printlnWithNoIndent("","");
                 }
             }
-            out.println();
-            out.println(""    ) {"");
+            p.printlnWithNoIndent();
+            p.popIndent();
+            p.println("") {"");
         }
 
+        p.pushIndent();
         if (lazy) {
             // Remember parameters
             for (Parameter parameter : parameters) {
-                out.println(indent + ""this."" + parameter.getField().getName() + "" = "" + parameter.getName() + "";"");
+                p.println(""this."", parameter.getField().getName(), "" = "", parameter.getName(), "";"");
             }
         }
         else {
-            // Initialize fields
-            for (Field field : fields) {
-                //if (!backsParameter.contains(field) || field.isPublic()) {
-                    String prefix = ""this."";
-                    out.println(indent + prefix + field.getName() + "" = "" + field.getInitialization().renderAsCode() + "";"");
-                //}
-            }
-            out.println();
+            generateInitializingCode(p, fields);
+        }
 
-            // Call setters
-            for (Field field : fields) {
-                for (SetterDependency dependency : field.getDependencies()) {
-                    String prefix = field.isPublic() ? ""this."" : """";
-                    out.println(indent + prefix + dependency.getDependent().getName() + ""."" + dependency.getSetterName() + ""("" + dependency.getDependency().getName() + "");"");
-                }
-                if (!field.getDependencies().isEmpty()) {
-                    out.println();
-                }
-            }
+        p.popIndent();
+        p.println(""}"");
+    }
 
-            // call @PostConstruct
-            for (Field field : fields) {
-                // TODO: type of field may be different from type of object
-                List<Method> postConstructMethods = getPostConstructMethods(getEffectiveFieldType(field).getClazz());
-                for (Method postConstruct : postConstructMethods) {
-                    out.println(indent + field.getName() + ""."" + postConstruct.getName() + ""();"");
-                }
-                if (postConstructMethods.size() > 0) {
-                    out.println();
-                }
+    private static void generateInitializingCode(@NotNull Printer p, @NotNull Collection<Field> fields) {
+        // Initialize fields
+        for (Field field : fields) {
+            //if (!backsParameter.contains(field) || field.isPublic()) {
+            p.println(""this."", field.getName(), "" = "", field.getInitialization().renderAsCode(), "";"");
+            //}
+        }
+        p.printlnWithNoIndent();
+
+        // Call setters
+        for (Field field : fields) {
+            for (SetterDependency dependency : field.getDependencies()) {
+                String prefix = field.isPublic() ? ""this."" : """";
+                String dependencyName = dependency.getDependency().getName();
+                String dependentName = dependency.getDependent().getName();
+                p.println(prefix, dependentName, ""."", dependency.getSetterName(), ""("", dependencyName, "");"");
+            }
+            if (!field.getDependencies().isEmpty()) {
+                p.printlnWithNoIndent();
             }
         }
 
-        out.println(""    }"");
+        // call @PostConstruct
+        for (Field field : fields) {
+            // TODO: type of field may be different from type of object
+            List<Method> postConstructMethods = getPostConstructMethods(getEffectiveFieldType(field).getClazz());
+            for (Method postConstruct : postConstructMethods) {
+                p.println(field.getName(), ""."", postConstruct.getName(), ""();"");
+            }
+            if (postConstructMethods.size() > 0) {
+                p.printlnWithNoIndent();
+            }
+        }
     }
 
     private static List<Method> getPostConstructMethods(Class<?> clazz) {"
e0e1bdf57aa4f1dae1de5b7a51b58fad1fd4696b,brandonborkholder$glg2d,Abstracted some of the init/tear-down functionality to make it easier to customize.,p,https://github.com/brandonborkholder/glg2d,"diff --git a/src/main/java/glg2d/G2DGLCanvas.java b/src/main/java/glg2d/G2DGLCanvas.java
index 33a0d734..db9405a2 100644
--- a/src/main/java/glg2d/G2DGLCanvas.java
+++ b/src/main/java/glg2d/G2DGLCanvas.java
@@ -107,7 +107,7 @@ public boolean isGLDrawing() {
   /**
    * Sets the drawing path, {@code true} for OpenGL, {@code false} for normal
    * Java2D.
-   *
+   * 
    * @see #isGLDrawing()
    */
   public void setGLDrawing(boolean drawGL) {
@@ -131,12 +131,20 @@ public void setDrawableComponent(JComponent component) {
 
     drawableComponent = component;
     if (drawableComponent != null) {
-      g2dglListener = new G2DGLEventListener(drawableComponent);
+      g2dglListener = createG2DListener(drawableComponent);
       canvas.addGLEventListener(g2dglListener);
       add(drawableComponent);
     }
   }
 
+  /**
+   * Creates the GLEventListener that will draw the given component to the
+   * canvas.
+   */
+  protected GLEventListener createG2DListener(JComponent drawingComponent) {
+    return new G2DGLEventListener(drawingComponent);
+  }
+
   public JComponent getDrawableComponent() {
     return drawableComponent;
   }
diff --git a/src/main/java/glg2d/G2DGLEventListener.java b/src/main/java/glg2d/G2DGLEventListener.java
index bcb48139..c5e0c74f 100644
--- a/src/main/java/glg2d/G2DGLEventListener.java
+++ b/src/main/java/glg2d/G2DGLEventListener.java
@@ -18,7 +18,9 @@
 
 import java.awt.Component;
 
+import javax.media.opengl.GL;
 import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLContext;
 import javax.media.opengl.GLEventListener;
 import javax.swing.RepaintManager;
 
@@ -36,7 +38,7 @@ public class G2DGLEventListener implements GLEventListener {
    * {@code baseComponent} is used to provide default font, backgroundColor,
    * etc. to the {@code GLGraphics2D} object. It is also used for width, height
    * of the viewport in OpenGL.
-   *
+   * 
    * @param baseComponent
    *          The component to use for default settings.
    */
@@ -47,9 +49,73 @@ public G2DGLEventListener(Component baseComponent) {
   @Override
   public void display(GLAutoDrawable drawable) {
     g2d.setCanvas(drawable);
-    g2d.prePaint(baseComponent);
+    prePaint(drawable.getContext());
     paintGL(g2d);
+    postPaint(drawable.getContext());
+  }
+
+  /**
+   * Called after the canvas is set on {@code g2d} but before any painting is
+   * done. This should setup the matrices and ask {@code g2d} to setup any
+   * client state.
+   */
+  protected void prePaint(GLContext context) {
+    setupMatrices(context);
+    g2d.prePaint(baseComponent);
+  }
+
+  /**
+   * Sets up the three matrices, including the transform from OpenGL coordinate
+   * system to Java2D coordinates.
+   */
+  protected void setupMatrices(GLContext context) {
+    GL gl = context.getGL();
+
+    // push all the matrices
+    gl.glMatrixMode(GL.GL_PROJECTION);
+    gl.glPushMatrix();
+
+    int width = baseComponent.getWidth();
+    int height = baseComponent.getHeight();
+
+    // and setup the viewport
+    gl.glViewport(0, 0, width, height);
+    gl.glLoadIdentity();
+    gl.glOrtho(0, width, 0, height, -1, 1);
+
+    gl.glMatrixMode(GL.GL_MODELVIEW);
+    gl.glPushMatrix();
+    gl.glLoadIdentity();
+
+    // do the transform from Graphics2D coords to openGL coords
+    gl.glTranslatef(0, height, 0);
+    gl.glScalef(1, -1, 1);
+
+    gl.glMatrixMode(GL.GL_TEXTURE);
+    gl.glPushMatrix();
+    gl.glLoadIdentity();
+  }
+
+  /**
+   * Called after all Java2D painting is complete. This should restore the
+   * matrices if they were modified.
+   */
+  protected void postPaint(GLContext context) {
     g2d.postPaint();
+    popMatrices(context);
+  }
+
+  /**
+   * Pops all the matrices.
+   */
+  protected void popMatrices(GLContext context) {
+    GL gl = context.getGL();
+    gl.glMatrixMode(GL.GL_MODELVIEW);
+    gl.glPopMatrix();
+    gl.glMatrixMode(GL.GL_PROJECTION);
+    gl.glPopMatrix();
+    gl.glMatrixMode(GL.GL_TEXTURE);
+    gl.glPopMatrix();
   }
 
   /**
diff --git a/src/main/java/glg2d/GLGraphics2D.java b/src/main/java/glg2d/GLGraphics2D.java
index 324c3ed3..f3d4e437 100644
--- a/src/main/java/glg2d/GLGraphics2D.java
+++ b/src/main/java/glg2d/GLGraphics2D.java
@@ -131,37 +131,9 @@ protected void prePaint(Component component) {
     gl.glDisable(GL.GL_CULL_FACE);
     gl.glShadeModel(GL.GL_FLAT);
     gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
-
-    // push all the matrices
-    gl.glMatrixMode(GL.GL_PROJECTION);
-    gl.glPushMatrix();
-
-    // and setup the viewport
-    gl.glViewport(0, 0, width, height);
-    gl.glLoadIdentity();
-    gl.glOrtho(0, width, 0, height, -1, 1);
-
-    gl.glMatrixMode(GL.GL_MODELVIEW);
-    gl.glPushMatrix();
-    gl.glLoadIdentity();
-
-    // do the transform from Graphics2D coords to openGL coords
-    gl.glTranslatef(0, height, 0);
-    gl.glScalef(1, -1, 1);
-
-    gl.glMatrixMode(GL.GL_TEXTURE);
-    gl.glPushMatrix();
-    gl.glLoadIdentity();
   }
 
   protected void postPaint() {
-    gl.glMatrixMode(GL.GL_MODELVIEW);
-    gl.glPopMatrix();
-    gl.glMatrixMode(GL.GL_PROJECTION);
-    gl.glPopMatrix();
-    gl.glMatrixMode(GL.GL_TEXTURE);
-    gl.glPopMatrix();
-
     gl.glPopClientAttrib();
     gl.glPopAttrib();
     gl.glFlush();"
4cc637f7b8b94f0cd1a97a6b618e333e7ef4d525,mctcp$terraincontrol,"Refactor CustomObjects and Resources
There are now CustomObjects, and all BO2 are a CustomObject. UseWorld
and UseBiome are also CustomObjects. Even all trees are now a
CustomObject.
All resources now inherit Resource. All settings don't have to be stored
in a generic Resource object, but they are stored in the resource
itself. This allow for more flexibility.
Plugin developers can now add their own CustomObjects and Resources.
",p,https://github.com/mctcp/terraincontrol,"diff --git a/bukkit/src/com/khorn/terraincontrol/bukkit/TCListener.java b/bukkit/src/com/khorn/terraincontrol/bukkit/TCListener.java
index bbc001aae..9e5d29205 100644
--- a/bukkit/src/com/khorn/terraincontrol/bukkit/TCListener.java
+++ b/bukkit/src/com/khorn/terraincontrol/bukkit/TCListener.java
@@ -12,20 +12,15 @@
 import org.bukkit.event.world.WorldInitEvent;
 
 import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
-import com.khorn.terraincontrol.generator.resourcegens.TreeGen;
+import com.khorn.terraincontrol.generator.resourcegens.SaplingGen;
 
 public class TCListener implements Listener
 {
     private TCPlugin tcPlugin;
-    private Random random;
-
-    private TreeGen treeGenerator = new TreeGen();
 
     public TCListener(TCPlugin plugin)
     {
         this.tcPlugin = plugin;
-        this.random = new Random();
         Bukkit.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
@@ -51,7 +46,7 @@ public void onStructureGrow(StructureGrowEvent event)
             return;
 
         BiomeConfig biomeConfig = bukkitWorld.getSettings().biomeConfigs[biomeId];
-        Resource sapling;
+        SaplingGen sapling;
 
         switch (event.getSpecies())
         {
@@ -76,8 +71,25 @@ public void onStructureGrow(StructureGrowEvent event)
 
         if (sapling != null)
         {
-            treeGenerator.SpawnTree(bukkitWorld, this.random, sapling, x, y, z);
-            event.getBlocks().clear();
+            boolean success = false;
+            for(int i = 0; i < bukkitWorld.getSettings().objectSpawnRatio; i++)
+            {
+                if(sapling.growSapling(bukkitWorld, new Random(), x, y, z)) 
+                {
+                    success = true;
+                    break;
+                }
+            }
+                
+            if(success)
+            {
+                // Just spawned the tree, clear the blocks list to prevent Bukkit spawning another tree
+                event.getBlocks().clear();
+            } else
+            {
+                // Cannot grow, so leave the sapling there
+                event.setCancelled(true);
+            }
         }
     }
 
diff --git a/bukkit/src/com/khorn/terraincontrol/bukkit/TCPlugin.java b/bukkit/src/com/khorn/terraincontrol/bukkit/TCPlugin.java
index 030e4dfb0..e309e4e64 100644
--- a/bukkit/src/com/khorn/terraincontrol/bukkit/TCPlugin.java
+++ b/bukkit/src/com/khorn/terraincontrol/bukkit/TCPlugin.java
@@ -6,7 +6,7 @@
 import com.khorn.terraincontrol.bukkit.commands.TCCommandExecutor;
 import com.khorn.terraincontrol.configuration.TCDefaultValues;
 import com.khorn.terraincontrol.configuration.WorldConfig;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
+import com.khorn.terraincontrol.customobjects.BODefaultValues;
 import com.khorn.terraincontrol.util.Txt;
 import net.minecraft.server.BiomeBase;
 import org.bukkit.Bukkit;
@@ -50,8 +50,6 @@ public void onEnable()
 
         this.listener = new TCListener(this);
 
-        ObjectsStore.ReadObjects(this.getDataFolder());
-
         Bukkit.getMessenger().registerOutgoingPluginChannel(this, TCDefaultValues.ChannelName.stringValue());
 
         TerrainControl.log(""Enabled"");
@@ -185,4 +183,10 @@ public LocalWorld getWorld(String name)
         }
         return this.worlds.get(world.getUID());
     }
+
+    @Override
+    public File getGlobalObjectsDirectory()
+    {
+        return new File(this.getDataFolder(), BODefaultValues.BO_GlobalDirectoryName.stringValue());
+    }
 }
\ No newline at end of file
diff --git a/bukkit/src/com/khorn/terraincontrol/bukkit/commands/ListCommand.java b/bukkit/src/com/khorn/terraincontrol/bukkit/commands/ListCommand.java
index c8efffcff..bce1ac038 100644
--- a/bukkit/src/com/khorn/terraincontrol/bukkit/commands/ListCommand.java
+++ b/bukkit/src/com/khorn/terraincontrol/bukkit/commands/ListCommand.java
@@ -1,93 +1,91 @@
-package com.khorn.terraincontrol.bukkit.commands;
-
-import com.khorn.terraincontrol.bukkit.BukkitWorld;
-import com.khorn.terraincontrol.bukkit.TCPerm;
-import com.khorn.terraincontrol.bukkit.TCPlugin;
-import com.khorn.terraincontrol.customobjects.CustomObject;
-import com.khorn.terraincontrol.customobjects.CustomObjectCompiled;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
-import org.bukkit.command.CommandSender;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ListCommand extends BaseCommand
-{
-    public ListCommand(TCPlugin _plugin)
-    {
-        super(_plugin);
-        name = ""list"";
-        perm = TCPerm.CMD_LIST.node;
-        usage = ""list [-w World] [page]"";
-        workOnConsole = false;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, List<String> args)
-    {
-
-        int page = 1;
-
-        if (args.size() > 1 && args.get(0).equals(""-w""))
-        {
-            String worldName = args.get(1);
-            if (args.size() > 2)
-            {
-                try
-                {
-                    page = Integer.parseInt(args.get(2));
-                } catch (Exception e)
-                {
-                    sender.sendMessage(ErrorColor + ""Wrong page number "" + args.get(2));
-                }
-            }
-            BukkitWorld world = this.getWorld(sender, worldName);
-
-            if (world != null)
-            {
-                if (world.getSettings().CustomObjectsCompiled.size() == 0)
-                    sender.sendMessage(MessageColor + ""This world does not have custom objects"");
-
-                List<String> pluginList = new ArrayList<String>();
-                for (CustomObjectCompiled object : world.getSettings().CustomObjectsCompiled)
-                {
-                    pluginList.add(ValueColor + object.Name);
-                }
-
-                this.ListMessage(sender, pluginList, page, ""World bo2 objects"");
-
-            } else
-                sender.sendMessage(ErrorColor + ""World not found "" + worldName);
-            return true;
-
-
-        }
-        if (args.size() > 0)
-        {
-            try
-            {
-                page = Integer.parseInt(args.get(0));
-            } catch (Exception e)
-            {
-                sender.sendMessage(ErrorColor + ""Wrong page number "" + args.get(0));
-            }
-        }
-
-        ArrayList<CustomObject> globalObjects = ObjectsStore.LoadObjectsFromDirectory(ObjectsStore.GlobalDirectory);
-
-        if (globalObjects.size() == 0)
-            sender.sendMessage(MessageColor + ""This global directory does not have custom objects"");
-
-        List<String> pluginList = new ArrayList<String>();
-        for (CustomObject object : globalObjects)
-        {
-            pluginList.add(ValueColor + object.Name);
-        }
-
-        this.ListMessage(sender, pluginList, page, ""Global bo2 objects"");
-
-
-        return true;
-
-    }
+package com.khorn.terraincontrol.bukkit.commands;
+
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.bukkit.BukkitWorld;
+import com.khorn.terraincontrol.bukkit.TCPerm;
+import com.khorn.terraincontrol.bukkit.TCPlugin;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class ListCommand extends BaseCommand
+{
+    public ListCommand(TCPlugin _plugin)
+    {
+        super(_plugin);
+        name = ""list"";
+        perm = TCPerm.CMD_LIST.node;
+        usage = ""list [-w World] [page]"";
+        workOnConsole = false;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, List<String> args)
+    {
+
+        int page = 1;
+
+        if (args.size() > 1 && args.get(0).equals(""-w""))
+        {
+            String worldName = args.get(1);
+            if (args.size() > 2)
+            {
+                try
+                {
+                    page = Integer.parseInt(args.get(2));
+                } catch (Exception e)
+                {
+                    sender.sendMessage(ErrorColor + ""Wrong page number "" + args.get(2));
+                }
+            }
+            BukkitWorld world = this.getWorld(sender, worldName);
+
+            if (world != null)
+            {
+                if (world.getSettings().customObjects.size() == 0)
+                    sender.sendMessage(MessageColor + ""This world does not have custom objects"");
+
+                List<String> pluginList = new ArrayList<String>();
+                for (CustomObject object : world.getSettings().customObjects.values())
+                {
+                    pluginList.add(ValueColor + object.getName());
+                }
+
+                this.ListMessage(sender, pluginList, page, ""World bo2 objects"");
+
+            } else
+                sender.sendMessage(ErrorColor + ""World not found "" + worldName);
+            return true;
+
+        }
+        if (args.size() > 0)
+        {
+            try
+            {
+                page = Integer.parseInt(args.get(0));
+            } catch (Exception e)
+            {
+                sender.sendMessage(ErrorColor + ""Wrong page number "" + args.get(0));
+            }
+        }
+
+        Collection<CustomObject> globalObjects = TerrainControl.getCustomObjectManager().globalObjects.values();
+
+        if (globalObjects.size() == 0)
+            sender.sendMessage(MessageColor + ""This global directory does not have custom objects"");
+
+        List<String> pluginList = new ArrayList<String>();
+        for (CustomObject object : globalObjects)
+        {
+            pluginList.add(ValueColor + object.getName());
+        }
+
+        this.ListMessage(sender, pluginList, page, ""Global bo2 objects"");
+
+        return true;
+
+    }
 }
\ No newline at end of file
diff --git a/bukkit/src/com/khorn/terraincontrol/bukkit/commands/SpawnCommand.java b/bukkit/src/com/khorn/terraincontrol/bukkit/commands/SpawnCommand.java
index c706d9558..6c3252e26 100644
--- a/bukkit/src/com/khorn/terraincontrol/bukkit/commands/SpawnCommand.java
+++ b/bukkit/src/com/khorn/terraincontrol/bukkit/commands/SpawnCommand.java
@@ -1,97 +1,90 @@
-package com.khorn.terraincontrol.bukkit.commands;
-
-import com.khorn.terraincontrol.bukkit.BukkitWorld;
-import com.khorn.terraincontrol.bukkit.TCPerm;
-import com.khorn.terraincontrol.bukkit.TCPlugin;
-import com.khorn.terraincontrol.customobjects.CustomObjectCompiled;
-import com.khorn.terraincontrol.customobjects.CustomObjectGen;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
-import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.util.BlockIterator;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-
-public class SpawnCommand extends BaseCommand
-{
-    public SpawnCommand(TCPlugin _plugin)
-    {
-        super(_plugin);
-        name = ""spawn"";
-        perm = TCPerm.CMD_SPAWN.node;
-        usage = ""spawn Name [World]"";
-        workOnConsole = false;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, List<String> args)
-    {
-        Player me = (Player) sender;
-
-        BukkitWorld bukkitWorld = this.getWorld(me, args.size() > 1 ? args.get(1) : """");
-
-        if (args.size() == 0)
-        {
-            me.sendMessage(ErrorColor + ""You must enter the name of the BO2."");
-            return true;
-        }
-        CustomObjectCompiled spawnObject = null;
-
-        if (bukkitWorld != null)
-            spawnObject = ObjectsStore.CompileString(args.get(0), bukkitWorld.getSettings().CustomObjectsDirectory);
-
-        if (spawnObject == null)
-        {
-            me.sendMessage(BaseCommand.MessageColor + ""BO2 not found in world directory. Searching in global directory."");
-            spawnObject = ObjectsStore.CompileString(args.get(0), ObjectsStore.GlobalDirectory);
-        }
-
-        if (spawnObject == null)
-        {
-            sender.sendMessage(ErrorColor + ""BO2 not found, use '/tc list' to list the available ones."");
-            return true;
-        }
-
-        Block block = this.getWatchedBlock(me, true);
-        if (block == null)
-            return true;
-
-        if (CustomObjectGen.GenerateCustomObject(bukkitWorld, new Random(), block.getX(), block.getY(), block.getZ(), spawnObject))
-        {
-            me.sendMessage(BaseCommand.MessageColor + spawnObject.Name + "" was spawned."");
-        } else
-        {
-            me.sendMessage(BaseCommand.ErrorColor + ""BO2 cant be spawned over there."");
-        }
-
-        return true;
-    }
-
-    public Block getWatchedBlock(Player me, boolean verbose)
-    {
-        if (me == null)
-            return null;
-
-        Block block;
-
-        Iterator<Block> itr = new BlockIterator(me, 200);
-        while (itr.hasNext())
-        {
-            block = itr.next();
-            if (block.getTypeId() != 0)
-            {
-                return block;
-            }
-        }
-
-        if (verbose)
-        {
-            me.sendMessage(ErrorColor + ""No block in sight."");
-        }
-
-        return null;
-    }
+package com.khorn.terraincontrol.bukkit.commands;
+
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.bukkit.BukkitWorld;
+import com.khorn.terraincontrol.bukkit.TCPerm;
+import com.khorn.terraincontrol.bukkit.TCPlugin;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.util.BlockIterator;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+
+public class SpawnCommand extends BaseCommand
+{
+    public SpawnCommand(TCPlugin _plugin)
+    {
+        super(_plugin);
+        name = ""spawn"";
+        perm = TCPerm.CMD_SPAWN.node;
+        usage = ""spawn Name [World]"";
+        workOnConsole = false;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, List<String> args)
+    {
+        Player me = (Player) sender;
+
+        BukkitWorld bukkitWorld = this.getWorld(me, args.size() > 1 ? args.get(1) : """");
+
+        if (args.size() == 0)
+        {
+            me.sendMessage(ErrorColor + ""You must enter the name of the BO2."");
+            return true;
+        }
+        CustomObject spawnObject = null;
+
+        if (bukkitWorld != null)
+            spawnObject = TerrainControl.getCustomObjectManager().getObjectFromString(args.get(0), bukkitWorld);
+
+        if (spawnObject == null)
+        {
+            sender.sendMessage(ErrorColor + ""Object not found, use '/tc list' to list the available ones."");
+            return true;
+        }
+
+        Block block = this.getWatchedBlock(me, true);
+        if (block == null)
+            return true;
+
+        if (spawnObject.spawn(bukkitWorld, new Random(), block.getX(), block.getY(), block.getZ()))
+        {
+            me.sendMessage(BaseCommand.MessageColor + spawnObject.getName() + "" was spawned."");
+        } else
+        {
+            me.sendMessage(BaseCommand.ErrorColor + ""BO2 cant be spawned over there."");
+        }
+
+        return true;
+    }
+
+    public Block getWatchedBlock(Player me, boolean verbose)
+    {
+        if (me == null)
+            return null;
+
+        Block block;
+
+        Iterator<Block> itr = new BlockIterator(me, 200);
+        while (itr.hasNext())
+        {
+            block = itr.next();
+            if (block.getTypeId() != 0)
+            {
+                return block;
+            }
+        }
+
+        if (verbose)
+        {
+            me.sendMessage(ErrorColor + ""No block in sight."");
+        }
+
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/TerrainControl.java b/common/src/com/khorn/terraincontrol/TerrainControl.java
index 0384414d4..5fa04436f 100644
--- a/common/src/com/khorn/terraincontrol/TerrainControl.java
+++ b/common/src/com/khorn/terraincontrol/TerrainControl.java
@@ -1,10 +1,37 @@
 package com.khorn.terraincontrol;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.customobjects.CustomObjectLoader;
+import com.khorn.terraincontrol.customobjects.CustomObjectManager;
+import com.khorn.terraincontrol.generator.resourcegens.ResourcesManager;
+
 public class TerrainControl
 {
+    /**
+     * The world height that the engine supports. Not the actual height the
+     * world is capped at. 256 in Minecraft.
+     */
+    public static int worldHeight = 256;
+
+    /**
+     * The world depth that the engine supports. Not the actual depth the world
+     * is capped at. 0 in Minecraft.
+     */
+    public static int worldDepth = 0;
+
     private static TerrainControlEngine engine;
+    private static ResourcesManager resourcesManager;
+    private static CustomObjectManager customObjectManager;
+
+    // Used before TerrainControl is initialized
+    private static Map<String, CustomObjectLoader> customObjectLoaders = new HashMap<String, CustomObjectLoader>();
+    private static Map<String, CustomObject> specialCustomObjects;
+    private static Map<String, Class<? extends Resource>> resourceTypes;
 
     private TerrainControl()
     {
@@ -12,7 +39,7 @@ private TerrainControl()
     }
 
     /**
-     * Starts the engine, making all API methods availible.
+     * Starts the engine, making all API methods available.
      * 
      * @param engine
      *            The implementation of the engine.
@@ -24,6 +51,24 @@ public static void startEngine(TerrainControlEngine engine)
             throw new UnsupportedOperationException(""Engine is already set!"");
         }
         TerrainControl.engine = engine;
+
+        if (customObjectLoaders == null)
+        {
+            customObjectLoaders = new HashMap<String, CustomObjectLoader>();
+        }
+        if (specialCustomObjects == null)
+        {
+            specialCustomObjects = new HashMap<String, CustomObject>();
+        }
+        customObjectManager = new CustomObjectManager(customObjectLoaders, specialCustomObjects);
+
+        if (resourceTypes == null)
+        {
+            resourceTypes = new HashMap<String, Class<? extends Resource>>();
+        }
+        
+        resourcesManager = new ResourcesManager(resourceTypes);
+        //resourcesManager.start(resourceTypes);
     }
 
     /**
@@ -33,6 +78,12 @@ public static void startEngine(TerrainControlEngine engine)
     public static void stopEngine()
     {
         engine = null;
+        customObjectManager = null;
+        resourcesManager = null;
+
+        customObjectLoaders.clear();
+        specialCustomObjects.clear();
+        resourceTypes.clear();
     }
 
     /**
@@ -105,4 +156,75 @@ public static void log(Level level, String... messages)
     {
         engine.log(level, messages);
     }
+
+    /**
+     * Returns the CustomObject manager, with hooks to spawn CustomObjects.
+     * 
+     * @return The CustomObject manager.
+     */
+    public static CustomObjectManager getCustomObjectManager()
+    {
+        return customObjectManager;
+    }
+
+    /**
+     * Returns the Resource manager.
+     * 
+     * @return The Resource manager.
+     */
+    public static ResourcesManager getResourcesManager()
+    {
+        return resourcesManager;
+    }
+
+    /**
+     * Registers a CustomObject loader. Can be called before Terrain Control is
+     * fully loaded.
+     * 
+     * @param extension
+     *            The file extension, without a dot.
+     * @param loader
+     *            The loader.
+     */
+    public static void registerCustomObjectLoader(String extension, CustomObjectLoader loader)
+    {
+        if (customObjectLoaders == null)
+        {
+            customObjectLoaders = new HashMap<String, CustomObjectLoader>();
+        }
+        customObjectLoaders.put(extension.toLowerCase(), loader);
+    }
+
+    /**
+     * Registers a special CustomObject, like UseWorld or UseBiome or a tree.
+     * Can be called before Terrain Control is fully loaded.
+     * 
+     * @param extension
+     * @param loader
+     */
+    public static void registerSpecialCustomObject(String name, CustomObject object)
+    {
+        if (specialCustomObjects == null)
+        {
+            specialCustomObjects = new HashMap<String, CustomObject>();
+        }
+        specialCustomObjects.put(name.toLowerCase(), object);
+    }
+
+    /**
+     * Register a new Resource type. Can be called before Terrain Control is
+     * fully loaded.
+     * 
+     * @param name
+     * @param resourceType
+     */
+    public static void registerResourceType(String name, Class<? extends Resource> resourceType)
+    {
+        if (resourceTypes == null)
+        {
+            resourceTypes = new HashMap<String, Class<? extends Resource>>();
+        }
+        resourceTypes.put(name.toLowerCase(), resourceType);
+    }
+
 }
diff --git a/common/src/com/khorn/terraincontrol/TerrainControlEngine.java b/common/src/com/khorn/terraincontrol/TerrainControlEngine.java
index 118bda6a0..c3f5c54ed 100644
--- a/common/src/com/khorn/terraincontrol/TerrainControlEngine.java
+++ b/common/src/com/khorn/terraincontrol/TerrainControlEngine.java
@@ -1,5 +1,6 @@
 package com.khorn.terraincontrol;
 
+import java.io.File;
 import java.util.logging.Level;
 
 public interface TerrainControlEngine
@@ -9,11 +10,17 @@ public interface TerrainControlEngine
      * @param name The name of the world.
      * @return The world object.
      */
-    public abstract LocalWorld getWorld(String name);
+    public LocalWorld getWorld(String name);
     
     /**
      * Logs the messages.
      * @param message The messages to log.
      */
-    public abstract void log(Level level, String... message);
+    public void log(Level level, String... message);
+    
+    /**
+     * Returns the folder where the global objects are stored in.
+     * @return
+     */
+    public File getGlobalObjectsDirectory();
 }
diff --git a/common/src/com/khorn/terraincontrol/configuration/BiomeConfig.java b/common/src/com/khorn/terraincontrol/configuration/BiomeConfig.java
index b72c0087e..0d4d81fb3 100644
--- a/common/src/com/khorn/terraincontrol/configuration/BiomeConfig.java
+++ b/common/src/com/khorn/terraincontrol/configuration/BiomeConfig.java
@@ -4,11 +4,26 @@
 import com.khorn.terraincontrol.DefaultMaterial;
 import com.khorn.terraincontrol.DefaultMobType;
 import com.khorn.terraincontrol.LocalBiome;
-import com.khorn.terraincontrol.customobjects.BODefaultValues;
-import com.khorn.terraincontrol.customobjects.CustomObjectCompiled;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.generator.resourcegens.AboveWaterGen;
+import com.khorn.terraincontrol.generator.resourcegens.CactusGen;
+import com.khorn.terraincontrol.generator.resourcegens.CustomObjectGen;
+import com.khorn.terraincontrol.generator.resourcegens.DungeonGen;
+import com.khorn.terraincontrol.generator.resourcegens.GrassGen;
+import com.khorn.terraincontrol.generator.resourcegens.LiquidGen;
+import com.khorn.terraincontrol.generator.resourcegens.OreGen;
+import com.khorn.terraincontrol.generator.resourcegens.PlantGen;
+import com.khorn.terraincontrol.generator.resourcegens.ReedGen;
 import com.khorn.terraincontrol.generator.resourcegens.ResourceType;
+import com.khorn.terraincontrol.generator.resourcegens.SaplingGen;
+import com.khorn.terraincontrol.generator.resourcegens.SmallLakeGen;
+import com.khorn.terraincontrol.generator.resourcegens.TreeGen;
 import com.khorn.terraincontrol.generator.resourcegens.TreeType;
+import com.khorn.terraincontrol.generator.resourcegens.UnderWaterOreGen;
+import com.khorn.terraincontrol.generator.resourcegens.UndergroundLakeGen;
+import com.khorn.terraincontrol.generator.resourcegens.VinesGen;
 import com.khorn.terraincontrol.util.Txt;
 
 import java.io.DataInputStream;
@@ -16,6 +31,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +49,7 @@ public class BiomeConfig extends ConfigFile
     public ArrayList<String> IsleInBiome;
     public ArrayList<String> NotBorderNear;
 
-    //Surface config
+    // Surface config
     public float BiomeHeight;
     public float BiomeVolatility;
 
@@ -47,7 +63,6 @@ public class BiomeConfig extends ConfigFile
 
     public String ReplaceBiomeName;
 
-
     public boolean UseWorldWaterLevel;
     public int waterLevelMax;
     public int waterLevelMin;
@@ -63,10 +78,11 @@ public class BiomeConfig extends ConfigFile
     public boolean FoliageColorIsMultiplier;
 
     public Resource[] ResourceSequence = new Resource[256];
-    public Resource[] SaplingTypes = new Resource[4];
-    public Resource SaplingResource = null;
+    public SaplingGen[] SaplingTypes = new SaplingGen[4];
+    public SaplingGen SaplingResource = null;
 
-    public ArrayList<CustomObjectCompiled> CustomObjectsCompiled;
+    public ArrayList<CustomObject> biomeObjects;
+    public ArrayList<String> biomeObjectStrings;
 
     public double maxAverageHeight;
     public double maxAverageDepth;
@@ -83,13 +99,12 @@ public class BiomeConfig extends ConfigFile
 
     public int ResourceCount = 0;
 
-
     public LocalBiome Biome;
 
     public WorldConfig worldConfig;
     public String Name;
 
-    //Spawn Config
+    // Spawn Config
     public boolean spawnMonstersAddDefaults = true;
     public List<WeightedMobSpawnGroup> spawnMonsters = new ArrayList<WeightedMobSpawnGroup>();
     public boolean spawnCreaturesAddDefaults = true;
@@ -124,12 +139,10 @@ public BiomeConfig(File settingsDir, LocalBiome biome, WorldConfig config)
             this.iceBlock = worldConfig.iceBlock;
         }
 
-
         if (biome.isCustom())
             biome.setVisuals(this);
     }
 
-
     public int getTemperature()
     {
         return (int) (this.BiomeTemperature * 65536.0F);
@@ -144,199 +157,193 @@ private void CreateDefaultResources()
     {
         Resource resource;
 
-        //Small lakes
-        resource = new Resource(ResourceType.SmallLake, DefaultMaterial.WATER.id, TCDefaultValues.SmallLakeWaterFrequency.intValue(), TCDefaultValues.SmallLakeWaterRarity.intValue(), TCDefaultValues.SmallLakeMinAltitude.intValue(), TCDefaultValues.SmallLakeMaxAltitude.intValue());
+        // Small lakes
+        resource = Resource.create(worldConfig, SmallLakeGen.class, DefaultMaterial.WATER.id, TCDefaultValues.SmallLakeWaterFrequency.intValue(), TCDefaultValues.SmallLakeWaterRarity.intValue(), TCDefaultValues.SmallLakeMinAltitude.intValue(), TCDefaultValues.SmallLakeMaxAltitude.intValue());
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Small lakes
-        resource = new Resource(ResourceType.SmallLake, DefaultMaterial.LAVA.id, TCDefaultValues.SmallLakeLavaFrequency.intValue(), TCDefaultValues.SmallLakeLavaRarity.intValue(), TCDefaultValues.SmallLakeMinAltitude.intValue(), TCDefaultValues.SmallLakeMaxAltitude.intValue());
+        // Small lakes
+        resource = Resource.create(worldConfig, SmallLakeGen.class, DefaultMaterial.LAVA.id, TCDefaultValues.SmallLakeLavaFrequency.intValue(), TCDefaultValues.SmallLakeLavaRarity.intValue(), TCDefaultValues.SmallLakeMinAltitude.intValue(), TCDefaultValues.SmallLakeMaxAltitude.intValue());
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Underground lakes
-        resource = new Resource(ResourceType.UnderGroundLake, TCDefaultValues.undergroundLakeMinSize.intValue(), TCDefaultValues.undergroundLakeMaxSize.intValue(), TCDefaultValues.undergroundLakeFrequency.intValue(), TCDefaultValues.undergroundLakeRarity.intValue(), TCDefaultValues.undergroundLakeMinAltitude.intValue(), TCDefaultValues.undergroundLakeMaxAltitude.intValue());
+        // Underground lakes
+        resource = Resource.create(worldConfig, UndergroundLakeGen.class, TCDefaultValues.undergroundLakeMinSize.intValue(), TCDefaultValues.undergroundLakeMaxSize.intValue(), TCDefaultValues.undergroundLakeFrequency.intValue(), TCDefaultValues.undergroundLakeRarity.intValue(), TCDefaultValues.undergroundLakeMinAltitude.intValue(), TCDefaultValues.undergroundLakeMaxAltitude.intValue());
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Dungeon
-        resource = new Resource(ResourceType.Dungeon, 0, 0, 0, TCDefaultValues.dungeonFrequency.intValue(), TCDefaultValues.dungeonRarity.intValue(), TCDefaultValues.dungeonMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Dungeon
+        resource = Resource.create(worldConfig, DungeonGen.class, TCDefaultValues.dungeonFrequency.intValue(), TCDefaultValues.dungeonRarity.intValue(), TCDefaultValues.dungeonMinAltitude.intValue(), this.worldConfig.WorldHeight);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Resource(ResourceType type,int blockId, int blockData, int size,int frequency, int rarity, int minAltitude,int maxAltitude,int[] sourceBlockIds)
-        //Dirt
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.DIRT.id, 0, TCDefaultValues.dirtDepositSize.intValue(), TCDefaultValues.dirtDepositFrequency.intValue(), TCDefaultValues.dirtDepositRarity.intValue(), TCDefaultValues.dirtDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Dirt
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.DIRT.id, TCDefaultValues.dirtDepositSize.intValue(), TCDefaultValues.dirtDepositFrequency.intValue(), TCDefaultValues.dirtDepositRarity.intValue(), TCDefaultValues.dirtDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Gravel
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.GRAVEL.id, 0, TCDefaultValues.gravelDepositSize.intValue(), TCDefaultValues.gravelDepositFrequency.intValue(), TCDefaultValues.gravelDepositRarity.intValue(), TCDefaultValues.gravelDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Gravel
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.GRAVEL.id, TCDefaultValues.gravelDepositSize.intValue(), TCDefaultValues.gravelDepositFrequency.intValue(), TCDefaultValues.gravelDepositRarity.intValue(), TCDefaultValues.gravelDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Clay
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.CLAY.id, 0, TCDefaultValues.clayDepositSize.intValue(), TCDefaultValues.clayDepositFrequency.intValue(), TCDefaultValues.clayDepositRarity.intValue(), TCDefaultValues.clayDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Clay
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.CLAY.id, TCDefaultValues.clayDepositSize.intValue(), TCDefaultValues.clayDepositFrequency.intValue(), TCDefaultValues.clayDepositRarity.intValue(), TCDefaultValues.clayDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Coal
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.COAL_ORE.id, 0, TCDefaultValues.coalDepositSize.intValue(), TCDefaultValues.coalDepositFrequency.intValue(), TCDefaultValues.coalDepositRarity.intValue(), TCDefaultValues.coalDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Coal
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.COAL_ORE.id, TCDefaultValues.coalDepositSize.intValue(), TCDefaultValues.coalDepositFrequency.intValue(), TCDefaultValues.coalDepositRarity.intValue(), TCDefaultValues.coalDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Iron
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.IRON_ORE.id, 0, TCDefaultValues.ironDepositSize.intValue(), TCDefaultValues.ironDepositFrequency.intValue(), TCDefaultValues.ironDepositRarity.intValue(), TCDefaultValues.ironDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 2, new int[]{DefaultMaterial.STONE.id});
+        // Iron
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.IRON_ORE.id, TCDefaultValues.ironDepositSize.intValue(), TCDefaultValues.ironDepositFrequency.intValue(), TCDefaultValues.ironDepositRarity.intValue(), TCDefaultValues.ironDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 2, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Gold
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.GOLD_ORE.id, 0, TCDefaultValues.goldDepositSize.intValue(), TCDefaultValues.goldDepositFrequency.intValue(), TCDefaultValues.goldDepositRarity.intValue(), TCDefaultValues.goldDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 4, new int[]{DefaultMaterial.STONE.id});
+        // Gold
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.GOLD_ORE.id, TCDefaultValues.goldDepositSize.intValue(), TCDefaultValues.goldDepositFrequency.intValue(), TCDefaultValues.goldDepositRarity.intValue(), TCDefaultValues.goldDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 4, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Redstone
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.REDSTONE_ORE.id, 0, TCDefaultValues.redstoneDepositSize.intValue(), TCDefaultValues.redstoneDepositFrequency.intValue(), TCDefaultValues.redstoneDepositRarity.intValue(), TCDefaultValues.redstoneDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 8, new int[]{DefaultMaterial.STONE.id});
+        // Redstone
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.REDSTONE_ORE.id, TCDefaultValues.redstoneDepositSize.intValue(), TCDefaultValues.redstoneDepositFrequency.intValue(), TCDefaultValues.redstoneDepositRarity.intValue(), TCDefaultValues.redstoneDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 8, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Diamond
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.DIAMOND_ORE.id, 0, TCDefaultValues.diamondDepositSize.intValue(), TCDefaultValues.diamondDepositFrequency.intValue(), TCDefaultValues.diamondDepositRarity.intValue(), TCDefaultValues.diamondDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 8, new int[]{DefaultMaterial.STONE.id});
+        // Diamond
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.DIAMOND_ORE.id, TCDefaultValues.diamondDepositSize.intValue(), TCDefaultValues.diamondDepositFrequency.intValue(), TCDefaultValues.diamondDepositRarity.intValue(), TCDefaultValues.diamondDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 8, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Lapislazuli
-        resource = new Resource(ResourceType.Ore, DefaultMaterial.LAPIS_ORE.id, 0, TCDefaultValues.lapislazuliDepositSize.intValue(), TCDefaultValues.lapislazuliDepositFrequency.intValue(), TCDefaultValues.lapislazuliDepositRarity.intValue(), TCDefaultValues.lapislazuliDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 8, new int[]{DefaultMaterial.STONE.id});
+        // Lapislazuli
+        resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.LAPIS_ORE.id, TCDefaultValues.lapislazuliDepositSize.intValue(), TCDefaultValues.lapislazuliDepositFrequency.intValue(), TCDefaultValues.lapislazuliDepositRarity.intValue(), TCDefaultValues.lapislazuliDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 8, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
         DefaultBiome biome = DefaultBiome.getBiome(this.Biome.getId());
 
         if (biome != null && (biome == DefaultBiome.EXTREME_HILLS || biome == DefaultBiome.SMALL_MOUNTAINS))
         {
-            resource = new Resource(ResourceType.Ore, DefaultMaterial.EMERALD_ORE.id, 0, TCDefaultValues.emeraldDepositSize.intValue(), TCDefaultValues.emeraldDepositFrequency.intValue(), TCDefaultValues.emeraldDepositRarity.intValue(), TCDefaultValues.emeraldDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 4, new int[]{DefaultMaterial.STONE.id});
+            resource = Resource.create(worldConfig, OreGen.class, DefaultMaterial.EMERALD_ORE.id, TCDefaultValues.emeraldDepositSize.intValue(), TCDefaultValues.emeraldDepositFrequency.intValue(), TCDefaultValues.emeraldDepositRarity.intValue(), TCDefaultValues.emeraldDepositMinAltitude.intValue(), this.worldConfig.WorldHeight / 4, DefaultMaterial.STONE.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
-        //Under water sand
-        resource = new Resource(ResourceType.UnderWaterOre, DefaultMaterial.SAND.id, 0, TCDefaultValues.waterSandDepositSize.intValue(), TCDefaultValues.waterSandDepositFrequency.intValue(), TCDefaultValues.waterSandDepositRarity.intValue(), 0, 0, new int[]{DefaultMaterial.DIRT.id, DefaultMaterial.GRASS.id});
+        // Under water sand
+        resource = Resource.create(worldConfig, UnderWaterOreGen.class, DefaultMaterial.SAND.id, TCDefaultValues.waterSandDepositSize.intValue(), TCDefaultValues.waterSandDepositFrequency.intValue(), TCDefaultValues.waterSandDepositRarity.intValue(), DefaultMaterial.DIRT.id, DefaultMaterial.GRASS.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Under water clay
+        // Under water clay
         if (this.DefaultClay > 0)
         {
-            resource = new Resource(ResourceType.UnderWaterOre, DefaultMaterial.CLAY.id, 0, TCDefaultValues.waterClayDepositSize.intValue(), this.DefaultClay, TCDefaultValues.waterClayDepositRarity.intValue(), 0, 0, new int[]{DefaultMaterial.DIRT.id, DefaultMaterial.CLAY.id});
+            resource = Resource.create(worldConfig, UnderWaterOreGen.class, DefaultMaterial.CLAY.id, TCDefaultValues.waterClayDepositSize.intValue(), this.DefaultClay, TCDefaultValues.waterClayDepositRarity.intValue(), DefaultMaterial.DIRT.id, DefaultMaterial.CLAY.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
-        //Custom objects
-        resource = new Resource(ResourceType.CustomObject);
-        ResourceType.CustomObject.Generator.ReadFromString(resource, new String[]{BODefaultValues.BO_Use_World.stringValue()}, this);
+        // Custom objects
+        resource = Resource.create(worldConfig, CustomObjectGen.class, ""UseWorld"");
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-
+        // Trees
         if (biome != null)
             switch (biome)
             {
-                case OCEAN: // Ocean - default
-                case EXTREME_HILLS: // BigHills - default
-                case RIVER: // River - default
-                case SMALL_MOUNTAINS: // SmallHills
-                    resource = new Resource(ResourceType.Tree, this.DefaultTrees, new TreeType[]{TreeType.BigTree, TreeType.Tree}, new int[]{1, 9});
-                    this.ResourceSequence[this.ResourceCount++] = resource;
-                    break;
-                case PLAINS: // Plains - no tree
-                case DESERT: // Desert - no tree
-                case DESERT_HILLS: //HillsDesert
-                    break;
-                case FOREST_HILLS: // HillsForest
-                case FOREST: // Forest - forest
-                    resource = new Resource(ResourceType.Tree, this.DefaultTrees, new TreeType[]{TreeType.Forest, TreeType.BigTree, TreeType.Tree}, new int[]{20, 10, 100});
-                    this.ResourceSequence[this.ResourceCount++] = resource;
-                    break;
-                case TAIGA_HILLS: //HillsTaiga
-                case TAIGA: // Taiga - taiga
-                    resource = new Resource(ResourceType.Tree, this.DefaultTrees, new TreeType[]{TreeType.Taiga1, TreeType.Taiga2}, new int[]{35, 100});
-                    this.ResourceSequence[this.ResourceCount++] = resource;
-                    break;
-                case SWAMPLAND: // Swamp - swamp
-                    resource = new Resource(ResourceType.Tree, this.DefaultTrees, new TreeType[]{TreeType.SwampTree}, new int[]{100});
-                    this.ResourceSequence[this.ResourceCount++] = resource;
-                    break;
-                case MUSHROOM_ISLAND: // Mushroom island
-                    resource = new Resource(ResourceType.Tree, this.DefaultTrees, new TreeType[]{TreeType.HugeMushroom}, new int[]{100});
-                    this.ResourceSequence[this.ResourceCount++] = resource;
-                    break;
-                case JUNGLE:// Jungle
-                case JUNGLE_HILLS:
-                    resource = new Resource(ResourceType.Tree, this.DefaultTrees, new TreeType[]{TreeType.BigTree, TreeType.GroundBush, TreeType.JungleTree, TreeType.CocoaTree}, new int[]{10, 50, 35, 100});
-                    this.ResourceSequence[this.ResourceCount++] = resource;
-                    break;
-
+            case OCEAN: // Ocean - default
+            case EXTREME_HILLS: // BigHills - default
+            case RIVER: // River - default
+            case SMALL_MOUNTAINS: // SmallHills
+                resource = Resource.create(worldConfig, TreeGen.class, this.DefaultTrees, TreeType.BigTree, 1, TreeType.Tree, 9);
+                this.ResourceSequence[this.ResourceCount++] = resource;
+                break;
+            case PLAINS: // Plains - no tree
+            case DESERT: // Desert - no tree
+            case DESERT_HILLS: // HillsDesert
+                break;
+            case FOREST_HILLS: // HillsForest
+            case FOREST: // Forest - forest
+                resource = Resource.create(worldConfig, TreeGen.class, this.DefaultTrees, TreeType.Forest, 20, TreeType.BigTree, 10, TreeType.Tree, 100);
+                this.ResourceSequence[this.ResourceCount++] = resource;
+                break;
+            case TAIGA_HILLS: // HillsTaiga
+            case TAIGA: // Taiga - taiga
+                resource = Resource.create(worldConfig, TreeGen.class, this.DefaultTrees, TreeType.Taiga1, 35, TreeType.Taiga2, 100);
+                this.ResourceSequence[this.ResourceCount++] = resource;
+                break;
+            case SWAMPLAND: // Swamp - swamp
+                resource = Resource.create(worldConfig, TreeGen.class, this.DefaultTrees, TreeType.SwampTree, 100);
+                this.ResourceSequence[this.ResourceCount++] = resource;
+                break;
+            case MUSHROOM_ISLAND: // Mushroom island
+                resource = Resource.create(worldConfig, TreeGen.class, this.DefaultTrees, TreeType.HugeMushroom, 100);
+                this.ResourceSequence[this.ResourceCount++] = resource;
+                break;
+            case JUNGLE:// Jungle
+            case JUNGLE_HILLS:
+                resource = Resource.create(worldConfig, TreeGen.class, this.DefaultTrees, TreeType.BigTree, 10, TreeType.GroundBush, 50, TreeType.JungleTree, 35, TreeType.CocoaTree, 100);
+                this.ResourceSequence[this.ResourceCount++] = resource;
+                break;
 
             }
         if (this.DefaultWaterLily > 0)
         {
-            resource = new Resource(ResourceType.AboveWaterRes, DefaultMaterial.WATER_LILY.id, 0, 0, this.DefaultWaterLily, 100, 0, 0, new int[0]);
+            resource = Resource.create(worldConfig, AboveWaterGen.class, DefaultMaterial.WATER_LILY.id, this.DefaultWaterLily, 100);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
         if (this.DefaultFlowers > 0)
         {
-            //Red flower
-            resource = new Resource(ResourceType.Plant, DefaultMaterial.RED_ROSE.id, 0, 0, this.DefaultFlowers, TCDefaultValues.roseDepositRarity.intValue(), TCDefaultValues.roseDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id, DefaultMaterial.SOIL.id});
+            // Red flower
+            resource = Resource.create(worldConfig, PlantGen.class, DefaultMaterial.RED_ROSE.id, this.DefaultFlowers, TCDefaultValues.roseDepositRarity.intValue(), TCDefaultValues.roseDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id, DefaultMaterial.SOIL.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
 
-            //Yellow flower
-            resource = new Resource(ResourceType.Plant, DefaultMaterial.YELLOW_FLOWER.id, 0, 0, this.DefaultFlowers, TCDefaultValues.flowerDepositRarity.intValue(), TCDefaultValues.flowerDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id, DefaultMaterial.SOIL.id});
+            // Yellow flower
+            resource = Resource.create(worldConfig, PlantGen.class, DefaultMaterial.YELLOW_FLOWER.id, this.DefaultFlowers, TCDefaultValues.flowerDepositRarity.intValue(), TCDefaultValues.flowerDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id, DefaultMaterial.SOIL.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
         if (this.DefaultMushroom > 0)
         {
-            //Red mushroom
-            resource = new Resource(ResourceType.Plant, DefaultMaterial.RED_MUSHROOM.id, 0, 0, this.DefaultMushroom, TCDefaultValues.redMushroomDepositRarity.intValue(), TCDefaultValues.redMushroomDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id});
+            // Red mushroom
+            resource = Resource.create(worldConfig, PlantGen.class, DefaultMaterial.RED_MUSHROOM.id, this.DefaultMushroom, TCDefaultValues.redMushroomDepositRarity.intValue(), TCDefaultValues.redMushroomDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
 
-            //Brown mushroom
-            resource = new Resource(ResourceType.Plant, DefaultMaterial.BROWN_MUSHROOM.id, 0, 0, this.DefaultMushroom, TCDefaultValues.brownMushroomDepositRarity.intValue(), TCDefaultValues.brownMushroomDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id});
+            // Brown mushroom
+            resource = Resource.create(worldConfig, PlantGen.class, DefaultMaterial.BROWN_MUSHROOM.id, this.DefaultMushroom, TCDefaultValues.brownMushroomDepositRarity.intValue(), TCDefaultValues.brownMushroomDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
         if (this.DefaultGrass > 0)
         {
-            //Grass
-            resource = new Resource(ResourceType.Grass, DefaultMaterial.LONG_GRASS.id, 1, 0, this.DefaultGrass, TCDefaultValues.longGrassDepositRarity.intValue(), 0, 0, new int[]{DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id});
+            // Grass
+            resource = Resource.create(worldConfig, GrassGen.class, DefaultMaterial.LONG_GRASS.id, 1, this.DefaultGrass, TCDefaultValues.longGrassDepositRarity.intValue(), DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
         if (this.DefaultDeadBrush > 0)
         {
-            //Dead Bush
-            resource = new Resource(ResourceType.Grass, DefaultMaterial.DEAD_BUSH.id, 0, 0, this.DefaultDeadBrush, TCDefaultValues.deadBushDepositRarity.intValue(), 0, 0, new int[]{DefaultMaterial.SAND.id});
+            // Dead Bush
+            resource = Resource.create(worldConfig, GrassGen.class, DefaultMaterial.DEAD_BUSH.id, 0, this.DefaultDeadBrush, TCDefaultValues.deadBushDepositRarity.intValue(), DefaultMaterial.SAND.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
-        //Pumpkin
-        resource = new Resource(ResourceType.Plant, DefaultMaterial.PUMPKIN.id, 0, 0, TCDefaultValues.pumpkinDepositFrequency.intValue(), TCDefaultValues.pumpkinDepositRarity.intValue(), TCDefaultValues.pumpkinDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.GRASS.id});
+        // Pumpkin
+        resource = Resource.create(worldConfig, PlantGen.class, DefaultMaterial.PUMPKIN.id, TCDefaultValues.pumpkinDepositFrequency.intValue(), TCDefaultValues.pumpkinDepositRarity.intValue(), TCDefaultValues.pumpkinDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.GRASS.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-
         if (this.DefaultReed > 0)
         {
-            //Reed
-            resource = new Resource(ResourceType.Reed, DefaultMaterial.SUGAR_CANE_BLOCK.id, 0, 0, this.DefaultReed, TCDefaultValues.reedDepositRarity.intValue(), TCDefaultValues.reedDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id, DefaultMaterial.SAND.id});
+            // Reed
+            resource = Resource.create(worldConfig, ReedGen.class, DefaultMaterial.SUGAR_CANE_BLOCK.id, this.DefaultReed, TCDefaultValues.reedDepositRarity.intValue(), TCDefaultValues.reedDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.GRASS.id, DefaultMaterial.DIRT.id, DefaultMaterial.SAND.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
-
         if (this.DefaultCactus > 0)
         {
-            //Cactus
-            resource = new Resource(ResourceType.Cactus, DefaultMaterial.CACTUS.id, 0, 0, this.DefaultCactus, TCDefaultValues.cactusDepositRarity.intValue(), TCDefaultValues.cactusDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.SAND.id});
+            // Cactus
+            resource = Resource.create(worldConfig, CactusGen.class, DefaultMaterial.CACTUS.id, this.DefaultCactus, TCDefaultValues.cactusDepositRarity.intValue(), TCDefaultValues.cactusDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.SAND.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
-        if (biome == DefaultBiome.JUNGLE || biome == DefaultBiome.JUNGLE_HILLS) // Jungle and Jungle Hills
+        if (biome == DefaultBiome.JUNGLE || biome == DefaultBiome.JUNGLE_HILLS) 
         {
-            resource = new Resource(ResourceType.Vines, 0, 0, 0, TCDefaultValues.vinesFrequency.intValue(), TCDefaultValues.vinesRarity.intValue(), TCDefaultValues.vinesMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.VINE.id});
+            resource = Resource.create(worldConfig, VinesGen.class, TCDefaultValues.vinesFrequency.intValue(), TCDefaultValues.vinesRarity.intValue(), TCDefaultValues.vinesMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.VINE.id);
             this.ResourceSequence[this.ResourceCount++] = resource;
         }
 
-        //Water source
-        resource = new Resource(ResourceType.Liquid, DefaultMaterial.WATER.id, 0, 0, TCDefaultValues.waterSourceDepositFrequency.intValue(), TCDefaultValues.waterSourceDepositRarity.intValue(), TCDefaultValues.waterSourceDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Water source
+        resource = Resource.create(worldConfig, LiquidGen.class, DefaultMaterial.WATER.id, TCDefaultValues.waterSourceDepositFrequency.intValue(), TCDefaultValues.waterSourceDepositRarity.intValue(), TCDefaultValues.waterSourceDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-        //Lava source
-        resource = new Resource(ResourceType.Liquid, DefaultMaterial.LAVA.id, 0, 0, TCDefaultValues.lavaSourceDepositFrequency.intValue(), TCDefaultValues.lavaSourceDepositRarity.intValue(), TCDefaultValues.lavaSourceDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, new int[]{DefaultMaterial.STONE.id});
+        // Lava source
+        resource = Resource.create(worldConfig, LiquidGen.class, DefaultMaterial.LAVA.id, TCDefaultValues.lavaSourceDepositFrequency.intValue(), TCDefaultValues.lavaSourceDepositRarity.intValue(), TCDefaultValues.lavaSourceDepositMinAltitude.intValue(), this.worldConfig.WorldHeight, DefaultMaterial.STONE.id);
         this.ResourceSequence[this.ResourceCount++] = resource;
 
-
     }
 
     protected void ReadConfigSettings()
@@ -348,7 +355,6 @@ protected void ReadConfigSettings()
 
         this.BiomeRivers = ReadModSettings(TCDefaultValues.BiomeRivers.name(), this.DefaultRiver);
 
-
         this.IsleInBiome = ReadModSettings(TCDefaultValues.IsleInBiome.name(), this.DefaultIsle);
         this.BiomeIsBorder = ReadModSettings(TCDefaultValues.BiomeIsBorder.name(), this.DefaultBorder);
         this.NotBorderNear = ReadModSettings(TCDefaultValues.NotBorderNear.name(), this.DefaultNotBorderNear);
@@ -364,7 +370,6 @@ protected void ReadConfigSettings()
         this.SurfaceBlock = ReadModSettings(TCDefaultValues.SurfaceBlock.name(), this.DefaultSurfaceBlock);
         this.GroundBlock = ReadModSettings(TCDefaultValues.GroundBlock.name(), this.DefaultGroundBlock);
 
-
         this.UseWorldWaterLevel = ReadSettings(TCDefaultValues.UseWorldWaterLevel);
         this.waterLevelMax = ReadSettings(TCDefaultValues.WaterLevelMax);
         this.waterLevelMin = ReadSettings(TCDefaultValues.WaterLevelMin);
@@ -389,7 +394,6 @@ protected void ReadConfigSettings()
         if (DefaultBiome.getBiome(this.Biome.getId()) == null)
         {
             // Only for custom biomes
-            // System.out.println(""Reading mobs for ""+this.Name); // debug
             this.spawnMonstersAddDefaults = ReadModSettings(""spawnMonstersAddDefaults"", true);
             this.spawnMonsters = ReadModSettings(""spawnMonsters"", new ArrayList<WeightedMobSpawnGroup>());
             this.spawnCreaturesAddDefaults = ReadModSettings(""spawnCreaturesAddDefaults"", true);
@@ -487,33 +491,30 @@ private void ReadResourceSettings()
         for (Map.Entry<String, String> entry : this.SettingsCache.entrySet())
         {
             String key = entry.getKey();
-            for (ResourceType type : ResourceType.values())
+            int start = key.indexOf(""("");
+            int end = key.lastIndexOf("")"");
+            if (start != -1 && end != -1)
             {
-                if (key.startsWith(type.name()))
+                String name = key.substring(0, start);
+                String[] props = ReadComplexString(key.substring(start + 1, end));
+
+                Resource res = TerrainControl.getResourcesManager().getResource(name, this, Arrays.asList(props));
+
+                if (res != null)
                 {
-                    int start = key.indexOf(""("");
-                    int end = key.lastIndexOf("")"");
-                    if (start != -1 && end != -1)
+
+                    if (res.getType() == ResourceType.saplingResource)
                     {
-                        Resource res = new Resource(type);
-                        String[] props = ReadComplexString(key.substring(start + 1, end));
-
-                        if (type.Generator.ReadFromString(res, props, this))
-                        {
-                            if (res.Type == ResourceType.Sapling)
-                            {
-                                if (res.BlockData == -1)
-                                    this.SaplingResource = res;
-                                else
-                                    this.SaplingTypes[res.BlockData] = res;
-
-                            } else
-                            {
-                                LineNumbers.add(Integer.valueOf(entry.getValue()));
-                                this.ResourceSequence[this.ResourceCount++] = res;
-                            }
-                        } else
-                            System.out.println(""TerrainControl: wrong resource "" + type.name() + key);
+                        SaplingGen sapling = (SaplingGen) res;
+                        if (sapling.saplingType == -1)
+                            this.SaplingResource = sapling;
+                        else
+                            this.SaplingTypes[sapling.saplingType] = sapling;
+
+                    } else if (res.getType() == ResourceType.biomeConfigResource)
+                    {
+                        LineNumbers.add(Integer.valueOf(entry.getValue()));
+                        this.ResourceSequence[this.ResourceCount++] = res;
                     }
                 }
             }
@@ -541,43 +542,30 @@ private void ReadResourceSettings()
 
     private void ReadCustomObjectSettings()
     {
-        CustomObjectsCompiled = new ArrayList<CustomObjectCompiled>();
+        biomeObjects = new ArrayList<CustomObject>();
+        biomeObjectStrings = new ArrayList<String>();
 
         // Read from BiomeObjects setting
-        String customObjectsString = ReadModSettings(""biomeobjects"","""");
-        if(customObjectsString.length() > 0)
+        String biomeObjectsValue = ReadModSettings(""biomeobjects"", """");
+        if (biomeObjectsValue.length() > 0)
         {
-            String[] customObjects = customObjectsString.split("","");
-            for (String customObject : customObjects)
+            String[] customObjectStrings = biomeObjectsValue.split("","");
+            for (String customObjectString : customObjectStrings)
             {
-                CustomObjectCompiled object = ObjectsStore.CompileString(customObject, worldConfig.CustomObjectsDirectory);
-                if (object == null)
-                    object = ObjectsStore.CompileString(customObject, ObjectsStore.GlobalDirectory);
+                CustomObject object = TerrainControl.getCustomObjectManager().getObjectFromString(customObjectString, worldConfig);
                 if (object != null)
-                    CustomObjectsCompiled.add(object);
+                {
+                    biomeObjects.add(object);
+                    biomeObjectStrings.add(customObjectString);
+                }
             }
         }
-        
-        // Read from random places in BiomeConfig
-        // TODO: Remove this in 2.4, as it's quite resource intensive
-        for (Map.Entry<String, String> entry : this.SettingsCache.entrySet())
-        {
-            CustomObjectCompiled object = ObjectsStore.CompileString(entry.getKey(), worldConfig.CustomObjectsDirectory);
-            if (object == null)
-                object = ObjectsStore.CompileString(entry.getKey(), ObjectsStore.GlobalDirectory);
-            if (object != null)
-                CustomObjectsCompiled.add(object);
-
-        }
-
     }
 
-
     protected void WriteConfigSettings() throws IOException
     {
         WriteTitle(this.Name + "" biome config"");
 
-
         WriteComment(""Biome size from 0 to GenerationDepth. Show in what zoom level biome will be generated (see GenerationDepth)"");
         WriteComment(""Higher numbers=Smaller% of world / Lower numbers=Bigger % of world"");
         WriteComment(""Don`t work on Ocean and River (frozen versions too) biomes until not added as normal biome."");
@@ -601,7 +589,6 @@ protected void WriteConfigSettings() throws IOException
         WriteValue(TCDefaultValues.BiomeRivers.name(), this.BiomeRivers);
         this.WriteNewLine();
 
-
         WriteComment(""Biome name list where this biome will be spawned as isle. Like Mushroom isle in Ocean.  This work only if this biome is in IsleBiomes in world config"");
         WriteValue(TCDefaultValues.IsleInBiome.name(), this.IsleInBiome);
         this.WriteNewLine();
@@ -625,7 +612,6 @@ protected void WriteConfigSettings() throws IOException
         WriteValue(TCDefaultValues.ReplaceToBiomeName.name(), this.ReplaceBiomeName);
         this.WriteNewLine();
 
-
         WriteTitle(""Terrain Generator Variables"");
         WriteComment(""BiomeHeight mean how much height will be added in terrain generation"");
         WriteComment(""It is double value from -10.0 to 10.0"");
@@ -668,7 +654,6 @@ protected void WriteConfigSettings() throws IOException
         WriteComment(""Make empty layer above bedrock layer. "");
         WriteHeightSettings();
 
-
         this.WriteNewLine();
         WriteComment(""Surface block id"");
         WriteValue(TCDefaultValues.SurfaceBlock.name(), this.SurfaceBlock);
@@ -691,7 +676,6 @@ protected void WriteConfigSettings() throws IOException
         WriteComment(""BlockId used as ice"");
         WriteValue(TCDefaultValues.IceBlock.name(), this.iceBlock);
 
-
         this.WriteNewLine();
         WriteComment(""Replace Variable: (BlockIdFrom,BlockIdTo[,BlockDataTo,minHeight,maxHeight])"");
         WriteComment(""Example :"");
@@ -713,7 +697,7 @@ protected void WriteConfigSettings() throws IOException
         this.WriteNewLine();
         this.WriteComment(""Biome grass color"");
         this.WriteColorValue(TCDefaultValues.GrassColor.name(), this.GrassColor);
-        
+
         this.WriteNewLine();
         this.WriteComment(""Whether the grass color is a multiplier"");
         this.WriteComment(""If you set it to true, the color will be based on this value, the BiomeTemperature and the BiomeWetness"");
@@ -786,7 +770,6 @@ protected void WriteConfigSettings() throws IOException
         this.WriteComment(""These objects will spawn when using the UseBiome keyword."");
         this.WriteCustomObjects();
 
-
         if (DefaultBiome.getBiome(this.Biome.getId()) != null)
         {
             this.WriteTitle(""MOB SPAWNING"");
@@ -862,7 +845,6 @@ private void WriteHeightSettings() throws IOException
         this.WriteValue(TCDefaultValues.CustomHeightControl.name(), output);
     }
 
-
     private void WriteModReplaceSettings() throws IOException
     {
         if (this.ReplaceCount == 0)
@@ -914,22 +896,20 @@ private void WriteModReplaceSettings() throws IOException
     private void WriteResources() throws IOException
     {
         for (int i = 0; i < this.ResourceCount; i++)
-            this.WriteValue(this.ResourceSequence[i].Type.Generator.WriteToString(this.ResourceSequence[i]));
+        {
+            this.WriteValue(this.ResourceSequence[i].makeString());
+        }
     }
 
     private void WriteCustomObjects() throws IOException
     {
         StringBuilder builder = new StringBuilder();
-        for (CustomObjectCompiled objectCompiled : CustomObjectsCompiled)
+        for (String objectString : biomeObjectStrings)
         {
-            builder.append(objectCompiled.Name);
-            if(!objectCompiled.ChangedSettings.equals(""""))
-            {
-                builder.append(""("" + objectCompiled.ChangedSettings + "")"");
-            }
+            builder.append(objectString);
             builder.append(',');
         }
-        if(builder.length() > 0)
+        if (builder.length() > 0)
         {
             // Delete last char
             builder.deleteCharAt(builder.length() - 1);
@@ -940,11 +920,11 @@ private void WriteCustomObjects() throws IOException
     private void WriteSaplingSettings() throws IOException
     {
         if (this.SaplingResource != null)
-            this.WriteValue(ResourceType.Sapling.Generator.WriteToString(this.SaplingResource));
+            this.WriteValue(SaplingResource.makeString());
 
         for (Resource res : this.SaplingTypes)
             if (res != null)
-                this.WriteValue(ResourceType.Sapling.Generator.WriteToString(res));
+                this.WriteValue(res.makeString());
 
     }
 
@@ -976,11 +956,12 @@ protected void CorrectSettings()
     protected void RenameOldSettings()
     {
         // Old values from WorldConfig
-        TCDefaultValues[] copyFromWorld = {TCDefaultValues.MaxAverageHeight, TCDefaultValues.MaxAverageDepth, TCDefaultValues.Volatility1, TCDefaultValues.Volatility2, TCDefaultValues.VolatilityWeight1, TCDefaultValues.VolatilityWeight2, TCDefaultValues.DisableBiomeHeight, TCDefaultValues.CustomHeightControl};
+        TCDefaultValues[] copyFromWorld = { TCDefaultValues.MaxAverageHeight, TCDefaultValues.MaxAverageDepth, TCDefaultValues.Volatility1, TCDefaultValues.Volatility2, TCDefaultValues.VolatilityWeight1, TCDefaultValues.VolatilityWeight2, TCDefaultValues.DisableBiomeHeight, TCDefaultValues.CustomHeightControl };
         for (TCDefaultValues value : copyFromWorld)
             if (this.worldConfig.SettingsCache.containsKey(value.name().toLowerCase()))
             {
-                //this.SettingsCache.put(value.name(), this.worldConfig.SettingsCache.get(value.name().toLowerCase()));
+                // this.SettingsCache.put(value.name(),
+                // this.worldConfig.SettingsCache.get(value.name().toLowerCase()));
                 this.SettingsCache.put(value.name().toLowerCase(), this.worldConfig.SettingsCache.get(value.name().toLowerCase()));
             }
 
@@ -994,27 +975,29 @@ protected void RenameOldSettings()
             }
 
         }
-        
+
         // CustomTreeChance
         int customTreeChance = 0; // Default value
-        if(worldConfig.SettingsCache.containsKey(""customtreechance""))
+        if (worldConfig.SettingsCache.containsKey(""customtreechance""))
         {
-            try {
+            try
+            {
                 customTreeChance = Integer.parseInt(worldConfig.SettingsCache.get(""customtreechance""));
-            } catch(NumberFormatException e) {
+            } catch (NumberFormatException e)
+            {
                 // Ignore, so leave customTreeChance at 0
             }
         }
-        if(customTreeChance == 100)
+        if (customTreeChance == 100)
         {
             this.SettingsCache.put(""Sapling(All,UseWorld,100)"", ""-"");
         }
-        if(customTreeChance > 0 && customTreeChance < 100)
+        if (customTreeChance > 0 && customTreeChance < 100)
         {
-            this.SettingsCache.put(""Sapling(0,UseWorld,""+customTreeChance+"",BigTree,10,Tree,100)"", ""-""); // Oak
-            this.SettingsCache.put(""Sapling(1,UseWorld,""+customTreeChance+"",Taiga2,100)"", ""-""); // Redwood
-            this.SettingsCache.put(""Sapling(2,UseWorld,""+customTreeChance+"",Forest,100)"", ""-""); // Birch
-            this.SettingsCache.put(""Sapling(3,UseWorld,""+customTreeChance+"",CocoaTree,100)"", ""-""); // Jungle
+            this.SettingsCache.put(""Sapling(0,UseWorld,"" + customTreeChance + "",BigTree,10,Tree,100)"", ""-""); // Oak
+            this.SettingsCache.put(""Sapling(1,UseWorld,"" + customTreeChance + "",Taiga2,100)"", ""-""); // Redwood
+            this.SettingsCache.put(""Sapling(2,UseWorld,"" + customTreeChance + "",Forest,100)"", ""-""); // Birch
+            this.SettingsCache.put(""Sapling(3,UseWorld,"" + customTreeChance + "",CocoaTree,100)"", ""-""); // Jungle
         }
 
         // ReplacedBlocks
@@ -1088,11 +1071,9 @@ protected void RenameOldSettings()
 
             this.SettingsCache.put(""ReplacedBlocks"" + "":"" + output.substring(0, output.length() - 1), """");
 
-
         }
     }
 
-
     private int DefaultTrees = 1;
     private int DefaultFlowers = 2;
     private int DefaultGrass = 10;
@@ -1128,161 +1109,160 @@ private void InitDefaults()
         this.DefaultBiomeTemperature = this.Biome.getTemperature();
         this.DefaultBiomeWetness = this.Biome.getWetness();
 
-
         switch (this.Biome.getId())
         {
-            case 0:
-                this.DefaultColor = ""0x3333FF"";
-                break;
-            case 1:
-            {
-                this.DefaultTrees = 0;
-                this.DefaultFlowers = 4;
-                this.DefaultGrass = 20;
-                this.DefaultColor = ""0x999900"";
-                break;
-            }
-            case 2:
-            {
-                this.DefaultTrees = 0;
-                this.DefaultDeadBrush = 4;
-                this.DefaultGrass = 0;
-                this.DefaultReed = 10;
-                this.DefaultCactus = 10;
-                this.DefaultColor = ""0xFFCC33"";
-                break;
-            }
-            case 3:
-                this.DefaultColor = ""0x333300"";
-                break;
-            case 4:
-            {
-                this.DefaultTrees = 10;
-                this.DefaultGrass = 15;
-                this.DefaultColor = ""0x00FF00"";
-                break;
-            }
-            case 5:
-            {
-                this.DefaultTrees = 10;
-                this.DefaultGrass = 10;
-                this.DefaultColor = ""0x007700"";
-                break;
-            }
-            case 6:
-            {
-                this.DefaultTrees = 2;
-                this.DefaultFlowers = -999;
-                this.DefaultDeadBrush = 1;
-                this.DefaultMushroom = 8;
-                this.DefaultReed = 10;
-                this.DefaultClay = 1;
-                this.DefaultWaterLily = 1;
-                this.DefaultColor = ""0x99CC66"";
-                this.DefaultWaterColorMultiplier = ""0xe0ffae"";
-                this.DefaultGrassColor = ""0x7E6E7E"";
-                this.DefaultFoliageColor = ""0x7E6E7E"";
-                break;
-            }
-            case 7:
-                this.DefaultSize = 8;
-                this.DefaultRarity = 95;
-                this.DefaultIsle.add(DefaultBiome.SWAMPLAND.Name);
-                this.DefaultColor = ""0x00CCCC"";
-            case 8:
-            case 9:
-
-                break;
-            case 10:
-                this.DefaultColor = ""0xFFFFFF"";
-                break;
-            case 11:
-                this.DefaultColor = ""0x66FFFF"";
-                break;
-            case 12:
-                this.DefaultColor = ""0xCCCCCC"";
-                break;
-            case 13:
-                this.DefaultColor = ""0xCC9966"";
-                break;
-            case 14:
-            {
-                this.DefaultSurfaceBlock = (byte) DefaultMaterial.MYCEL.id;
-                this.DefaultMushroom = 1;
-                this.DefaultGrass = 0;
-                this.DefaultFlowers = 0;
-                this.DefaultTrees = 0;
-                this.DefaultRarity = 1;
-                this.DefaultRiver = false;
-                this.DefaultSize = 6;
-                this.DefaultIsle.add(DefaultBiome.OCEAN.Name);
-                this.DefaultColor = ""0xFF33CC"";
-                this.DefaultWaterLily = 1;
-                break;
-            }
-            case 15:
-            {
-                this.DefaultRiver = false;
-                this.DefaultSize = 9;
-                this.DefaultBorder.add(DefaultBiome.MUSHROOM_ISLAND.Name);
-                this.DefaultColor = ""0xFF9999"";
-                break;
-            }
-            case 16:
-                this.DefaultTrees = 0;
-                this.DefaultSize = 8;
-                this.DefaultBorder.add(DefaultBiome.OCEAN.Name);
-                this.DefaultNotBorderNear.add(DefaultBiome.RIVER.Name);
-                this.DefaultNotBorderNear.add(DefaultBiome.SWAMPLAND.Name);
-                this.DefaultNotBorderNear.add(DefaultBiome.EXTREME_HILLS.Name);
-                this.DefaultNotBorderNear.add(DefaultBiome.MUSHROOM_ISLAND.Name);
-                this.DefaultColor = ""0xFFFF00"";
-                break;
-            case 17:
-                this.DefaultSize = 6;
-                this.DefaultRarity = 97;
-                this.DefaultIsle.add(DefaultBiome.DESERT.Name);
-                this.DefaultTrees = 0;
-                this.DefaultDeadBrush = 4;
-                this.DefaultGrass = 0;
-                this.DefaultReed = 50;
-                this.DefaultCactus = 10;
-                this.DefaultColor = ""0x996600"";
-                break;
-            case 18:
-                this.DefaultSize = 6;
-                this.DefaultRarity = 97;
-                this.DefaultIsle.add(DefaultBiome.FOREST.Name);
-                this.DefaultTrees = 10;
-                this.DefaultGrass = 15;
-                this.DefaultColor = ""0x009900"";
-                break;
-            case 19:
-                this.DefaultSize = 6;
-                this.DefaultRarity = 97;
-                this.DefaultIsle.add(DefaultBiome.TAIGA.Name);
-                this.DefaultTrees = 10;
-                this.DefaultGrass = 10;
-                this.DefaultColor = ""0x003300"";
-                break;
-            case 20:
-                this.DefaultSize = 8;
-                this.DefaultBorder.add(DefaultBiome.EXTREME_HILLS.Name);
-                this.DefaultColor = ""0x666600"";
-                break;
-            case 21:
-                this.DefaultTrees = 50;
-                this.DefaultGrass = 25;
-                this.DefaultFlowers = 4;
-                this.DefaultColor = ""0xCC6600"";
-                break;
-            case 22:
-                this.DefaultTrees = 50;
-                this.DefaultGrass = 25;
-                this.DefaultFlowers = 4;
-                this.DefaultColor = ""0x663300"";
-                this.DefaultIsle.add(DefaultBiome.JUNGLE.Name);
-                break;
+        case 0:
+            this.DefaultColor = ""0x3333FF"";
+            break;
+        case 1:
+        {
+            this.DefaultTrees = 0;
+            this.DefaultFlowers = 4;
+            this.DefaultGrass = 20;
+            this.DefaultColor = ""0x999900"";
+            break;
+        }
+        case 2:
+        {
+            this.DefaultTrees = 0;
+            this.DefaultDeadBrush = 4;
+            this.DefaultGrass = 0;
+            this.DefaultReed = 10;
+            this.DefaultCactus = 10;
+            this.DefaultColor = ""0xFFCC33"";
+            break;
+        }
+        case 3:
+            this.DefaultColor = ""0x333300"";
+            break;
+        case 4:
+        {
+            this.DefaultTrees = 10;
+            this.DefaultGrass = 15;
+            this.DefaultColor = ""0x00FF00"";
+            break;
+        }
+        case 5:
+        {
+            this.DefaultTrees = 10;
+            this.DefaultGrass = 10;
+            this.DefaultColor = ""0x007700"";
+            break;
+        }
+        case 6:
+        {
+            this.DefaultTrees = 2;
+            this.DefaultFlowers = -999;
+            this.DefaultDeadBrush = 1;
+            this.DefaultMushroom = 8;
+            this.DefaultReed = 10;
+            this.DefaultClay = 1;
+            this.DefaultWaterLily = 1;
+            this.DefaultColor = ""0x99CC66"";
+            this.DefaultWaterColorMultiplier = ""0xe0ffae"";
+            this.DefaultGrassColor = ""0x7E6E7E"";
+            this.DefaultFoliageColor = ""0x7E6E7E"";
+            break;
+        }
+        case 7:
+            this.DefaultSize = 8;
+            this.DefaultRarity = 95;
+            this.DefaultIsle.add(DefaultBiome.SWAMPLAND.Name);
+            this.DefaultColor = ""0x00CCCC"";
+        case 8:
+        case 9:
+
+            break;
+        case 10:
+            this.DefaultColor = ""0xFFFFFF"";
+            break;
+        case 11:
+            this.DefaultColor = ""0x66FFFF"";
+            break;
+        case 12:
+            this.DefaultColor = ""0xCCCCCC"";
+            break;
+        case 13:
+            this.DefaultColor = ""0xCC9966"";
+            break;
+        case 14:
+        {
+            this.DefaultSurfaceBlock = (byte) DefaultMaterial.MYCEL.id;
+            this.DefaultMushroom = 1;
+            this.DefaultGrass = 0;
+            this.DefaultFlowers = 0;
+            this.DefaultTrees = 0;
+            this.DefaultRarity = 1;
+            this.DefaultRiver = false;
+            this.DefaultSize = 6;
+            this.DefaultIsle.add(DefaultBiome.OCEAN.Name);
+            this.DefaultColor = ""0xFF33CC"";
+            this.DefaultWaterLily = 1;
+            break;
+        }
+        case 15:
+        {
+            this.DefaultRiver = false;
+            this.DefaultSize = 9;
+            this.DefaultBorder.add(DefaultBiome.MUSHROOM_ISLAND.Name);
+            this.DefaultColor = ""0xFF9999"";
+            break;
+        }
+        case 16:
+            this.DefaultTrees = 0;
+            this.DefaultSize = 8;
+            this.DefaultBorder.add(DefaultBiome.OCEAN.Name);
+            this.DefaultNotBorderNear.add(DefaultBiome.RIVER.Name);
+            this.DefaultNotBorderNear.add(DefaultBiome.SWAMPLAND.Name);
+            this.DefaultNotBorderNear.add(DefaultBiome.EXTREME_HILLS.Name);
+            this.DefaultNotBorderNear.add(DefaultBiome.MUSHROOM_ISLAND.Name);
+            this.DefaultColor = ""0xFFFF00"";
+            break;
+        case 17:
+            this.DefaultSize = 6;
+            this.DefaultRarity = 97;
+            this.DefaultIsle.add(DefaultBiome.DESERT.Name);
+            this.DefaultTrees = 0;
+            this.DefaultDeadBrush = 4;
+            this.DefaultGrass = 0;
+            this.DefaultReed = 50;
+            this.DefaultCactus = 10;
+            this.DefaultColor = ""0x996600"";
+            break;
+        case 18:
+            this.DefaultSize = 6;
+            this.DefaultRarity = 97;
+            this.DefaultIsle.add(DefaultBiome.FOREST.Name);
+            this.DefaultTrees = 10;
+            this.DefaultGrass = 15;
+            this.DefaultColor = ""0x009900"";
+            break;
+        case 19:
+            this.DefaultSize = 6;
+            this.DefaultRarity = 97;
+            this.DefaultIsle.add(DefaultBiome.TAIGA.Name);
+            this.DefaultTrees = 10;
+            this.DefaultGrass = 10;
+            this.DefaultColor = ""0x003300"";
+            break;
+        case 20:
+            this.DefaultSize = 8;
+            this.DefaultBorder.add(DefaultBiome.EXTREME_HILLS.Name);
+            this.DefaultColor = ""0x666600"";
+            break;
+        case 21:
+            this.DefaultTrees = 50;
+            this.DefaultGrass = 25;
+            this.DefaultFlowers = 4;
+            this.DefaultColor = ""0xCC6600"";
+            break;
+        case 22:
+            this.DefaultTrees = 50;
+            this.DefaultGrass = 25;
+            this.DefaultFlowers = 4;
+            this.DefaultColor = ""0x663300"";
+            this.DefaultIsle.add(DefaultBiome.JUNGLE.Name);
+            break;
         }
     }
 
diff --git a/common/src/com/khorn/terraincontrol/configuration/ConfigFile.java b/common/src/com/khorn/terraincontrol/configuration/ConfigFile.java
index 93e688b2a..7ef4da5a4 100644
--- a/common/src/com/khorn/terraincontrol/configuration/ConfigFile.java
+++ b/common/src/com/khorn/terraincontrol/configuration/ConfigFile.java
@@ -8,6 +8,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public abstract class ConfigFile
 {
@@ -15,7 +16,7 @@ public abstract class ConfigFile
 
     // TODO: This map is populated with lowercase versions as well.
     // TODO: That is a derped approach. Use TreeSet with CASE_INSENSITIVE_ORDER instead.
-    protected HashMap<String, String> SettingsCache = new HashMap<String, String>();
+    protected Map<String, String> SettingsCache = new HashMap<String, String>();
 
     // TODO: We should use GSON only instead of just for a few fields.
     // TODO: Hah. We should remove that buggy GSON.
diff --git a/common/src/com/khorn/terraincontrol/configuration/Resource.java b/common/src/com/khorn/terraincontrol/configuration/Resource.java
index 5169b3f42..569fe97e3 100644
--- a/common/src/com/khorn/terraincontrol/configuration/Resource.java
+++ b/common/src/com/khorn/terraincontrol/configuration/Resource.java
@@ -1,99 +1,258 @@
 package com.khorn.terraincontrol.configuration;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 import com.khorn.terraincontrol.DefaultMaterial;
-import com.khorn.terraincontrol.customobjects.CustomObjectCompiled;
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 import com.khorn.terraincontrol.generator.resourcegens.ResourceType;
-import com.khorn.terraincontrol.generator.resourcegens.TreeType;
 
-public class Resource
+public abstract class Resource
 {
-    public ResourceType Type;
-    public int MinAltitude;
-    public int MaxAltitude;
-    public int MinSize;
-    public int MaxSize;
-    public int BlockId;
-    public int BlockData;
-    public int[] SourceBlockId = new int[0];
-    public int Frequency;
-    public int Rarity;
-    public TreeType[] TreeTypes = new TreeType[0];
-    public int[] TreeChances = new int[0];
-
-    // For custom trees
-    public CustomObjectCompiled[] CUObjectsWorld = new CustomObjectCompiled[0];
-    public CustomObjectCompiled[] CUObjectsBiome = new CustomObjectCompiled[0];
-
-    public CustomObjectCompiled[] CUObjects = new CustomObjectCompiled[0];
-    public String[] CUObjectsNames = new String[0];
-
-
-    public Resource(ResourceType type)
+    protected int frequency;
+    protected int rarity;
+    protected WorldConfig worldConfig;
+
+    /**
+     * Sets the world. Needed for some resources, like CustomObject and Tree.
+     * @param world
+     */
+    public void setWorldConfig(WorldConfig worldConfig)
     {
-        Type = type;
+        this.worldConfig = worldConfig;
     }
-
-    public Resource(ResourceType type, int blockId, int blockData, int size, int frequency, int rarity, int minAltitude, int maxAltitude, int[] sourceBlockIds)
+    
+    /**
+     * Convenience method for creating a resource. Used to create the default resources.
+     * @param world
+     * @param clazz
+     * @param args
+     * @return
+     */
+    public static Resource create(WorldConfig config, Class<? extends Resource> clazz, Object... args)
     {
-        this.Type = type;
-        this.BlockId = blockId;
-        this.BlockData = blockData;
-        this.MaxSize = size;
-        this.Frequency = frequency;
-        this.Rarity = rarity;
-        this.MinAltitude = minAltitude;
-        this.MaxAltitude = maxAltitude;
-        this.SourceBlockId = sourceBlockIds;
+        List<String> stringArgs = new ArrayList<String>(args.length);
+        for(Object arg: args)
+        {
+            stringArgs.add("""" + arg);
+        }
+        
+        Resource resource;
+        try
+        {
+            resource = clazz.newInstance();
+        } catch (InstantiationException e)
+        {
+            return null;
+        } catch (IllegalAccessException e)
+        {
+            return null;
+        }
+        resource.setWorldConfig(config);
+        try {
+            resource.load(stringArgs);
+        } catch(InvalidResourceException e)
+        {
+            TerrainControl.log(""Invalid default resource! Please report! "" + clazz.getName() + "": ""+e.getMessage());
+            e.printStackTrace();
+        }
+        
+        return resource;
     }
 
-    public Resource(ResourceType type, int minSize, int maxSize, int frequency, int rarity, int minAltitude, int maxAltitude)
+    /**
+     * Loads the settings. Returns false if one of the arguments contains an
+     * error.
+     * 
+     * @param args
+     *            List of args.
+     * @return Returns false if one of the arguments contains an error,
+     *         otherwise true.
+     * @throws InvalidResourceException
+     *             If the resoure is invalid.
+     */
+    public abstract void load(List<String> args) throws InvalidResourceException;
+
+    /**
+     * Spawns the resource at this position, ignoring rarity and frequency.
+     * 
+     * @param world
+     * @param chunkX
+     * @param chunkZ
+     */
+    public abstract void spawn(LocalWorld world, Random random, int x, int z);
+
+    /**
+     * Spawns the resource normally.
+     * 
+     * @param world
+     * @param chunkX
+     * @param chunkZ
+     */
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
     {
-        this.Type = type;
-        this.MaxSize = maxSize;
-        this.MinSize = minSize;
-        this.Frequency = frequency;
-        this.Rarity = rarity;
-        this.MinAltitude = minAltitude;
-        this.MaxAltitude = maxAltitude;
+        for (int t = 0; t < frequency; t++)
+        {
+            if (random.nextInt(100) > rarity)
+                continue;
+            int x = chunkX * 16 + random.nextInt(16) + 8;
+            int z = chunkZ * 16 + random.nextInt(16) + 8;
+            spawn(world, random, x, z);
+        }
     }
 
-    public Resource(ResourceType type, int blockId, int frequency, int rarity, int minAltitude, int maxAltitude)
+    /**
+     * Gets the type of this resource.
+     * 
+     * @return The type of this resource.
+     */
+    public abstract ResourceType getType();
+
+    /**
+     * Gets a String representation, like Tree(10,BigTree,50,Tree,100)
+     * 
+     * @return A String representation, like Tree(10,BigTree,50,Tree,100)
+     */
+    public abstract String makeString();
+
+    /**
+     * Parses the string and returns a number between minValue and maxValue.
+     * Returns Resource.INCORRECT_NUMBER if the string is not a number.
+     * 
+     * @param string
+     * @param minValue
+     * @param maxValue
+     * @return
+     * @throws InvalidResourceException
+     *             If the number is invalid.
+     */
+    public int getInt(String string, int minValue, int maxValue) throws InvalidResourceException
     {
-        this.Type = type;
-        this.BlockId = blockId;
-        this.Frequency = frequency;
-        this.Rarity = rarity;
-        this.MinAltitude = minAltitude;
-        this.MaxAltitude = maxAltitude;
+        try
+        {
+            int number = Integer.parseInt(string);
+            if (number < minValue)
+            {
+                return minValue;
+            }
+            if (number > maxValue)
+            {
+                return maxValue;
+            }
+            return number;
+        } catch (NumberFormatException e)
+        {
+            throw new InvalidResourceException(""Incorrect number: "" + string);
+        }
     }
 
-    public Resource(ResourceType type, int frequency, TreeType[] types, int[] treeChances)
+    /**
+     * Returns the block id with the given name.
+     * 
+     * @param string
+     * @return
+     */
+    public int getBlockId(String string) throws InvalidResourceException
     {
-        this.Type = type;
-        this.Frequency = frequency;
-        if (types != null)
+        if (string.indexOf('.') != -1)
+        {
+            // Ignore block data
+            string = string.split(""\\."")[0];
+        }
+
+        DefaultMaterial material = DefaultMaterial.getMaterial(string);
+        if (material != null)
         {
-            this.TreeTypes = types;
-            this.TreeChances = treeChances;
+            return material.id;
         }
+
+        return getInt(string, 0, 256);
     }
 
-    public boolean CheckSourceId(int blockId)
+    /**
+     * Gets the block data from a material string.
+     * 
+     * @param string
+     * @return
+     * @throws InvalidResourceException
+     */
+    public int getBlockData(String string) throws InvalidResourceException
     {
-        for (int id : this.SourceBlockId)
-            if (blockId == id)
-                return true;
-        return false;
+        if (string.indexOf('.') == -1)
+        {
+            // No block data
+            return 0;
+        }
+
+        // Get block data
+        string = string.split(""\\."")[1];
+        return getInt(string, 0, 16);
     }
 
+    public void assureSize(int size, List<String> args) throws InvalidResourceException
+    {
+        if (args.size() < size)
+        {
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+    }
 
-    public String BlockIdToName(int id)
+    /**
+     * Gets the material name back from the id and data.
+     * 
+     * @param id
+     *            The block id
+     * @param data
+     *            The block data
+     * @return String in the format blockname[.blockdata]
+     */
+    public String makeMaterial(int id, int data)
     {
+        String materialString = """" + id;
         DefaultMaterial material = DefaultMaterial.getMaterial(id);
         if (material != DefaultMaterial.UNKNOWN_BLOCK)
-            return material.name();
-        else
-            return Integer.toString(id);
+        {
+            // No name, return number as String
+            materialString = material.toString();
+        }
+
+        if (data > 0)
+        {
+            materialString = materialString + ""."" + data;
+        }
+
+        return materialString;
     }
 
+    /**
+     * Gets the material name back from the id.
+     * 
+     * @param id
+     *            The block id
+     * @return String in the format blockname
+     */
+    public String makeMaterial(int id)
+    {
+        return makeMaterial(id, 0);
+    }
+
+    /**
+     * Returns a String in the format "",materialName,materialName,etc""
+     * 
+     * @param ids
+     * @return
+     */
+    public String makeMaterial(List<Integer> ids)
+    {
+        String string = """";
+        for (int blockId : ids)
+        {
+            string += "","";
+            string += makeMaterial(blockId);
+        }
+        return string;
+    }
 }
diff --git a/common/src/com/khorn/terraincontrol/configuration/WorldConfig.java b/common/src/com/khorn/terraincontrol/configuration/WorldConfig.java
index a25695090..b7fbf0fac 100644
--- a/common/src/com/khorn/terraincontrol/configuration/WorldConfig.java
+++ b/common/src/com/khorn/terraincontrol/configuration/WorldConfig.java
@@ -3,9 +3,8 @@
 import com.khorn.terraincontrol.DefaultBiome;
 import com.khorn.terraincontrol.LocalBiome;
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.customobjects.CustomObject;
-import com.khorn.terraincontrol.customobjects.CustomObjectCompiled;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -13,13 +12,19 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 
 public class WorldConfig extends ConfigFile
 {
+    public LocalWorld world;
+    
     public ArrayList<String> CustomBiomes = new ArrayList<String>();
     public HashMap<String, Integer> CustomBiomeIds = new HashMap<String, Integer>();
 
-    public ArrayList<CustomObjectCompiled> CustomObjectsCompiled;
+    /**
+     * Holds all world CustomObjects. All keys should be lowercase.
+     */
+    public Map<String,CustomObject> customObjects = new HashMap<String, CustomObject>();
 
     public ArrayList<String> NormalBiomes = new ArrayList<String>();
     public ArrayList<String> IceBiomes = new ArrayList<String>();
@@ -32,10 +37,6 @@ public class WorldConfig extends ConfigFile
     public byte[] ReplaceMatrixBiomes = new byte[256];
     public boolean HaveBiomeReplace = false;
 
-    // public BiomeBase currentBiome;
-    // --Commented out by Inspection (17.07.11 1:49):String seedValue;
-
-
     // For old biome generator
     public double oldBiomeSize;
 
@@ -161,6 +162,7 @@ public WorldConfig(File settingsDir, LocalWorld world, boolean checkOnly)
     {
         this.SettingsDir = settingsDir;
         this.WorldName = world.getName();
+        this.world = world;
 
         File settingsFile = new File(this.SettingsDir, TCDefaultValues.WorldSettingsName.stringValue());
 
@@ -285,15 +287,9 @@ private void ReadWorldCustomObjects()
             }
         }
 
-        ArrayList<CustomObject> rawObjects = ObjectsStore.LoadObjectsFromDirectory(CustomObjectsDirectory);
-
-
-        CustomObjectsCompiled = new ArrayList<CustomObjectCompiled>();
-
-        for (CustomObject object : rawObjects)
-            CustomObjectsCompiled.add(object.Compile(""""));
-        System.out.println(""TerrainControl: "" + CustomObjectsCompiled.size() + "" world custom objects loaded"");
+        customObjects = TerrainControl.getCustomObjectManager().loadObjects(CustomObjectsDirectory);
 
+        TerrainControl.log(customObjects.size() + "" world custom objects loaded"");
 
     }
 
diff --git a/common/src/com/khorn/terraincontrol/customobjects/CustomObject.java b/common/src/com/khorn/terraincontrol/customobjects/CustomObject.java
index bdb8e3347..a7394627a 100644
--- a/common/src/com/khorn/terraincontrol/customobjects/CustomObject.java
+++ b/common/src/com/khorn/terraincontrol/customobjects/CustomObject.java
@@ -1,101 +1,123 @@
-package com.khorn.terraincontrol.customobjects;
-
-
-import com.khorn.terraincontrol.configuration.ConfigFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class CustomObject extends ConfigFile
-{
-    public boolean IsValid = false;
-    public File FilePath;
-    public String Name = """";
-
-    public CustomObject(File objectFile)
-    {
-        FilePath = objectFile;
-        Name = objectFile.getName();
-
-        if(!Name.toLowerCase().endsWith(BODefaultValues.BO_Extension.stringValue().toLowerCase()))
-            return;
-
-        //Remove extension.
-        Name = Name.substring(0, Name.length() - 4);
-
-
-        ReadSettingsFile(objectFile);
-        CorrectSettings();
-        if (SettingsCache.containsKey(""[META]"") && SettingsCache.containsKey(""[DATA]""))
-            this.IsValid = true;
-
-        if (!this.IsValid)
-            return;
-
-        ReadConfigSettings();
-    }
-
-    public CustomObjectCompiled Compile(String settingsLine)
-    {
-        HashMap<String, String> newSettings = new HashMap<String, String>();
-        for (Map.Entry<String, String> entry : this.SettingsCache.entrySet())
-            if (BODefaultValues.Contains(entry.getKey()) || ObjectCoordinate.isCoordinateString(entry.getKey()))
-                newSettings.put(entry.getKey(), entry.getValue());
-
-        String[] keys = settingsLine.split("";"");
-        String changedSettings = """";
-        boolean first = true;
-
-        for (String key : keys)
-        {
-            String[] values = null;
-            if (key.contains(""=""))
-                values = key.split(""="", 2);
-            else if (key.contains("":""))
-                values = key.split(""="", 2);
-            if (values == null)
-                continue;
-            if (BODefaultValues.Contains(values[0].toLowerCase()) || ObjectCoordinate.isCoordinateString(values[0]))
-            {
-                newSettings.put(values[0].toLowerCase(), values[1]);
-                changedSettings = changedSettings + (first ? """" : "";"") + key;
-                if (first)
-                    first = false;
-            }
-        }
-
-        return new CustomObjectCompiled(newSettings, Name, changedSettings, this);
-
-    }
-
-    @Override
-    public boolean sayNotFoundEnabled()
-    {
-        return false;
-    }
-
-    @Override
-    protected void ReadConfigSettings()
-    {
-
-    }
-
-    @Override
-    protected void WriteConfigSettings() throws IOException
-    {
-
-    }
-
-    @Override
-    protected void CorrectSettings()
-    {
-
-    }
-
-    @Override
-    protected void RenameOldSettings()
-    {
-    }
-}
+package com.khorn.terraincontrol.customobjects;
+
+import java.util.Map;
+import java.util.Random;
+
+import com.khorn.terraincontrol.LocalBiome;
+import com.khorn.terraincontrol.LocalWorld;
+
+public interface CustomObject
+{
+    /**
+     * Returns the name of this object.
+     * 
+     * @return
+     */
+    public String getName();
+
+    /**
+     * Returns whether this object can spawn as a tree. UseWorld and UseBiome
+     * should return true.
+     * 
+     * @return Whether this object can spawn as a tree.
+     */
+    public boolean canSpawnAsTree();
+
+    /**
+     * Returns whether this object can spawn from the CustomObject() resource.
+     * Vanilla trees should return false; everything else should return true.
+     * 
+     * @return
+     */
+    public boolean canSpawnAsObject();
+
+    /**
+     * Spawns the object at the given position.
+     * 
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     * @return Whether the attempt was successful.
+     */
+    public boolean spawn(LocalWorld world, Random random, int x, int y, int z);
+
+    /**
+     * Spawns the object at the given position. If the object isn't a tree, it
+     * shouldn't spawn and it should return false.
+     * 
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     * @return Whether the attempt was successful.
+     */
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z);
+
+    /**
+     * Spawns the object at the given position. It should search a suitable y
+     * location by itself.
+     * 
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     * @return Whether the attempt was successful.
+     */
+    public boolean spawn(LocalWorld world, Random random, int x, int z);
+
+    /**
+     * Spawns the object at the given position. It should search a suitable y
+     * location by itself. If the object isn't a tree, it shouldn't spawn and it
+     * should return false.
+     * 
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     * @return Whether the attempt was successful.
+     */
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int z);
+
+    /**
+     * Spawns the object in a chunk. The object can search a good y position by
+     * itself.
+     * 
+     * @param world
+     * @param random
+     * @param chunkX
+     * @param chunkZ
+     */
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ);
+
+    /**
+     * Spawns the object in a chunk. The object can search a good y position by
+     * itself. If the object isn't a tree, the object shouldn't spawn and it
+     * should return false.
+     * 
+     * @param world
+     * @param random
+     * @param x
+     * @param z
+     */
+    public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ);
+
+    /**
+     * Returns a copy of this object will all the settings applied. Can return
+     * null if the settings are invalid.
+     * 
+     * @param settings
+     *            A Map with all the settings.
+     * @return A copy of this object will all the settings applied.
+     */
+    public CustomObject applySettings(Map<String, String> settings);
+
+    /**
+     * Returns whether this object would like to spawn in this biome. BO2s will
+     * return whether this biome is in their spawnInBiome setting.
+     * 
+     * @param biome
+     * @return
+     */
+    public boolean hasPreferenceToSpawnIn(LocalBiome biome);
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/CustomObjectCompiled.java b/common/src/com/khorn/terraincontrol/customobjects/CustomObjectCompiled.java
deleted file mode 100644
index 032cf215c..000000000
--- a/common/src/com/khorn/terraincontrol/customobjects/CustomObjectCompiled.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package com.khorn.terraincontrol.customobjects;
-
-import com.khorn.terraincontrol.DefaultMaterial;
-import com.khorn.terraincontrol.configuration.ConfigFile;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-
-public class CustomObjectCompiled extends ConfigFile
-{
-    public ObjectCoordinate[][] Data = new ObjectCoordinate[4][];
-
-    public CustomObjectCompiled[] GroupObjects = null;
-
-    public String Name;
-
-    public HashSet<String> SpawnInBiome;
-
-    public String Version;
-    public HashSet<Integer> SpawnOnBlockType;
-
-    public HashSet<Integer> CollisionBlockType;
-
-    public boolean SpawnWater;
-    public boolean SpawnLava;
-    public boolean SpawnAboveGround;
-    public boolean SpawnUnderGround;
-
-    public boolean SpawnSunlight;
-    public boolean SpawnDarkness;
-
-    public boolean UnderFill;
-    public boolean RandomRotation;
-    public boolean Dig;
-    public boolean Tree;
-    public boolean Branch;
-    public boolean DiggingBranch;
-    public boolean NeedsFoundation;
-    public int Rarity;
-    public double CollisionPercentage;
-    public int SpawnElevationMin;
-    public int SpawnElevationMax;
-
-    public int GroupFrequencyMin;
-    public int GroupFrequencyMax;
-    public int GroupSeparationMin;
-    public int GroupSeparationMax;
-    public String GroupId;
-
-    public int BranchLimit;
-
-    public String ChangedSettings;
-
-    public CustomObject parent;
-
-    public CustomObjectCompiled(HashMap<String, String> settings, String name, String changedSettings, CustomObject parent)
-    {
-        SettingsCache = settings;
-        this.Name = name;
-        this.ChangedSettings = changedSettings;
-        this.parent = parent;
-
-        ReadConfigSettings();
-        CorrectSettings();
-
-        SettingsCache.clear();
-        SettingsCache = null;
-    }
-
-
-    public boolean CheckBiome(String biomeName)
-    {
-        return (SpawnInBiome.contains(BODefaultValues.BO_ALL_KEY.stringValue()) || SpawnInBiome.contains(BODefaultValues.BO_ALL_KEY.stringValue().toLowerCase()) || SpawnInBiome.contains(biomeName));
-    }
-
-
-    @Override
-    protected void ReadConfigSettings()
-    {
-        this.Version = ReadModSettings(BODefaultValues.version.name(), BODefaultValues.version.stringValue());
-
-
-        this.SpawnOnBlockType = this.ReadBlockList(ReadModSettings(BODefaultValues.spawnOnBlockType.name(), BODefaultValues.spawnOnBlockType.StringArrayListValue()),BODefaultValues.spawnOnBlockType.name());
-        this.CollisionBlockType = this.ReadBlockList(ReadModSettings(BODefaultValues.collisionBlockType.name(), BODefaultValues.collisionBlockType.StringArrayListValue()),BODefaultValues.collisionBlockType.name());
-
-        this.SpawnInBiome = new HashSet<String>(ReadModSettings(BODefaultValues.spawnInBiome.name(), BODefaultValues.spawnInBiome.StringArrayListValue()));
-
-
-        this.SpawnSunlight = ReadModSettings(BODefaultValues.spawnSunlight.name(), BODefaultValues.spawnSunlight.booleanValue());
-        this.SpawnDarkness = ReadModSettings(BODefaultValues.spawnDarkness.name(), BODefaultValues.spawnDarkness.booleanValue());
-        this.SpawnWater = ReadModSettings(BODefaultValues.spawnWater.name(), BODefaultValues.spawnWater.booleanValue());
-        this.SpawnLava = ReadModSettings(BODefaultValues.spawnLava.name(), BODefaultValues.spawnLava.booleanValue());
-        this.SpawnAboveGround = ReadModSettings(BODefaultValues.spawnAboveGround.name(), BODefaultValues.spawnAboveGround.booleanValue());
-        this.SpawnUnderGround = ReadModSettings(BODefaultValues.spawnUnderGround.name(), BODefaultValues.spawnUnderGround.booleanValue());
-
-        this.UnderFill = ReadModSettings(BODefaultValues.underFill.name(), BODefaultValues.underFill.booleanValue());
-
-        this.RandomRotation = ReadModSettings(BODefaultValues.randomRotation.name(), BODefaultValues.randomRotation.booleanValue());
-        this.Dig = ReadModSettings(BODefaultValues.dig.name(), BODefaultValues.dig.booleanValue());
-        this.Tree = ReadModSettings(BODefaultValues.tree.name(), BODefaultValues.tree.booleanValue());
-        this.Branch = ReadModSettings(BODefaultValues.branch.name(), BODefaultValues.branch.booleanValue());
-        this.DiggingBranch = ReadModSettings(BODefaultValues.diggingBranch.name(), BODefaultValues.diggingBranch.booleanValue());
-        this.NeedsFoundation = ReadModSettings(BODefaultValues.needsFoundation.name(), BODefaultValues.needsFoundation.booleanValue());
-        this.Rarity = ReadModSettings(BODefaultValues.rarity.name(), BODefaultValues.rarity.intValue());
-        this.CollisionPercentage = ReadModSettings(BODefaultValues.collisionPercentage.name(), BODefaultValues.collisionPercentage.intValue());
-        this.SpawnElevationMin = ReadModSettings(BODefaultValues.spawnElevationMin.name(), BODefaultValues.spawnElevationMin.intValue());
-        this.SpawnElevationMax = ReadModSettings(BODefaultValues.spawnElevationMax.name(), BODefaultValues.spawnElevationMax.intValue());
-
-        this.GroupFrequencyMin = ReadModSettings(BODefaultValues.groupFrequencyMin.name(), BODefaultValues.groupFrequencyMin.intValue());
-        this.GroupFrequencyMax = ReadModSettings(BODefaultValues.groupFrequencyMax.name(), BODefaultValues.groupFrequencyMax.intValue());
-        this.GroupSeparationMin = ReadModSettings(BODefaultValues.groupSeperationMin.name(), BODefaultValues.groupSeperationMin.intValue());
-        this.GroupSeparationMax = ReadModSettings(BODefaultValues.groupSeperationMax.name(), BODefaultValues.groupSeperationMax.intValue());
-        this.GroupId = ReadModSettings(BODefaultValues.groupId.name(), BODefaultValues.groupId.stringValue());
-
-
-        this.BranchLimit = ReadModSettings(BODefaultValues.branchLimit.name(), BODefaultValues.branchLimit.intValue());
-
-        this.ReadCoordinates();
-    }
-
-    @Override
-    protected boolean sayNotFoundEnabled()
-    {
-        return false;
-    }
-    
-    @Override
-    protected void CorrectSettings()
-    {
-
-
-    }
-
-    @Override
-    protected void WriteConfigSettings() throws IOException
-    {
-
-    }
-
-    @Override
-    protected void RenameOldSettings()
-    {
-
-    }
-
-
-    private void ReadCoordinates()
-    {
-        ArrayList<ObjectCoordinate> coordinates = new ArrayList<ObjectCoordinate>();
-
-        for (String key : SettingsCache.keySet())
-        {
-            ObjectCoordinate buffer = ObjectCoordinate.getCoordinateFromString(key, SettingsCache.get(key));
-            if (buffer != null)
-                coordinates.add(buffer);
-        }
-
-        Data[0] = new ObjectCoordinate[coordinates.size()];
-        Data[1] = new ObjectCoordinate[coordinates.size()];
-        Data[2] = new ObjectCoordinate[coordinates.size()];
-        Data[3] = new ObjectCoordinate[coordinates.size()];
-
-        for (int i = 0; i < coordinates.size(); i++)
-        {
-            ObjectCoordinate coordinate = coordinates.get(i);
-
-            Data[0][i] = coordinate;
-            coordinate = coordinate.Rotate();
-            Data[1][i] = coordinate;
-            coordinate = coordinate.Rotate();
-            Data[2][i] = coordinate;
-            coordinate = coordinate.Rotate();
-            Data[3][i] = coordinate;
-        }
-
-
-    }
-
-    private HashSet<Integer> ReadBlockList(ArrayList<String> blocks, String settingName)
-    {
-        HashSet<Integer> output = new HashSet<Integer>();
-
-        boolean nonIntegerValues = false;
-        boolean all = false;
-        boolean solid = false;
-
-        for (String block : blocks)
-        {
-
-            if (block.equals(BODefaultValues.BO_ALL_KEY.stringValue()))
-            {
-                all = true;
-                continue;
-            }
-            if (block.equals(BODefaultValues.BO_SolidKey.stringValue()))
-            {
-                solid = true;
-                continue;
-            }
-            try
-            {
-                int blockID = Integer.decode(block);
-                if (blockID != 0)
-                    output.add(blockID);
-            } catch (NumberFormatException e)
-            {
-                nonIntegerValues = true;
-            }
-        }
-
-        if (all || solid)
-            for (DefaultMaterial material : DefaultMaterial.values())
-            {
-                if(material.id == 0)
-                    continue;
-                if (solid && !material.isSolid())
-                    continue;
-                output.add(material.id);
-
-            }
-        if (nonIntegerValues)
-            System.out.println(""TerrainControl: Custom object "" + this.Name + "" have wrong value "" + settingName);
-
-        return output;
-
-    }
-}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/CustomObjectGen.java b/common/src/com/khorn/terraincontrol/customobjects/CustomObjectGen.java
deleted file mode 100644
index 06acaad21..000000000
--- a/common/src/com/khorn/terraincontrol/customobjects/CustomObjectGen.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.khorn.terraincontrol.customobjects;
-
-import com.khorn.terraincontrol.DefaultMaterial;
-import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
-import com.khorn.terraincontrol.generator.resourcegens.ResourceGenBase;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Random;
-
-public class CustomObjectGen extends ResourceGenBase
-{
-
-
-    @Override
-    public void Process(LocalWorld world, Random rand, Resource res, int _x, int _z)
-    {
-
-        if (res.CUObjects.length == 0)
-            return;
-
-        _x = _x + 8;
-        _z = _z + 8;
-
-        boolean objectSpawned = false;
-        int spawnAttempts = 0;
-        while (!objectSpawned)
-        {
-            if (spawnAttempts > world.getSettings().objectSpawnRatio)
-                return;
-
-            spawnAttempts++;
-
-            CustomObjectCompiled SelectedObject = res.CUObjects[rand.nextInt(res.CUObjects.length)];
-            if (SelectedObject.Branch)
-                continue;
-
-            int randomRoll = rand.nextInt(100);
-            int ObjectRarity = SelectedObject.Rarity;
-
-            while (randomRoll < ObjectRarity)
-            {
-                ObjectRarity -= 100;
-                
-                int x = _x + rand.nextInt(16);
-                int z = _z + rand.nextInt(16);
-                int y;
-
-                if (SelectedObject.SpawnAboveGround)
-                    y = world.getSolidHeight(x, z);
-                else if (SelectedObject.SpawnUnderGround)
-                {
-                    int solidHeight = world.getSolidHeight(x, z);
-                    if (solidHeight < 1 || solidHeight <= SelectedObject.SpawnElevationMin)
-                        continue;
-                    if (solidHeight > SelectedObject.SpawnElevationMax)
-                        solidHeight = SelectedObject.SpawnElevationMax;
-                    y = rand.nextInt(solidHeight - SelectedObject.SpawnElevationMin) + SelectedObject.SpawnElevationMin;
-                } else
-                    y = world.getHighestBlockYAt(x, z);
-
-                if (y < 0)
-                    continue;
-
-                if (!ObjectCanSpawn(world, x, y, z, SelectedObject))
-                    continue;
-
-
-                objectSpawned = GenerateCustomObject(world, rand, x, y, z, SelectedObject);
-
-                if (objectSpawned)
-                    GenerateCustomObjectFromGroup(world, rand, x, y, z, SelectedObject);
-            }
-        }
-
-
-    }
-
-    public static void GenerateCustomObjectFromGroup(LocalWorld world, Random rand, int x, int y, int z, CustomObjectCompiled workObject)
-    {
-        if (workObject.GroupObjects == null)
-            return;
-
-        int attempts = 3;
-        if ((workObject.GroupFrequencyMax - workObject.GroupFrequencyMin) > 0)
-            attempts = workObject.GroupFrequencyMin + rand.nextInt(workObject.GroupFrequencyMax - workObject.GroupFrequencyMin);
-
-        while (attempts > 0)
-        {
-            attempts--;
-
-            int objIndex = rand.nextInt(workObject.GroupObjects.length);
-            CustomObjectCompiled ObjectFromGroup = workObject.GroupObjects[objIndex];
-
-            if (ObjectFromGroup.Branch)
-                continue;
-
-            x = x + rand.nextInt(workObject.GroupSeparationMax - workObject.GroupSeparationMin) + workObject.GroupSeparationMin;
-            z = z + rand.nextInt(workObject.GroupSeparationMax - workObject.GroupSeparationMin) + workObject.GroupSeparationMin;
-            int _y;
-
-            if (workObject.SpawnAboveGround)
-                _y = world.getSolidHeight(x, z);
-            else if (workObject.SpawnUnderGround)
-            {
-                int solidHeight = world.getSolidHeight(x, z);
-                if (solidHeight < 1 || solidHeight <= workObject.SpawnElevationMin)
-                    continue;
-                if (solidHeight > workObject.SpawnElevationMax)
-                    solidHeight = workObject.SpawnElevationMax;
-                _y = rand.nextInt(solidHeight - workObject.SpawnElevationMin) + workObject.SpawnElevationMin;
-            } else
-                _y = world.getHighestBlockYAt(x, z);
-
-            if (y < 0)
-                continue;
-
-            if ((y - _y) > 10 || (_y - y) > 10)
-                continue;
-
-            if (!ObjectCanSpawn(world, x, y, z, ObjectFromGroup))
-                continue;
-            GenerateCustomObject(world, rand, x, _y, z, ObjectFromGroup);
-        }
-
-
-    }
-
-
-    public static boolean GenerateCustomObject(LocalWorld world, Random rand, int x, int y, int z, CustomObjectCompiled workObject)
-    {
-
-        ObjectCoordinate[] data = workObject.Data[0];
-        if (workObject.RandomRotation)
-            data = workObject.Data[rand.nextInt(4)];
-
-
-        int faultCounter = 0;
-
-        for (ObjectCoordinate point : data)
-        {
-            if (!world.isLoaded((x + point.x), (y + point.y), (z + point.z)))
-                return false;
-
-            if (!workObject.Dig)
-            {
-                if (workObject.CollisionBlockType.contains(world.getTypeId((x + point.x), (y + point.y), (z + point.z))))
-                {
-                    faultCounter++;
-                    if (faultCounter > (data.length * (workObject.CollisionPercentage / 100)))
-                    {
-                        return false;
-                    }
-                }
-            }
-
-
-        }
-
-        for (ObjectCoordinate point : data)
-        {
-
-            if (world.getTypeId(x + point.x, y + point.y, z + point.z) == 0)
-            {
-                world.setBlock((x + point.x), y + point.y, z + point.z, point.BlockId, point.BlockData, true, false, true);
-            } else if (workObject.Dig)
-            {
-                world.setBlock((x + point.x), y + point.y, z + point.z, point.BlockId, point.BlockData, true, false, true);
-            }
-
-        }
-        return true;
-
-    }
-
-    public static boolean ObjectCanSpawn(LocalWorld world, int x, int y, int z, CustomObjectCompiled obj)
-    {
-        if ((world.getTypeId(x, y - 5, z) == 0) && (obj.NeedsFoundation))
-            return false;
-
-        boolean output = true;
-        int checkBlock = world.getTypeId(x, y + 2, z);
-        if (!obj.SpawnWater)
-            output = !((checkBlock == DefaultMaterial.WATER.id) || (checkBlock == DefaultMaterial.STATIONARY_WATER.id));
-        if (!obj.SpawnLava)
-            output = !((checkBlock == DefaultMaterial.LAVA.id) || (checkBlock == DefaultMaterial.STATIONARY_LAVA.id));
-
-        checkBlock = world.getLightLevel(x, y + 2, z);
-        if (!obj.SpawnSunlight)
-            output = !(checkBlock > 8);
-        if (!obj.SpawnDarkness)
-            output = !(checkBlock < 9);
-
-        if ((y < obj.SpawnElevationMin) || (y > obj.SpawnElevationMax))
-            output = false;
-
-        if (!obj.SpawnOnBlockType.contains(world.getTypeId(x, y - 1, z)))
-            output = false;
-
-        return output;
-    }
-
-    @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
-    {
-
-
-    }
-
-    @Override
-    protected String WriteString(Resource res, String blockSources)
-    {
-        String output = """";
-        boolean first = true;
-
-        for (String name : res.CUObjectsNames)
-        {
-            output = output + (first ? """" : "","");
-            if (first)
-                first = false;
-
-            if (name.equals(BODefaultValues.BO_Use_World.stringValue()) || name.equals(BODefaultValues.BO_Use_Biome.stringValue()))
-            {
-                output += name;
-                continue;
-            }
-
-            for (CustomObjectCompiled object : res.CUObjects)
-                if (object.Name.equals(name))
-                    output += name + (object.ChangedSettings.equals("""") ? """" : (""("" + object.ChangedSettings + "")""));
-
-        }
-
-        return output;
-
-    }
-
-    @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
-    {
-
-        ArrayList<CustomObjectCompiled> objects = new ArrayList<CustomObjectCompiled>();
-        ArrayList<String> objectsName = new ArrayList<String>();
-        HashMap<String, ArrayList<CustomObjectCompiled>> Groups = new HashMap<String, ArrayList<CustomObjectCompiled>>();
-
-        if (Props.length == 1 && Props[0].equals(""""))
-        {
-            AddCompiledObjectsFromWorld(biomeConfig, objects, Groups);
-            objectsName.add(BODefaultValues.BO_Use_World.stringValue());
-
-        } else
-            for (String key : Props)
-            {
-                if (key.equals(BODefaultValues.BO_Use_World.stringValue()))
-                {
-                    AddCompiledObjectsFromWorld(biomeConfig, objects, Groups);
-                    objectsName.add(BODefaultValues.BO_Use_World.stringValue());
-                    continue;
-                }
-
-                if (key.equals(BODefaultValues.BO_Use_Biome.stringValue()))
-                {
-                    AddCompiledObjectsFromBiome(biomeConfig, objects, Groups);
-                    objectsName.add(BODefaultValues.BO_Use_Biome.stringValue());
-                    continue;
-                }
-
-                CustomObjectCompiled obj = ObjectsStore.CompileString(key, biomeConfig.worldConfig.CustomObjectsDirectory);
-                if (obj == null)
-                    obj = ObjectsStore.CompileString(key, ObjectsStore.GlobalDirectory);
-                if (obj != null)
-                {
-                    objects.add(obj);
-                    objectsName.add(obj.Name);
-
-                    if (!obj.GroupId.equals(""""))
-                    {
-                        if (!Groups.containsKey(obj.GroupId))
-                            Groups.put(obj.GroupId, new ArrayList<CustomObjectCompiled>());
-
-                        Groups.get(obj.GroupId).add(obj);
-
-                    }
-
-
-                }
-
-            }
-
-        for (CustomObjectCompiled objectCompiled : objects)
-        {
-            if (Groups.containsKey(objectCompiled.GroupId))
-            {
-                objectCompiled.GroupObjects = Groups.get(objectCompiled.GroupId).toArray(new CustomObjectCompiled[0]);
-            }
-        }
-
-        res.CUObjects = objects.toArray(res.CUObjects);
-        res.CUObjectsNames = objectsName.toArray(res.CUObjectsNames);
-
-        return true;
-    }
-
-
-    private void AddCompiledObjectsFromWorld(BiomeConfig biomeConfig, ArrayList<CustomObjectCompiled> output, HashMap<String, ArrayList<CustomObjectCompiled>> groups)
-    {
-        for (CustomObjectCompiled objectCompiled : biomeConfig.worldConfig.CustomObjectsCompiled)
-            if (objectCompiled.CheckBiome(biomeConfig.Name))
-            {
-                output.add(objectCompiled);
-                if (!objectCompiled.GroupId.equals(""""))
-                {
-                    if (!groups.containsKey(objectCompiled.GroupId))
-                        groups.put(objectCompiled.GroupId, new ArrayList<CustomObjectCompiled>());
-
-                    groups.get(objectCompiled.GroupId).add(objectCompiled);
-
-                }
-
-            }
-
-    }
-
-    private void AddCompiledObjectsFromBiome(BiomeConfig biomeConfig, ArrayList<CustomObjectCompiled> output, HashMap<String, ArrayList<CustomObjectCompiled>> groups)
-    {
-        for (CustomObjectCompiled objectCompiled : biomeConfig.CustomObjectsCompiled)
-        {
-            output.add(objectCompiled);
-            if (!objectCompiled.GroupId.equals(""""))
-            {
-                if (!groups.containsKey(objectCompiled.GroupId))
-                    groups.put(objectCompiled.GroupId, new ArrayList<CustomObjectCompiled>());
-
-                groups.get(objectCompiled.GroupId).add(objectCompiled);
-
-            }
-
-        }
-
-    }
-
-}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/CustomObjectLoader.java b/common/src/com/khorn/terraincontrol/customobjects/CustomObjectLoader.java
new file mode 100644
index 000000000..b4ab6a652
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/CustomObjectLoader.java
@@ -0,0 +1,8 @@
+package com.khorn.terraincontrol.customobjects;
+
+import java.io.File;
+
+public interface CustomObjectLoader
+{
+    public CustomObject loadFromFile(String objectName, File file);
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/CustomObjectManager.java b/common/src/com/khorn/terraincontrol/customobjects/CustomObjectManager.java
new file mode 100644
index 000000000..580a41005
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/CustomObjectManager.java
@@ -0,0 +1,221 @@
+package com.khorn.terraincontrol.customobjects;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.WorldConfig;
+import com.khorn.terraincontrol.customobjects.bo2.BO2Loader;
+import com.khorn.terraincontrol.generator.resourcegens.TreeType;
+
+public class CustomObjectManager
+{
+    /*
+     * Khoorn's comment, copied from the removed class ObjectsStore:
+
+    Load:
+    1)Load here all objects.
+    2)Start save coordinates thread.
+    2)Pre compile objects (make arrays for different angle) ??
+    3)Compile custom objects array for each biome. Based on world Bo2 list + Biome Bo2 list + Biome CustomTree list
+       a) store in one array in biome
+       b) store in different arrays in biome ???
+    4) Load ObjectCoordinates from file and add that instance to save thread.
+
+    New load
+    1) Load all objects from world directory
+    2) Search and load objects from plugin directory
+
+
+
+    Spawn:
+    1)CustomObject resource, Tree resource, sapling, command
+    2)Select random object if needed.
+    3)Check for biome and select CustomBiome array if needed.
+    4)Check for spawn conditions.
+    5)Check for collision
+       a) Check for block collisions
+       b) If out of loaded chunks and object.dig == false - drop.
+       c) If out of loaded chunks and object.branch && !object.digBranch == true - drop
+       d) ??
+    6)Set blocks
+       a) If out of loaded chunks - get ObjectBuffer from CoordinatesStore and save to it.
+       b) If found branch start point  - select random branch from group and call 5 for it.
+
+
+    Calculate branch size for in chunk check??
+    Call branch in this chunk or in next ??
+     
+     */
+    
+    
+    
+    public final Map<String, CustomObjectLoader> loaders;
+    public final Map<String, CustomObject> globalObjects;
+
+    public CustomObjectManager(Map<String, CustomObjectLoader> loaders, Map<String, CustomObject> globalObjects)
+    {
+        // These are the actual lists, not just a copy.
+        this.loaders = loaders;
+        this.globalObjects = globalObjects;
+        
+        // Register loaders
+        TerrainControl.registerCustomObjectLoader(""bo2"", new BO2Loader());
+        
+        // Load all global objects (they can overwrite special objects)
+        TerrainControl.getEngine().getGlobalObjectsDirectory().mkdirs();
+        this.globalObjects.putAll(loadObjects(TerrainControl.getEngine().getGlobalObjectsDirectory()));
+        TerrainControl.log(this.globalObjects.size() + "" global custom objects loaded."");
+        
+        // Put some default CustomObjects
+        for(TreeType type: TreeType.values())
+        {
+            globalObjects.put(type.name().toLowerCase(), new TreeObject(type));
+        }
+        globalObjects.put(""useworld"", new UseWorld());
+        globalObjects.put(""usebiome"", new UseBiome());
+    }
+    
+    /**
+     * Returns the global CustomObject with the given name.
+     * @param name Name of the CustomObject, case-insensitive.
+     * @return The CustomObject, or null if there isn't one with that name.
+     */
+    public CustomObject getCustomObject(String name)
+    {
+        return globalObjects.get(name.toLowerCase());
+    }
+    
+    /**
+     * Returns the CustomObject with the given name. It searches for a world object first, and then it searches for a global object.
+     * @param name Name of the CustomObject, case-insensitive.
+     * @param world The world to search in first before searching the global objects.
+     * @return The CustomObject, or null if there isn't one with that name.
+     */
+    public CustomObject getCustomObject(String name, LocalWorld world)
+    {
+        return getCustomObject(name, world.getSettings());
+    }
+    
+    /**
+     * Returns the CustomObject with the given name. It searches for a world object first, and then it searches for a global object.
+     * @param name Name of the CustomObject, case-insensitive.
+     * @param config The config to search in first before searching the global objects.
+     * @return The CustomObject, or null if there isn't one with that name.
+     */
+    public CustomObject getCustomObject(String name, WorldConfig config)
+    {
+        if(config.customObjects.containsKey(name.toLowerCase())) {
+            return config.customObjects.get(name.toLowerCase());
+        }
+        return getCustomObject(name);
+    }
+
+    /**
+     * Returns a Map with all CustomObjects in a directory in it. The Map will
+     * have the lowercase object name as a key.
+     * 
+     * @param directory
+     *            The directory to load from.
+     * @return
+     */
+    public Map<String, CustomObject> loadObjects(File directory)
+    {
+        if (!directory.isDirectory())
+        {
+            throw new IllegalArgumentException(""Given file is not a directory: "" + directory.getAbsolutePath());
+        }
+
+        Map<String, CustomObject> objects = new HashMap<String, CustomObject>();
+        for (File file : directory.listFiles())
+        {
+            // Get name and extension
+            String[] fileName = file.getName().split(""\\."");
+            String objectName;
+            String objectType;
+            if (fileName.length == 1)
+            {
+                // Found an object without an extension
+                objectName = fileName[0];
+                objectType = """";
+            } else
+            {
+                // Found an object with an extension
+                objectType = fileName[fileName.length - 1];
+                objectName = """";
+                for (int i = 0; i < fileName.length - 2; i++)
+                {
+                    objectName += fileName[i];
+                }
+            }
+
+            // Get the object
+            CustomObjectLoader loader = loaders.get(objectType);
+            if (loader != null)
+            {
+                objects.put(objectName.toLowerCase(), loader.loadFromFile(objectName, file));
+            }
+        }
+
+        return objects;
+    }
+    
+    /**
+     * Parses a String in the format name(setting1=foo,setting2=bar) and returns a CustomObject.
+     * @param string
+     * @param world The world to search in
+     * @return A CustomObject, or null if no one was found.
+     */
+    public CustomObject getObjectFromString(String string, LocalWorld world)
+    {
+        return this.getObjectFromString(string, world.getSettings());
+    }
+    
+    /**
+     * Parses a String in the format name(setting1=foo,setting2=bar) and returns a CustomObject.
+     * @param string
+     * @param config The config to search in
+     * @return A CustomObject, or null if no one was found.
+     */
+    public CustomObject getObjectFromString(String string, WorldConfig config)
+    {
+        String[] parts = new String[]{string, """"};
+
+        int start = string.indexOf(""("");
+        int end = string.lastIndexOf("")"");
+        if (start != -1 && end != -1)
+        {
+            parts[0] = string.substring(0, start);
+            parts[1] = string.substring(start + 1, end);
+        }
+
+        CustomObject object = getCustomObject(parts[0], config);
+        
+        if(object != null && parts[1].length() != 0) {
+            // More settings have been given
+            Map<String, String> settingsMap = new HashMap<String, String>();
+            
+            String[] settings = parts[1].split("";"");
+            for(String setting: settings)
+            {
+                String[] settingParts = setting.split(""="");
+                if(settingParts.length == 1)
+                {
+                    // Boolean values
+                    settingsMap.put(settingParts[0], ""true"");
+                } else if(settingParts.length == 2)
+                {
+                    settingsMap.put(settingParts[0], settingParts[1]);
+                }
+            }
+            
+            if(settingsMap.size() > 0)
+            {
+                object = object.applySettings(settingsMap);
+            }
+        }
+        
+        return object;
+    }
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/ObjectBuffer.java b/common/src/com/khorn/terraincontrol/customobjects/ObjectBuffer.java
deleted file mode 100644
index fb4562ae5..000000000
--- a/common/src/com/khorn/terraincontrol/customobjects/ObjectBuffer.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.khorn.terraincontrol.customobjects;
-
-public class ObjectBuffer
-{
-
-}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/ObjectCoordinatesStore.java b/common/src/com/khorn/terraincontrol/customobjects/ObjectCoordinatesStore.java
deleted file mode 100644
index 1236b4b6d..000000000
--- a/common/src/com/khorn/terraincontrol/customobjects/ObjectCoordinatesStore.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.khorn.terraincontrol.customobjects;
-
-import java.io.File;
-import java.util.Hashtable;
-
-public class ObjectCoordinatesStore implements Runnable
-{
-
-    public Hashtable<ObjectCoordinate,ObjectBuffer> Coordinates;
-
-    public ObjectCoordinatesStore()
-    {
-       this.Coordinates = new Hashtable<ObjectCoordinate, ObjectBuffer>();
-
-    }
-
-    public void ReadStore(File data)
-    {
-
-    }
-
-    // Save thread.
-    @Override
-    public void run()
-    {
-
-    }
-}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/ObjectsStore.java b/common/src/com/khorn/terraincontrol/customobjects/ObjectsStore.java
deleted file mode 100644
index b54a7a491..000000000
--- a/common/src/com/khorn/terraincontrol/customobjects/ObjectsStore.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.khorn.terraincontrol.customobjects;
-
-
-import java.io.File;
-import java.util.ArrayList;
-
-public class ObjectsStore
-{
-
-    /*
-     Load:
-     1)Load here all objects.
-     2)Start save coordinates thread.
-     2)Pre compile objects (make arrays for different angle) ??
-     3)Compile custom objects array for each biome. Based on world Bo2 list + Biome Bo2 list + Biome CustomTree list
-        a) store in one array in biome
-        b) store in different arrays in biome ???
-     4) Load ObjectCoordinates from file and add that instance to save thread.
-
-     New load
-     1) Load all objects from world directory
-     2) Search and load objects from plugin directory
-
-
-
-     Spawn:
-     1)CustomObject resource, Tree resource, sapling, command
-     2)Select random object if needed.
-     3)Check for biome and select CustomBiome array if needed.
-     4)Check for spawn conditions.
-     5)Check for collision
-        a) Check for block collisions
-        b) If out of loaded chunks and object.dig == false - drop.
-        c) If out of loaded chunks and object.branch && !object.digBranch == true - drop
-        d) ??
-     6)Set blocks
-        a) If out of loaded chunks - get ObjectBuffer from CoordinatesStore and save to it.
-        b) If found branch start point  - select random branch from group and call 5 for it.
-
-
-     Calculate branch size for in chunk check??
-     Call branch in this chunk or in next ??
-
-
-
-
-
-     */
-
-
-    public static File GlobalDirectory;
-
-    public static void ReadObjects(File pluginPath)
-    {
-        GlobalDirectory = new File(pluginPath, BODefaultValues.BO_GlobalDirectoryName.stringValue());
-
-        if (!GlobalDirectory.exists())
-        {
-            if (!GlobalDirectory.mkdirs())
-            {
-                System.out.println(""TerrainControl: can`t create GlobalObjects directory"");
-            }
-        }
-
-
-        //objectsList = LoadObjectsFromDirectory(directory);
-
-        //System.out.println(""TerrainControl: "" + objectsList.size() + "" custom objects loaded"");
-
-
-    }
-
-
-    public static ArrayList<CustomObject> LoadObjectsFromDirectory(File path)
-    {
-        ArrayList<CustomObject> outputList = new ArrayList<CustomObject>();
-
-        File[] files = path.listFiles();
-        if (files == null)
-            return outputList;
-
-        for (File customObjectFile : files)
-        {
-            if (customObjectFile.isFile())
-            {
-                CustomObject object = new CustomObject(customObjectFile);
-                if (object.IsValid)
-                    outputList.add(object);
-            }
-        }
-        return outputList;
-
-
-    }
-
-    public static String[] ParseString(String key)
-    {
-        String[] output = new String[]{key, """"};
-
-        int start = key.indexOf(""("");
-        int end = key.lastIndexOf("")"");
-        if (start != -1 && end != -1)
-        {
-            output[0] = key.substring(0, start);
-            output[1] = key.substring(start + 1, end);
-        }
-        return output;
-    }
-
-    public static CustomObject GetObjectFromDirectory(String name, File directory)
-    {   
-        File customObjectFile = new File(directory, name+"".""+BODefaultValues.BO_Extension.stringValue());
-        
-        if (!customObjectFile.isFile())
-        {
-            return null;
-        }
-        
-        CustomObject object = new CustomObject(customObjectFile);
-        
-        if (!object.IsValid)
-        {
-            return null;
-        }
-        
-        return object;
-    }
-
-    public static CustomObjectCompiled CompileString(String key, File directory)
-    {
-        String[] values = ParseString(key);
-        CustomObject object = GetObjectFromDirectory(values[0], directory);
-
-        if (object == null)
-            return null;
-
-        return object.Compile(values[1]);
-    }
-}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/TreeObject.java b/common/src/com/khorn/terraincontrol/customobjects/TreeObject.java
new file mode 100644
index 000000000..aa19e3a59
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/TreeObject.java
@@ -0,0 +1,90 @@
+package com.khorn.terraincontrol.customobjects;
+
+import java.util.Map;
+import java.util.Random;
+
+import com.khorn.terraincontrol.LocalBiome;
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.generator.resourcegens.TreeType;
+
+public class TreeObject implements CustomObject
+{
+    TreeType type;
+    
+    public TreeObject(TreeType type)
+    {
+        this.type = type;
+    }
+    
+    @Override
+    public String getName()
+    {
+        return type.name();
+    }
+
+    @Override
+    public boolean canSpawnAsTree()
+    {
+        return true;
+    }
+    
+    @Override
+    public boolean canSpawnAsObject()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
+    {
+        return world.PlaceTree(type, random, x, y, z);
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
+    {
+        return world.PlaceTree(type, random, x, y, z);
+    }
+    
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int z)
+    {
+        return world.PlaceTree(type, random, x, world.getHighestBlockYAt(x, z), z);
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
+    {
+        return world.PlaceTree(type, random, x, world.getHighestBlockYAt(x, z), z);
+    }
+
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        // A tree has no rarity, so spawn it once in the chunk
+        int x = chunkX * 16 + random.nextInt(16);
+        int z = chunkZ * 16 + random.nextInt(16);
+        int y = world.getHighestBlockYAt(x, z);
+        world.PlaceTree(type, random, x, y, z);
+    }
+
+    @Override
+    public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        process(world, random, chunkX, chunkZ);
+    }
+
+    @Override
+    public CustomObject applySettings(Map<String, String> settings)
+    {
+        // Trees don't support this
+        return this;
+    }
+
+    @Override
+    public boolean hasPreferenceToSpawnIn(LocalBiome biome)
+    {
+        return true;
+    }
+
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/UseBiome.java b/common/src/com/khorn/terraincontrol/customobjects/UseBiome.java
new file mode 100644
index 000000000..ca6864099
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/UseBiome.java
@@ -0,0 +1,124 @@
+package com.khorn.terraincontrol.customobjects;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Random;
+
+import com.khorn.terraincontrol.LocalBiome;
+import com.khorn.terraincontrol.LocalWorld;
+
+/**
+ * UseBiome is a keyword that spawns the objects in the BiomeConfig/BiomeObjects
+ * setting.
+ * 
+ */
+public class UseBiome implements CustomObject
+{
+    public ArrayList<CustomObject> getPossibleObjectsAt(LocalWorld world, int x, int z)
+    {
+        return world.getSettings().biomeConfigs[world.getBiome(x, z).getId()].biomeObjects;
+    }
+
+    @Override
+    public String getName()
+    {
+        return ""UseBiome"";
+    }
+
+    @Override
+    public boolean canSpawnAsTree()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean canSpawnAsObject()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
+    {
+        for (CustomObject object : getPossibleObjectsAt(world, x, z))
+        {
+            if (object.spawn(world, random, x, y, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
+    {
+        for (CustomObject object : getPossibleObjectsAt(world, x, z))
+        {
+            if (object.spawnAsTree(world, random, x, y, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int z)
+    {
+        for (CustomObject object : getPossibleObjectsAt(world, x, z))
+        {
+            if (object.spawn(world, random, x, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
+    {
+        for (CustomObject object : getPossibleObjectsAt(world, x, z))
+        {
+            if (object.spawnAsTree(world, random, x, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        for (CustomObject object : getPossibleObjectsAt(world, chunkX * 16 + 8, chunkZ * 16 + 8))
+        {
+            object.process(world, random, chunkX, chunkZ);
+        }
+    }
+
+    @Override
+    public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        for (CustomObject object : getPossibleObjectsAt(world, chunkX * 16 + 8, chunkZ * 16 + 8))
+        {
+            object.processAsTree(world, random, chunkX, chunkZ);
+        }
+    }
+
+    @Override
+    public CustomObject applySettings(Map<String, String> settings)
+    {
+        // Not supported
+        return this;
+    }
+
+    @Override
+    public boolean hasPreferenceToSpawnIn(LocalBiome biome)
+    {
+        // Never, ever spawn this with UseWorld.
+        return false;
+    }
+
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/UseWorld.java b/common/src/com/khorn/terraincontrol/customobjects/UseWorld.java
new file mode 100644
index 000000000..cfd50f842
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/UseWorld.java
@@ -0,0 +1,118 @@
+package com.khorn.terraincontrol.customobjects;
+
+import java.util.Map;
+import java.util.Random;
+
+import com.khorn.terraincontrol.LocalBiome;
+import com.khorn.terraincontrol.LocalWorld;
+
+/**
+ * UseWorld is a keyword that spawns the objects in the WorldObjects folder.
+ *
+ */
+public class UseWorld implements CustomObject
+{
+
+    @Override
+    public String getName()
+    {
+        return ""UseWorld"";
+    }
+
+    @Override
+    public boolean canSpawnAsTree()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean canSpawnAsObject()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
+    {
+        for(CustomObject object: world.getSettings().customObjects.values())
+        {
+            if(object.hasPreferenceToSpawnIn(world.getBiome(x, z)) && object.spawn(world, random, x, y, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
+    {
+        for(CustomObject object: world.getSettings().customObjects.values())
+        {
+            if(object.spawnAsTree(world, random, x, y, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int z)
+    {
+        for(CustomObject object: world.getSettings().customObjects.values())
+        {
+            if(object.spawn(world, random, x, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
+    {
+        for(CustomObject object: world.getSettings().customObjects.values())
+        {
+            if(object.spawnAsTree(world, random, x, z))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        for(CustomObject object: world.getSettings().customObjects.values())
+        {
+            object.process(world, random, chunkX, chunkZ);
+        }
+    }
+
+    @Override
+    public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        for(CustomObject object: world.getSettings().customObjects.values())
+        {
+            object.processAsTree(world, random, chunkX, chunkZ);
+        }
+    }
+
+    @Override
+    public CustomObject applySettings(Map<String, String> settings)
+    {
+        // Not supported
+        return this;
+    }
+
+    @Override
+    public boolean hasPreferenceToSpawnIn(LocalBiome biome)
+    {
+        // Never, ever spawn this in UseWorld. It would cause an infinite loop.
+        return false;
+    }
+
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2.java b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2.java
new file mode 100644
index 000000000..638fe02bf
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2.java
@@ -0,0 +1,454 @@
+package com.khorn.terraincontrol.customobjects.bo2;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Random;
+
+import com.khorn.terraincontrol.DefaultMaterial;
+import com.khorn.terraincontrol.LocalBiome;
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.configuration.ConfigFile;
+import com.khorn.terraincontrol.customobjects.BODefaultValues;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.customobjects.ObjectCoordinate;
+
+/**
+ * The good old BO2.
+ * 
+ */
+public class BO2 extends ConfigFile implements CustomObject
+{
+    public ObjectCoordinate[][] Data = new ObjectCoordinate[4][];
+
+    public BO2[] GroupObjects = null;
+
+    public String Name;
+
+    public HashSet<String> SpawnInBiome;
+
+    public String Version;
+    public HashSet<Integer> SpawnOnBlockType;
+
+    public HashSet<Integer> CollisionBlockType;
+
+    public boolean SpawnWater;
+    public boolean SpawnLava;
+    public boolean SpawnAboveGround;
+    public boolean SpawnUnderGround;
+
+    public boolean SpawnSunlight;
+    public boolean SpawnDarkness;
+
+    public boolean UnderFill;
+    public boolean RandomRotation;
+    public boolean Dig;
+    public boolean Tree;
+    public boolean Branch;
+    public boolean DiggingBranch;
+    public boolean NeedsFoundation;
+    public int Rarity;
+    public double CollisionPercentage;
+    public int SpawnElevationMin;
+    public int SpawnElevationMax;
+
+    public int GroupFrequencyMin;
+    public int GroupFrequencyMax;
+    public int GroupSeparationMin;
+    public int GroupSeparationMax;
+    public String GroupId;
+
+    public int BranchLimit;
+
+    public BO2(File file, String name)
+    {
+        ReadSettingsFile(file);
+        this.Name = name;
+
+        ReadConfigSettings();
+        CorrectSettings();
+    }
+
+    public BO2(Map<String, String> settings, String name)
+    {
+        SettingsCache = settings;
+        this.Name = name;
+
+        ReadConfigSettings();
+        CorrectSettings();
+    }
+
+    @Override
+    public String getName()
+    {
+        return this.Name;
+    }
+
+    @Override
+    public boolean canSpawnAsTree()
+    {
+        return Tree;
+    }
+
+    @Override
+    public boolean canSpawnAsObject()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int y, int z)
+    {
+        if (!ObjectCanSpawn(world, x, y, z))
+        {
+            return false;
+        }
+
+        ObjectCoordinate[] data = Data[0];
+        if (RandomRotation)
+            data = Data[random.nextInt(4)];
+
+        int faultCounter = 0;
+
+        for (ObjectCoordinate point : data)
+        {
+            if (!world.isLoaded((x + point.x), (y + point.y), (z + point.z)))
+                return false;
+
+            if (!Dig)
+            {
+                if (CollisionBlockType.contains(world.getTypeId((x + point.x), (y + point.y), (z + point.z))))
+                {
+                    faultCounter++;
+                    if (faultCounter > (data.length * (CollisionPercentage / 100)))
+                    {
+                        return false;
+                    }
+                }
+            }
+
+        }
+
+        for (ObjectCoordinate point : data)
+        {
+
+            if (world.getTypeId(x + point.x, y + point.y, z + point.z) == 0)
+            {
+                world.setBlock((x + point.x), y + point.y, z + point.z, point.BlockId, point.BlockData, true, false, true);
+            } else if (Dig)
+            {
+                world.setBlock((x + point.x), y + point.y, z + point.z, point.BlockId, point.BlockData, true, false, true);
+            }
+
+        }
+        return true;
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int y, int z)
+    {
+        if (!Tree)
+        {
+            // Can only spawn as a tree if this is a tree.
+            return false;
+        }
+        return spawn(world, random, x, y, z);
+    }
+
+    @Override
+    public boolean spawn(LocalWorld world, Random random, int x, int z)
+    {
+        int y;
+        if (SpawnAboveGround)
+            y = world.getSolidHeight(x, z);
+        else if (SpawnUnderGround)
+        {
+            int solidHeight = world.getSolidHeight(x, z);
+            if (solidHeight < 1 || solidHeight <= SpawnElevationMin)
+                return false;
+            if (solidHeight > SpawnElevationMax)
+                solidHeight = SpawnElevationMax;
+            y = random.nextInt(solidHeight - SpawnElevationMin) + SpawnElevationMin;
+        } else
+            y = world.getHighestBlockYAt(x, z);
+
+        if (y < 0)
+            return false;
+
+        if (!ObjectCanSpawn(world, x, y, z))
+            return false;
+
+        boolean objectSpawned = this.spawn(world, random, x, y, z);
+
+        if (objectSpawned)
+            GenerateCustomObjectFromGroup(world, random, x, y, z);
+
+        return objectSpawned;
+    }
+
+    @Override
+    public boolean spawnAsTree(LocalWorld world, Random random, int x, int z)
+    {
+        return spawn(world, random, x, z);
+    }
+
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        int randomRoll = random.nextInt(100);
+        int ObjectRarity = Rarity;
+
+        while (randomRoll < ObjectRarity)
+        {
+            ObjectRarity -= 100;
+
+            int x = chunkX * 16 + random.nextInt(16);
+            int z = chunkZ * 16 + random.nextInt(16);
+
+            spawn(world, random, x, z);
+        }
+    }
+
+    @Override
+    public void processAsTree(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        if (!Tree)
+        {
+            return;
+        }
+
+        process(world, random, chunkX, chunkZ);
+    }
+
+    @Override
+    public CustomObject applySettings(Map<String, String> extraSettings)
+    {
+        Map<String, String> newSettings = new HashMap<String, String>();
+        newSettings.putAll(SettingsCache);
+        newSettings.putAll(extraSettings);
+        return new BO2(newSettings, getName());
+    }
+
+    @Override
+    protected void WriteConfigSettings() throws IOException
+    {
+        // It doesn't write.
+    }
+
+    @Override
+    protected void ReadConfigSettings()
+    {
+        this.Version = ReadModSettings(BODefaultValues.version.name(), BODefaultValues.version.stringValue());
+
+        this.SpawnOnBlockType = this.ReadBlockList(ReadModSettings(BODefaultValues.spawnOnBlockType.name(), BODefaultValues.spawnOnBlockType.StringArrayListValue()), BODefaultValues.spawnOnBlockType.name());
+        this.CollisionBlockType = this.ReadBlockList(ReadModSettings(BODefaultValues.collisionBlockType.name(), BODefaultValues.collisionBlockType.StringArrayListValue()), BODefaultValues.collisionBlockType.name());
+
+        this.SpawnInBiome = new HashSet<String>(ReadModSettings(BODefaultValues.spawnInBiome.name(), BODefaultValues.spawnInBiome.StringArrayListValue()));
+
+        this.SpawnSunlight = ReadModSettings(BODefaultValues.spawnSunlight.name(), BODefaultValues.spawnSunlight.booleanValue());
+        this.SpawnDarkness = ReadModSettings(BODefaultValues.spawnDarkness.name(), BODefaultValues.spawnDarkness.booleanValue());
+        this.SpawnWater = ReadModSettings(BODefaultValues.spawnWater.name(), BODefaultValues.spawnWater.booleanValue());
+        this.SpawnLava = ReadModSettings(BODefaultValues.spawnLava.name(), BODefaultValues.spawnLava.booleanValue());
+        this.SpawnAboveGround = ReadModSettings(BODefaultValues.spawnAboveGround.name(), BODefaultValues.spawnAboveGround.booleanValue());
+        this.SpawnUnderGround = ReadModSettings(BODefaultValues.spawnUnderGround.name(), BODefaultValues.spawnUnderGround.booleanValue());
+
+        this.UnderFill = ReadModSettings(BODefaultValues.underFill.name(), BODefaultValues.underFill.booleanValue());
+
+        this.RandomRotation = ReadModSettings(BODefaultValues.randomRotation.name(), BODefaultValues.randomRotation.booleanValue());
+        this.Dig = ReadModSettings(BODefaultValues.dig.name(), BODefaultValues.dig.booleanValue());
+        this.Tree = ReadModSettings(BODefaultValues.tree.name(), BODefaultValues.tree.booleanValue());
+        this.Branch = ReadModSettings(BODefaultValues.branch.name(), BODefaultValues.branch.booleanValue());
+        this.DiggingBranch = ReadModSettings(BODefaultValues.diggingBranch.name(), BODefaultValues.diggingBranch.booleanValue());
+        this.NeedsFoundation = ReadModSettings(BODefaultValues.needsFoundation.name(), BODefaultValues.needsFoundation.booleanValue());
+        this.Rarity = ReadModSettings(BODefaultValues.rarity.name(), BODefaultValues.rarity.intValue());
+        this.CollisionPercentage = ReadModSettings(BODefaultValues.collisionPercentage.name(), BODefaultValues.collisionPercentage.intValue());
+        this.SpawnElevationMin = ReadModSettings(BODefaultValues.spawnElevationMin.name(), BODefaultValues.spawnElevationMin.intValue());
+        this.SpawnElevationMax = ReadModSettings(BODefaultValues.spawnElevationMax.name(), BODefaultValues.spawnElevationMax.intValue());
+
+        this.GroupFrequencyMin = ReadModSettings(BODefaultValues.groupFrequencyMin.name(), BODefaultValues.groupFrequencyMin.intValue());
+        this.GroupFrequencyMax = ReadModSettings(BODefaultValues.groupFrequencyMax.name(), BODefaultValues.groupFrequencyMax.intValue());
+        this.GroupSeparationMin = ReadModSettings(BODefaultValues.groupSeperationMin.name(), BODefaultValues.groupSeperationMin.intValue());
+        this.GroupSeparationMax = ReadModSettings(BODefaultValues.groupSeperationMax.name(), BODefaultValues.groupSeperationMax.intValue());
+        this.GroupId = ReadModSettings(BODefaultValues.groupId.name(), BODefaultValues.groupId.stringValue());
+
+        this.BranchLimit = ReadModSettings(BODefaultValues.branchLimit.name(), BODefaultValues.branchLimit.intValue());
+
+        this.ReadCoordinates();
+    }
+
+    @Override
+    protected void CorrectSettings()
+    {
+        // Stub method
+    }
+
+    @Override
+    protected void RenameOldSettings()
+    {
+        // Stub method
+    }
+
+    private void ReadCoordinates()
+    {
+        ArrayList<ObjectCoordinate> coordinates = new ArrayList<ObjectCoordinate>();
+
+        for (String key : SettingsCache.keySet())
+        {
+            ObjectCoordinate buffer = ObjectCoordinate.getCoordinateFromString(key, SettingsCache.get(key));
+            if (buffer != null)
+                coordinates.add(buffer);
+        }
+
+        Data[0] = new ObjectCoordinate[coordinates.size()];
+        Data[1] = new ObjectCoordinate[coordinates.size()];
+        Data[2] = new ObjectCoordinate[coordinates.size()];
+        Data[3] = new ObjectCoordinate[coordinates.size()];
+
+        for (int i = 0; i < coordinates.size(); i++)
+        {
+            ObjectCoordinate coordinate = coordinates.get(i);
+
+            Data[0][i] = coordinate;
+            coordinate = coordinate.Rotate();
+            Data[1][i] = coordinate;
+            coordinate = coordinate.Rotate();
+            Data[2][i] = coordinate;
+            coordinate = coordinate.Rotate();
+            Data[3][i] = coordinate;
+        }
+
+    }
+
+    private HashSet<Integer> ReadBlockList(ArrayList<String> blocks, String settingName)
+    {
+        HashSet<Integer> output = new HashSet<Integer>();
+
+        boolean nonIntegerValues = false;
+        boolean all = false;
+        boolean solid = false;
+
+        for (String block : blocks)
+        {
+
+            if (block.equals(BODefaultValues.BO_ALL_KEY.stringValue()))
+            {
+                all = true;
+                continue;
+            }
+            if (block.equals(BODefaultValues.BO_SolidKey.stringValue()))
+            {
+                solid = true;
+                continue;
+            }
+            try
+            {
+                int blockID = Integer.decode(block);
+                if (blockID != 0)
+                    output.add(blockID);
+            } catch (NumberFormatException e)
+            {
+                nonIntegerValues = true;
+            }
+        }
+
+        if (all || solid)
+            for (DefaultMaterial material : DefaultMaterial.values())
+            {
+                if (material.id == 0)
+                    continue;
+                if (solid && !material.isSolid())
+                    continue;
+                output.add(material.id);
+
+            }
+        if (nonIntegerValues)
+            System.out.println(""TerrainControl: Custom object "" + this.Name + "" have wrong value "" + settingName);
+
+        return output;
+
+    }
+
+    public boolean ObjectCanSpawn(LocalWorld world, int x, int y, int z)
+    {
+        if ((world.getTypeId(x, y - 5, z) == 0) && (NeedsFoundation))
+            return false;
+
+        boolean output = true;
+        int checkBlock = world.getTypeId(x, y + 2, z);
+        if (!SpawnWater)
+            output = !((checkBlock == DefaultMaterial.WATER.id) || (checkBlock == DefaultMaterial.STATIONARY_WATER.id));
+        if (!SpawnLava)
+            output = !((checkBlock == DefaultMaterial.LAVA.id) || (checkBlock == DefaultMaterial.STATIONARY_LAVA.id));
+
+        checkBlock = world.getLightLevel(x, y + 2, z);
+        if (!SpawnSunlight)
+            output = !(checkBlock > 8);
+        if (!SpawnDarkness)
+            output = !(checkBlock < 9);
+
+        if ((y < SpawnElevationMin) || (y > SpawnElevationMax))
+            output = false;
+
+        if (!SpawnOnBlockType.contains(world.getTypeId(x, y - 1, z)))
+            output = false;
+
+        return output;
+    }
+
+    public void GenerateCustomObjectFromGroup(LocalWorld world, Random random, int x, int y, int z)
+    {
+        if (GroupObjects == null)
+            return;
+
+        int attempts = 3;
+        if ((GroupFrequencyMax - GroupFrequencyMin) > 0)
+            attempts = GroupFrequencyMin + random.nextInt(GroupFrequencyMax - GroupFrequencyMin);
+
+        while (attempts > 0)
+        {
+            attempts--;
+
+            int objIndex = random.nextInt(GroupObjects.length);
+            BO2 ObjectFromGroup = GroupObjects[objIndex];
+
+            if (Branch)
+                continue;
+
+            x = x + random.nextInt(GroupSeparationMax - GroupSeparationMin) + GroupSeparationMin;
+            z = z + random.nextInt(GroupSeparationMax - GroupSeparationMin) + GroupSeparationMin;
+            int _y;
+
+            if (SpawnAboveGround)
+                _y = world.getSolidHeight(x, z);
+            else if (SpawnUnderGround)
+            {
+                int solidHeight = world.getSolidHeight(x, z);
+                if (solidHeight < 1 || solidHeight <= SpawnElevationMin)
+                    continue;
+                if (solidHeight > SpawnElevationMax)
+                    solidHeight = SpawnElevationMax;
+                _y = random.nextInt(solidHeight - SpawnElevationMin) + SpawnElevationMin;
+            } else
+                _y = world.getHighestBlockYAt(x, z);
+
+            if (y < 0)
+                continue;
+
+            if ((y - _y) > 10 || (_y - y) > 10)
+                continue;
+
+            ObjectFromGroup.spawn(world, random, x, _y, z);
+        }
+
+    }
+
+    @Override
+    public boolean hasPreferenceToSpawnIn(LocalBiome biome)
+    {
+        return SpawnInBiome.contains(biome.getName()) || SpawnInBiome.contains(""All"");
+    }
+
+}
diff --git a/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2Loader.java b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2Loader.java
new file mode 100644
index 000000000..e7ee8bb76
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/customobjects/bo2/BO2Loader.java
@@ -0,0 +1,14 @@
+package com.khorn.terraincontrol.customobjects.bo2;
+
+import java.io.File;
+
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.customobjects.CustomObjectLoader;
+
+public class BO2Loader implements CustomObjectLoader
+{
+    public CustomObject loadFromFile(String objectName, File file)
+    {
+        return new BO2(file, objectName);
+    }
+}
diff --git a/common/src/com/khorn/terraincontrol/exception/InvalidResourceException.java b/common/src/com/khorn/terraincontrol/exception/InvalidResourceException.java
new file mode 100644
index 000000000..f53a907ae
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/exception/InvalidResourceException.java
@@ -0,0 +1,11 @@
+package com.khorn.terraincontrol.exception;
+
+public class InvalidResourceException extends Exception
+{
+
+    public InvalidResourceException(String string)
+    {
+        super(string);
+    }
+    
+}
diff --git a/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java b/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java
index a0f81f51b..d0dde206a 100644
--- a/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java
+++ b/common/src/com/khorn/terraincontrol/generator/ObjectSpawner.java
@@ -1,14 +1,14 @@
 package com.khorn.terraincontrol.generator;
 
+import java.util.Random;
+
 import com.khorn.terraincontrol.DefaultMaterial;
 import com.khorn.terraincontrol.LocalWorld;
 import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
 import com.khorn.terraincontrol.configuration.TCDefaultValues;
 import com.khorn.terraincontrol.configuration.WorldConfig;
-import com.khorn.terraincontrol.generator.resourcegens.ResourceType;
-
-import java.util.Random;
+import com.khorn.terraincontrol.generator.resourcegens.SmallLakeGen;
 
 public class ObjectSpawner
 {
@@ -42,10 +42,10 @@ public void populate(int chunkX, int chunkZ)
         for (int i = 0; i < localBiomeConfig.ResourceCount; i++)
         {
             Resource res = localBiomeConfig.ResourceSequence[i];
-            if (res.Type == ResourceType.SmallLake && Village)
+            if (res instanceof SmallLakeGen && Village)
                 continue;
-            world.setChunksCreations(res.Type.CreateNewChunks);
-            res.Type.Generator.Process(world, rand, res, x, z);
+            world.setChunksCreations(false);
+            res.process(world, rand, chunkX, chunkZ);
         }
 
         // Snow and ice
@@ -67,10 +67,11 @@ public void populate(int chunkX, int chunkZ)
                             world.setBlock(blockToFreezeX, blockToFreezeY - 1, blockToFreezeZ, biomeConfig.iceBlock, 0);
                         } else
                         {
-                            // Snow has to be placed on an empty space on a solid block in the world
+                            // Snow has to be placed on an empty space on a
+                            // solid block in the world
                             if (world.getMaterial(blockToFreezeX, blockToFreezeY, blockToFreezeZ) == DefaultMaterial.AIR)
                             {
-                                if (world.getMaterial(blockToFreezeX, blockToFreezeY - 1, blockToFreezeZ).isSolid()) 
+                                if (world.getMaterial(blockToFreezeX, blockToFreezeY - 1, blockToFreezeZ).isSolid())
                                 {
                                     world.setBlock(blockToFreezeX, blockToFreezeY, blockToFreezeZ, DefaultMaterial.SNOW.id, 0);
                                 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java
index 63f205514..b4060afca 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/AboveWaterGen.java
@@ -1,15 +1,33 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
 import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
+import java.util.List;
 import java.util.Random;
 
-public class AboveWaterGen extends ResourceGenBase
+public class AboveWaterGen extends Resource
 {
+    private int blockId;
+    private int blockData;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void load(List<String> args) throws InvalidResourceException
+    {
+        if (args.size() < 3)
+        {
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        frequency = getInt(args.get(1), 1, 100);
+        rarity = getInt(args.get(2), 1, 100);
+    }
+
+    @Override
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
         int y = world.getLiquidHeight(x, z);
         if (y == -1)
@@ -19,26 +37,23 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
         for (int i = 0; i < 10; i++)
         {
             int j = x + rand.nextInt(8) - rand.nextInt(8);
-            //int k = y + rand.nextInt(4) - rand.nextInt(4);
             int m = z + rand.nextInt(8) - rand.nextInt(8);
             if (!world.isEmpty(j, y, m) || !world.getMaterial(j, y - 1, m).isLiquid())
                 continue;
-            world.setBlock(j, y, m, res.BlockId, 0, false, false, false);
+            world.setBlock(j, y, m, blockId, blockData, false, false, false);
         }
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public ResourceType getType()
     {
-        res.BlockId = CheckBlock(Props[0]);
-        res.Frequency = CheckValue(Props[1], 1, 100);
-        res.Rarity = CheckValue(Props[2], 0, 100);
-        return true;
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        return res.BlockIdToName(res.BlockId) + "","" + res.Frequency + "","" + res.Rarity;
+        return ""AboveWaterGen("" + makeMaterial(blockId) + "","" + frequency + "","" + rarity + "")"";
     }
+
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java
index 9e530c630..f0f1f2cfa 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/CactusGen.java
@@ -1,17 +1,26 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
-import com.khorn.terraincontrol.LocalWorld;
-
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
-public class CactusGen extends ResourceGenBase
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
+
+public class CactusGen extends Resource
 {
+    private int blockId;
+    private int blockData;
+    private int minAltitude;
+    private int maxAltitude;
+    private List<Integer> sourceBlocks;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
-        int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+        int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
 
         for (int i = 0; i < 10; i++)
         {
@@ -24,9 +33,9 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
                 for (int i1 = 0; i1 < n; i1++)
                 {
                     int id = world.getTypeId(j, k + i1 - 1, m);
-                    if (res.CheckSourceId(id) || id == res.BlockId)
+                    if (sourceBlocks.contains(id))
                     {
-                        world.setBlock(j, k + i1, m, res.BlockId, 0, false, false, false);
+                        world.setBlock(j, k + i1, m, blockId, blockData, false, false, false);
                     }
                 }
             }
@@ -34,39 +43,35 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public ResourceType getType()
     {
+        return ResourceType.biomeConfigResource;
+    }
 
-        if (Props[0].contains("".""))
-        {
-            String[] block = Props[0].split(""\\."");
-            res.BlockId = CheckBlock(block[0]);
-            res.BlockData = CheckValue(block[1], 0, 16);
-        } else
-        {
-            res.BlockId = CheckBlock(Props[0]);
-        }
-
-        res.Frequency = CheckValue(Props[1], 1, 100);
-        res.Rarity = CheckValue(Props[2], 0, 100);
-        res.MinAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-
-        res.SourceBlockId = new int[Props.length - 5];
-        for (int i = 5; i < Props.length; i++)
-            res.SourceBlockId[i - 5] = CheckBlock(Props[i]);
-
-        return true;
+    @Override
+    public String makeString()
+    {
+        return ""Cactus("" + makeMaterial(blockId, blockData) + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + makeMaterial(sourceBlocks);
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public void load(List<String> args) throws InvalidResourceException
     {
-        String blockId = res.BlockIdToName(res.BlockId);
-        if (res.BlockData > 0)
+        if (args.size() < 6)
+        {
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        frequency = getInt(args.get(1), 1, 100);
+        rarity = getInt(args.get(2), 1, 100);
+        minAltitude = getInt(args.get(3), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(4), minAltitude + 1, TerrainControl.worldHeight);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 5; i < args.size(); i++)
         {
-            blockId += ""."" + res.BlockData;
+            sourceBlocks.add(getBlockId(args.get(i)));
         }
-        return blockId + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude + blockSources;
     }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/CustomObjectGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/CustomObjectGen.java
new file mode 100644
index 000000000..a4a943e57
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/CustomObjectGen.java
@@ -0,0 +1,67 @@
+package com.khorn.terraincontrol.generator.resourcegens;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
+import com.khorn.terraincontrol.util.Txt;
+
+public class CustomObjectGen extends Resource
+{
+    private List<CustomObject> objects;
+    private List<String> objectNames;
+
+    @Override
+    public void load(List<String> args) throws InvalidResourceException
+    {
+        if (args.size() == 0)
+        {
+            // Backwards compability
+            args.add(""UseWorld"");
+        }
+        objects = new ArrayList<CustomObject>();
+        for (String arg : args)
+        {
+            CustomObject object = TerrainControl.getCustomObjectManager().getObjectFromString(arg, worldConfig);
+            if (object == null || !object.canSpawnAsObject())
+            {
+                throw new InvalidResourceException(""No custom object found with the name "" + arg);
+            }
+            objects.add(object);
+            objectNames.add(arg);
+        }
+    }
+
+    @Override
+    public void spawn(LocalWorld world, Random random, int x, int z)
+    {
+        // Left blank, as process(..) already handles this.
+    }
+
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        for (CustomObject object : objects)
+        {
+            object.process(world, random, chunkX, chunkZ);
+        }
+    }
+
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
+    }
+
+    @Override
+    public String makeString()
+    {
+        return ""CustomObject("" + Txt.implode(objectNames, "","") + "")"";
+    }
+
+}
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java
index 630d447df..3d7b16d6a 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/DungeonGen.java
@@ -1,34 +1,47 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
 
+import java.util.List;
 import java.util.Random;
 
-public class DungeonGen extends ResourceGenBase
+public class DungeonGen extends Resource
 {
+    private int minAltitude;
+    private int maxAltitude;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void load(List<String> args) throws InvalidResourceException
     {
-        int _y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
-        world.PlaceDungeons(rand, x, _y, z);
+        if (args.size() < 4)
+        {
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+        frequency = getInt(args.get(0), 1, 100);
+        rarity = getInt(args.get(1), 1, 100);
+        minAltitude = getInt(args.get(2), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(3), minAltitude + 1, TerrainControl.worldHeight);
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void spawn(LocalWorld world, Random random, int x, int z)
     {
-        res.Frequency = CheckValue(Props[0], 1, 100);
-        res.Rarity = CheckValue(Props[1], 0, 100);
-        res.MinAltitude = CheckValue(Props[2], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
+        int y = random.nextInt(maxAltitude - minAltitude) + minAltitude;
+        world.PlaceDungeons(random, x, y, z);
+    }
 
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        return res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude;
+        return ""Dungeon("" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + "")"";
     }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java
index 0bed67e32..79c895dcc 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/GrassGen.java
@@ -1,60 +1,74 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 import com.khorn.terraincontrol.DefaultMaterial;
 import com.khorn.terraincontrol.LocalWorld;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
-public class GrassGen extends ResourceGenBase
+public class GrassGen extends Resource
 {
+    private int blockId;
+    private int blockData;
+    private List<Integer> sourceBlocks;
+
+    @Override
+    public void load(List<String> args) throws InvalidResourceException
+    {
+        if (args.size() < 5)
+        {
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+        blockId = getBlockId(args.get(0));
+        blockData = getInt(args.get(1), 0, 16);
+        frequency = getInt(args.get(2), 1, 500);
+        rarity = getInt(args.get(3), 1, 100);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 4; i < args.size(); i++)
+        {
+            sourceBlocks.add(getBlockId(args.get(i)));
+        }
+    }
+
     @Override
-    public void Process(LocalWorld world, Random rand, Resource res, int _x, int _z)
+    public void spawn(LocalWorld world, Random random, int x, int z)
     {
+        // Handled by process().
+    }
 
-        for (int t = 0; t < res.Frequency; t++)
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        for (int t = 0; t < frequency; t++)
         {
-            if (rand.nextInt(100) >= res.Rarity)
+            if (random.nextInt(100) >= rarity)
                 continue;
-            int x = _x + rand.nextInt(16) + 8;
-            int y = world.getHeight();
-            int z = _z + rand.nextInt(16) + 8;
+            int x = chunkX * 16 + random.nextInt(16) + 8;
+            int z = chunkZ * 16 + random.nextInt(16) + 8;
+            int y = world.getHighestBlockYAt(x, z);
 
             int i;
             while ((((i = world.getTypeId(x, y, z)) == 0) || (i == DefaultMaterial.LEAVES.id)) && (y > 0))
                 y--;
 
-            if ((!world.isEmpty(x, y + 1, z)) || (!res.CheckSourceId(world.getTypeId(x, y, z))))
+            if ((!world.isEmpty(x, y + 1, z)) || (!sourceBlocks.contains(world.getTypeId(x, y, z))))
                 continue;
-            world.setBlock(x, y + 1, z, res.BlockId, res.BlockData, false, false, false);
+            world.setBlock(x, y + 1, z, blockId, blockData, false, false, false);
         }
     }
 
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public ResourceType getType()
     {
-
-    }
-
-    @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
-    {
-        res.BlockId = CheckBlock(Props[0]);
-        res.BlockData = CheckValue(Props[1], 0, 16);
-        res.Frequency = CheckValue(Props[2], 1, 500);
-        res.Rarity = CheckValue(Props[3], 0, 100);
-
-        res.SourceBlockId = new int[Props.length - 4];
-        for (int i = 4; i < Props.length; i++)
-            res.SourceBlockId[i - 4] = CheckBlock(Props[i]);
-
-        return true;
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        return res.BlockIdToName(res.BlockId) + "","" + res.BlockData + "","" + res.Frequency + "","" + res.Rarity + blockSources;
+        return ""Grass("" + makeMaterial(blockId) + "","" + blockData + "","" + frequency + "","" + rarity + makeMaterial(sourceBlocks) + "")"";
     }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java
index 00a6cb9f7..1688c7584 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/LiquidGen.java
@@ -1,85 +1,97 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
-public class LiquidGen extends ResourceGenBase
+public class LiquidGen extends Resource
 {
+    private int blockId;
+    private int blockData;
+    private List<Integer> sourceBlocks;
+    private int minAltitude;
+    private int maxAltitude;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
-        int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+        int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
 
-        if (res.CheckSourceId(world.getTypeId(x, y + 1, z)))
+        if (sourceBlocks.contains(world.getTypeId(x, y + 1, z)))
             return;
-        if (res.CheckSourceId(world.getTypeId(x, y - 1, z)))
+        if (sourceBlocks.contains(world.getTypeId(x, y - 1, z)))
             return;
 
-        if ((world.getTypeId(x, y, z) != 0) && (res.CheckSourceId(world.getTypeId(x, y, z))))
+        if ((world.getTypeId(x, y, z) != 0) && (sourceBlocks.contains(world.getTypeId(x, y, z))))
             return;
 
-
         int i = 0;
         int j = 0;
 
         int tempBlock = world.getTypeId(x - 1, y, z);
 
-        i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
+        i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
         j = (tempBlock == 0) ? j + 1 : j;
 
         tempBlock = world.getTypeId(x + 1, y, z);
 
-        i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
+        i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
         j = (tempBlock == 0) ? j + 1 : j;
 
         tempBlock = world.getTypeId(x, y, z - 1);
 
-        i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
+        i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
         j = (tempBlock == 0) ? j + 1 : j;
 
         tempBlock = world.getTypeId(x, y, z + 1);
 
-        i = (res.CheckSourceId(tempBlock)) ? i + 1 : i;
+        i = (sourceBlocks.contains(tempBlock)) ? i + 1 : i;
         j = (tempBlock == 0) ? j + 1 : j;
 
-
         if ((i == 3) && (j == 1))
         {
-            world.setBlock(x, y, z, res.BlockId, 0, true, true, true);
-            //this.world.f = true;
-            //Block.byId[res.BlockId].a(this.world, x, y, z, this.rand);
-            //this.world.f = false;
+            world.setBlock(x, y, z, blockId, 0, true, true, true);
+            // this.world.f = true;
+            // Block.byId[res.BlockId].a(this.world, x, y, z, this.rand);
+            // this.world.f = false;
         }
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        res.BlockId = CheckBlock(Props[0]);
-        res.Frequency = CheckValue(Props[1], 1, 5000);
-        res.Rarity = CheckValue(Props[2], 0, 100);
-        res.MinAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-
-        res.SourceBlockId = new int[Props.length - 5];
-        for (int i = 5; i < Props.length; i++)
-            res.SourceBlockId[i - 5] = CheckBlock(Props[i]);
+        if (args.size() < 6)
+        {
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        frequency = getInt(args.get(1), 1, 5000);
+        rarity = getInt(args.get(2), 1, 100);
+        minAltitude = getInt(args.get(3), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(4), minAltitude + 1, TerrainControl.worldHeight);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 5; i < args.size(); i++)
+        {
+            sourceBlocks.add(getBlockId(args.get(i)));
+        }
+    }
 
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        String blockId = res.BlockIdToName(res.BlockId);
-        if (res.BlockData > 0)
-        {
-            blockId += ""."" + res.BlockData;
-        }
-        return blockId + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude + blockSources;
+        return ""Liquid("" + makeMaterial(blockId, blockData) + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + makeMaterial(sourceBlocks) + "")"";
     }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/OreGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/OreGen.java
index 5511da455..222d0fcec 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/OreGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/OreGen.java
@@ -1,38 +1,48 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 import com.khorn.terraincontrol.util.MathHelper;
 
-import java.util.Random;
-
-public class OreGen extends ResourceGenBase
+public class OreGen extends Resource
 {
+    private int blockId;
+    private int blockData;
+    private int minAltitude;
+    private int maxAltitude;
+    private int maxSize;
+    private List<Integer> sourceBlocks;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
-        int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+        int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
 
         float f = rand.nextFloat() * 3.141593F;
 
-        double d1 = x + 8 + MathHelper.sin(f) * res.MaxSize / 8.0F;
-        double d2 = x + 8 - MathHelper.sin(f) * res.MaxSize / 8.0F;
-        double d3 = z + 8 + MathHelper.cos(f) * res.MaxSize / 8.0F;
-        double d4 = z + 8 - MathHelper.cos(f) * res.MaxSize / 8.0F;
+        double d1 = x + 8 + MathHelper.sin(f) * maxSize / 8.0F;
+        double d2 = x + 8 - MathHelper.sin(f) * maxSize / 8.0F;
+        double d3 = z + 8 + MathHelper.cos(f) * maxSize / 8.0F;
+        double d4 = z + 8 - MathHelper.cos(f) * maxSize / 8.0F;
 
         double d5 = y + rand.nextInt(3) - 2;
         double d6 = y + rand.nextInt(3) - 2;
 
-        for (int i = 0; i <= res.MaxSize; i++)
+        for (int i = 0; i <= maxSize; i++)
         {
-            double d7 = d1 + (d2 - d1) * i / res.MaxSize;
-            double d8 = d5 + (d6 - d5) * i / res.MaxSize;
-            double d9 = d3 + (d4 - d3) * i / res.MaxSize;
+            double d7 = d1 + (d2 - d1) * i / maxSize;
+            double d8 = d5 + (d6 - d5) * i / maxSize;
+            double d9 = d3 + (d4 - d3) * i / maxSize;
 
-            double d10 = rand.nextDouble() * res.MaxSize / 16.0D;
-            double d11 = (MathHelper.sin(i * 3.141593F / res.MaxSize) + 1.0F) * d10 + 1.0D;
-            double d12 = (MathHelper.sin(i * 3.141593F / res.MaxSize) + 1.0F) * d10 + 1.0D;
+            double d10 = rand.nextDouble() * maxSize / 16.0D;
+            double d11 = (MathHelper.sin(i * 3.141593F / maxSize) + 1.0F) * d10 + 1.0D;
+            double d12 = (MathHelper.sin(i * 3.141593F / maxSize) + 1.0F) * d10 + 1.0D;
 
             int j = MathHelper.floor(d7 - d11 / 2.0D);
             int k = MathHelper.floor(d8 - d12 / 2.0D);
@@ -55,15 +65,9 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
                             for (int i5 = m; i5 <= i2; i5++)
                             {
                                 double d15 = (i5 + 0.5D - d9) / (d11 / 2.0D);
-                                if ((d13 * d13 + d14 * d14 + d15 * d15 < 1.0D) && res.CheckSourceId(world.getTypeId(i3, i4, i5)))
+                                if ((d13 * d13 + d14 * d14 + d15 * d15 < 1.0D) && sourceBlocks.contains(world.getTypeId(i3, i4, i5)))
                                 {
-                                    if (res.BlockData > 0)
-                                    {
-                                        world.setBlock(i3, i4, i5, res.BlockId, res.BlockData, false, false, false);
-                                    } else
-                                    {
-                                        world.setBlock(i3, i4, i5, res.BlockId, 0, false, false, false);
-                                    }
+                                    world.setBlock(i3, i4, i5, blockId, blockData, false, false, false);
                                 }
                             }
                         }
@@ -74,40 +78,35 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        if (Props[0].contains("".""))
+        if (args.size() < 7)
         {
-            String[] block = Props[0].split(""\\."");
-            res.BlockId = CheckBlock(block[0]);
-            res.BlockData = CheckValue(block[1], 0, 16);
-        } else
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        maxSize = getInt(args.get(1), 1, 128);
+        frequency = getInt(args.get(2), 1, 100);
+        rarity = getInt(args.get(3), 1, 100);
+        minAltitude = getInt(args.get(4), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(5), minAltitude + 1, TerrainControl.worldHeight);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 6; i < args.size(); i++)
         {
-            res.BlockId = CheckBlock(Props[0]);
+            sourceBlocks.add(getBlockId(args.get(i)));
         }
+    }
 
-        res.MaxSize = CheckValue(Props[1], 1, 128);
-        res.Frequency = CheckValue(Props[2], 1, 100);
-        res.Rarity = CheckValue(Props[3], 0, 100);
-        res.MinAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[5], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-
-        res.SourceBlockId = new int[Props.length - 6];
-        for (int i = 6; i < Props.length; i++)
-            res.SourceBlockId[i - 6] = CheckBlock(Props[i]);
-
-        return true;
-
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        String blockId = res.BlockIdToName(res.BlockId);
-        if (res.BlockData > 0)
-        {
-            blockId += ""."" + res.BlockData;
-        }
-        return blockId + "","" + res.MaxSize + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude + blockSources;
+        return ""Ore("" + makeMaterial(blockId, blockData) + "","" + maxSize + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + makeMaterial(sourceBlocks) + "")"";
     }
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/PlantGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/PlantGen.java
index 9d5af4050..2aae19816 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/PlantGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/PlantGen.java
@@ -1,69 +1,68 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
-public class PlantGen extends ResourceGenBase
+public class PlantGen extends Resource
 {
+    private int blockId;
+    private int blockData;
+    private int minAltitude;
+    private int maxAltitude;
+    private List<Integer> sourceBlocks;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
-        int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+        int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
 
         for (int i = 0; i < 64; i++)
         {
             int j = x + rand.nextInt(8) - rand.nextInt(8);
             int k = y + rand.nextInt(4) - rand.nextInt(4);
             int m = z + rand.nextInt(8) - rand.nextInt(8);
-            if ((!world.isEmpty(j, k, m)) || (!res.CheckSourceId(world.getTypeId(j, k - 1, m))))
+            if ((!world.isEmpty(j, k, m)) || (!sourceBlocks.contains(world.getTypeId(j, k - 1, m))))
                 continue;
 
-            if (res.BlockData > 0)
-            {
-                world.setBlock(j, k, m, res.BlockId, res.BlockData, false, false, false);
-            } else
-            {
-                world.setBlock(j, k, m, res.BlockId, 0, false, false, false);
-            }
+            world.setBlock(j, k, m, blockId, blockData, false, false, false);
         }
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        if (Props[0].contains("".""))
+        if (args.size() < 6)
         {
-            String[] block = Props[0].split(""\\."");
-            res.BlockId = CheckBlock(block[0]);
-            res.BlockData = CheckValue(block[1], 0, 16);
-        } else
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        frequency = getInt(args.get(1), 1, 100);
+        rarity = getInt(args.get(2), 1, 100);
+        minAltitude = getInt(args.get(3), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(4), minAltitude + 1, TerrainControl.worldHeight);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 5; i < args.size(); i++)
         {
-            res.BlockId = CheckBlock(Props[0]);
+            sourceBlocks.add(getBlockId(args.get(i)));
         }
+    }
 
-        res.Frequency = CheckValue(Props[1], 1, 100);
-        res.Rarity = CheckValue(Props[2], 0, 100);
-        res.MinAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-
-        res.SourceBlockId = new int[Props.length - 5];
-        for (int i = 5; i < Props.length; i++)
-            res.SourceBlockId[i - 5] = CheckBlock(Props[i]);
-
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        String blockId = res.BlockIdToName(res.BlockId);
-        if (res.BlockData > 0)
-        {
-            blockId += ""."" + res.BlockData;
-        }
-        return blockId + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude + blockSources;
+        return ""Plant("" + makeMaterial(blockId, blockData) + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + makeMaterial(sourceBlocks) + "")"";
     }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/ReedGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/ReedGen.java
index 89cf0f368..e10d6f272 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/ReedGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/ReedGen.java
@@ -1,65 +1,73 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
 import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.configuration.BiomeConfig;
+import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
-public class ReedGen extends ResourceGenBase
+public class ReedGen extends Resource
 {
 
+    private int blockId;
+    private int blockData;
+    private int minAltitude;
+    private int maxAltitude;
+    private List<Integer> sourceBlocks;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
         int y = world.getHighestBlockYAt(x, z);
-        if (y > res.MaxAltitude || y < res.MinAltitude || (!world.getMaterial(x - 1, y - 1, z).isLiquid() && !world.getMaterial(x + 1, y - 1, z).isLiquid() && !world.getMaterial(x, y - 1, z - 1).isLiquid() && !world.getMaterial(x, y - 1, z + 1).isLiquid()))
+        if (y > maxAltitude
+                || y < minAltitude
+                || (!world.getMaterial(x - 1, y - 1, z).isLiquid() && !world.getMaterial(x + 1, y - 1, z).isLiquid() && !world.getMaterial(x, y - 1, z - 1).isLiquid() && !world.getMaterial(x, y - 1,
+                        z + 1).isLiquid()))
         {
             return;
         }
-        if (!res.CheckSourceId(world.getTypeId(x, y - 1, z)))
+        if (!sourceBlocks.contains(world.getTypeId(x, y - 1, z)))
         {
             return;
         }
-        
+
         int n = 1 + rand.nextInt(2);
         for (int i1 = 0; i1 < n; i1++)
-            world.setBlock(x, y + i1, z, res.BlockId, res.BlockData, false, false, false);
+            world.setBlock(x, y + i1, z, blockId, blockData, false, false, false);
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        if (Props[0].contains("".""))
+        if (args.size() < 6)
         {
-            String[] block = Props[0].split(""\\."");
-            res.BlockId = CheckBlock(block[0]);
-            res.BlockData = CheckValue(block[1], 0, 16);
-        } else
+            throw new InvalidResourceException(""Too few arguments supplied"");
+        }
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        frequency = getInt(args.get(1), 1, 100);
+        rarity = getInt(args.get(2), 1, 100);
+        minAltitude = getInt(args.get(3), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(4), minAltitude + 1, TerrainControl.worldHeight);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 5; i < args.size(); i++)
         {
-            res.BlockId = CheckBlock(Props[0]);
+            sourceBlocks.add(getBlockId(args.get(i)));
         }
+    }
 
-        res.Frequency = CheckValue(Props[1], 1, 100);
-        res.Rarity = CheckValue(Props[2], 0, 100);
-        res.MinAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-
-        res.SourceBlockId = new int[Props.length - 5];
-        for (int i = 5; i < Props.length; i++)
-            res.SourceBlockId[i - 5] = CheckBlock(Props[i]);
-
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        String blockId = res.BlockIdToName(res.BlockId);
-        if (res.BlockData > 0)
-        {
-            blockId += ""."" + res.BlockData;
-        }
-        return blockId + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude + blockSources;
+        return ""Reed("" + makeMaterial(blockId, blockData) + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + makeMaterial(sourceBlocks) + "")"";
     }
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceGenBase.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceGenBase.java
deleted file mode 100644
index 3b0e7dcc0..000000000
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceGenBase.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.khorn.terraincontrol.generator.resourcegens;
-
-import com.khorn.terraincontrol.DefaultMaterial;
-import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
-import com.khorn.terraincontrol.LocalWorld;
-
-import java.util.Random;
-
-public abstract class ResourceGenBase
-{
-    public void Process(LocalWorld world, Random rand, Resource res, int _x, int _z)
-    {
-        for (int t = 0; t < res.Frequency; t++)
-        {
-            if (rand.nextInt(100) > res.Rarity)
-                continue;
-            int x = _x + rand.nextInt(16) + 8;
-            int z = _z + rand.nextInt(16) + 8;
-            SpawnResource(world, rand, res, x, z);
-        }
-
-    }
-
-    protected abstract void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z);
-
-    public boolean ReadFromString(Resource res, String[] line, BiomeConfig biomeConfig)
-    {
-        if (line.length < res.Type.MinProperties)
-            return false;
-        try
-        {
-            return this.ReadString(res, line, biomeConfig);
-
-        } catch (NumberFormatException e)
-        {
-            return false;
-        }
-    }
-
-    // ToDo make it more logical.
-    public String WriteToString(Resource res)
-    {
-        String sources = """";
-        for (int id : res.SourceBlockId)
-            sources += "","" + res.BlockIdToName(id);
-
-        return res.Type.name() + ""("" + this.WriteString(res, sources) + "")"";
-    }
-
-    public String WriteSettingOnly(Resource res)
-    {
-        String sources = """";
-        for (int id : res.SourceBlockId)
-            sources += "","" + res.BlockIdToName(id);
-        return this.WriteString(res, sources);
-    }
-
-    protected abstract String WriteString(Resource res, String blockSources);
-
-    protected abstract boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException;
-
-    protected int CheckValue(String str, int min, int max) throws NumberFormatException
-    {
-        int value = Integer.valueOf(str);
-        if (value > max)
-            return max;
-        else if (value < min)
-            return min;
-        else
-            return value;
-    }
-
-    protected int CheckValue(String str, int min, int max, int minValue) throws NumberFormatException
-    {
-        int value = CheckValue(str, min, max);
-
-        if (value < minValue)
-            return minValue + 1;
-        else
-            return value;
-    }
-
-    protected int CheckBlock(String block) throws NumberFormatException
-    {
-        DefaultMaterial mat = DefaultMaterial.getMaterial(block);
-        if (mat != null)
-            return mat.id;
-
-        return CheckValue(block, 0, 256);
-    }
-}
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceType.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceType.java
index 73097162a..1489912f6 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceType.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourceType.java
@@ -1,49 +1,6 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.customobjects.CustomObjectGen;
-
 public enum ResourceType
 {
-    Ore(OreGen.class, false, 7),
-    UnderWaterOre(UnderWaterOreGen.class, 5),
-    Plant(PlantGen.class, 6),
-    Liquid(LiquidGen.class, 6),
-    Grass(GrassGen.class, 5),
-    Reed(ReedGen.class, 6),
-    Cactus(CactusGen.class, 6),
-    Dungeon(DungeonGen.class, 4),
-    Tree(TreeGen.class, 3),
-    Sapling(TreeGen.class, 3),
-    CustomObject(CustomObjectGen.class, 0),
-    UnderGroundLake(UndergroundLakeGen.class, 6),
-    AboveWaterRes(AboveWaterGen.class, 3),
-    Vines(VinesGen.class, 4),
-    SmallLake(SmallLakeGen.class,5);
-
-    public ResourceGenBase Generator;
-    public final boolean CreateNewChunks;
-    public final int MinProperties;
-
-
-    private ResourceType(Class<? extends ResourceGenBase> c, int props)
-    {
-        this(c, true, props);
-    }
-
-    private ResourceType(Class<? extends ResourceGenBase> c, boolean createNewChunks, int props)
-    {
-        this.CreateNewChunks = createNewChunks;
-        this.MinProperties = props;
-        try
-        {
-            Generator = c.newInstance();
-
-        } catch (InstantiationException e)
-        {
-            e.printStackTrace();
-        } catch (IllegalAccessException e)
-        {
-            e.printStackTrace();
-        }
-    }
+    biomeConfigResource, saplingResource
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourcesManager.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourcesManager.java
new file mode 100644
index 000000000..349a07313
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/ResourcesManager.java
@@ -0,0 +1,88 @@
+package com.khorn.terraincontrol.generator.resourcegens;
+
+import java.util.List;
+import java.util.Map;
+
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.BiomeConfig;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.configuration.WorldConfig;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
+
+public class ResourcesManager
+{
+    private Map<String, Class<? extends Resource>> resourceTypes;
+
+    public ResourcesManager(Map<String, Class<? extends Resource>> resourceTypes)
+    {
+        // Also store in this class
+        this.resourceTypes = resourceTypes;
+
+        // Add vanilla resources
+        put(""AboveWaterRes"", AboveWaterGen.class);
+        put(""Cactus"", CactusGen.class);
+        put(""CustomObject"", CustomObjectGen.class);
+        put(""Dungeon"", DungeonGen.class);
+        put(""Grass"", GrassGen.class);
+        put(""Liquid"", LiquidGen.class);
+        put(""Ore"", OreGen.class);
+        put(""Plant"", PlantGen.class);
+        put(""Reed"", ReedGen.class);
+        put(""SmallLake"", SmallLakeGen.class);
+        put(""Tree"", TreeGen.class);
+        put(""UndergroundLake"", UndergroundLakeGen.class);
+        put(""UnderWaterOre"", UnderWaterOreGen.class);
+        put(""Vines"", VinesGen.class);
+    }
+
+    public void put(String name, Class<? extends Resource> value)
+    {
+        resourceTypes.put(name.toLowerCase(), value);
+    }
+
+    /**
+     * Creates a resource with the specified name.
+     * 
+     * @param name
+     *            Name of the resource, like Ore
+     * @param args
+     *            String representation of the args.
+     * @return The resource, or null of no matching resource could be found.
+     */
+    public Resource getResource(String name, BiomeConfig biomeConfig, List<String> args)
+    {
+        if (resourceTypes.containsKey(name.toLowerCase()))
+        {
+            Resource resource;
+            try
+            {
+                resource = resourceTypes.get(name.toLowerCase()).newInstance();
+            } catch (InstantiationException e)
+            {
+                TerrainControl.log(""Reflection error while loading the resources: "" + e.getMessage());
+                e.printStackTrace();
+                return null;
+            } catch (IllegalAccessException e)
+            {
+                TerrainControl.log(""Reflection error while loading the resources: "" + e.getMessage());
+                e.printStackTrace();
+                return null;
+            }
+            resource.setWorldConfig(biomeConfig.worldConfig);
+            try
+            {
+                resource.load(args);
+            } catch (InvalidResourceException e)
+            {
+                TerrainControl.log(""Invalid resource "" + name + "" in "" + biomeConfig.Name + "": "" + e.getMessage());
+                return null;
+            }
+
+            return resource;
+
+        }
+
+        return null;
+    }
+
+}
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/SaplingGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/SaplingGen.java
new file mode 100644
index 000000000..7531cb845
--- /dev/null
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/SaplingGen.java
@@ -0,0 +1,102 @@
+package com.khorn.terraincontrol.generator.resourcegens;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
+
+public class SaplingGen extends Resource
+{
+    public List<CustomObject> trees;
+    public List<String> treeNames;
+    public List<Integer> treeChances;
+    public int saplingType;
+
+    @Override
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
+    {
+        // Left blank, as it shouldn't spawn anything.
+    }
+
+    @Override
+    public void load(List<String> args) throws InvalidResourceException
+    {
+        assureSize(3, args);
+
+        if (args.get(0).equalsIgnoreCase(""All""))
+        {
+            saplingType = -1;
+        } else
+        {
+            saplingType = getInt(args.get(0), -1, 3);
+        }
+
+        trees = new ArrayList<CustomObject>();
+        treeNames = new ArrayList<String>();
+        treeChances = new ArrayList<Integer>();
+
+        for (int i = 1; i < args.size() - 1; i += 2)
+        {
+            CustomObject object = TerrainControl.getCustomObjectManager().getObjectFromString(args.get(i), worldConfig);
+            if (object == null)
+            {
+                throw new InvalidResourceException(""Custom object "" + args.get(i) + "" not found!"");
+            }
+            if(!object.canSpawnAsTree())
+            {
+                throw new InvalidResourceException(""Custom object "" + args.get(i) + "" is not a tree!"");
+            }
+            trees.add(object);
+            treeNames.add(args.get(i));
+            treeChances.add(getInt(args.get(i + 1), 1, 100));
+        }
+    }
+
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.saplingResource;
+    }
+
+    @Override
+    public String makeString()
+    {
+        String output = ""Sapling("" + saplingType;
+        if (saplingType == -1)
+        {
+            output = ""Sapling(All"";
+        }
+        for (int i = 0; i < treeNames.size(); i++)
+        {
+            output += "","" + treeNames.get(i) + "","" + treeChances.get(i);
+        }
+        return output + "")"";
+    }
+
+    @Override
+    public void spawn(LocalWorld world, Random random, int x, int z)
+    {
+        // Left blank, as process() already handles this
+    }
+
+    public boolean growSapling(LocalWorld world, Random random, int x, int y, int z)
+    {
+        for (int treeNumber = 0; treeNumber < trees.size(); treeNumber++)
+        {
+            if (random.nextInt(100) < treeChances.get(treeNumber))
+            {
+                if (trees.get(treeNumber).spawnAsTree(world, random, x, z))
+                {
+                    // Success!
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/SmallLakeGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/SmallLakeGen.java
index 40baafeb7..09105f5ce 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/SmallLakeGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/SmallLakeGen.java
@@ -1,25 +1,30 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
+import java.util.List;
+import java.util.Random;
+
 import com.khorn.terraincontrol.DefaultMaterial;
 import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.configuration.BiomeConfig;
+import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
-import java.util.Random;
-
-public class SmallLakeGen extends ResourceGenBase
+public class SmallLakeGen extends Resource
 {
 
     private final boolean[] BooleanBuffer = new boolean[2048];
-
+    private int blockId;
+    private int blockData;
+    private int minAltitude;
+    private int maxAltitude;
 
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
         x -= 8;
         z -= 8;
 
-        int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+        int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
 
         // Search any free space
         while ((y > 5) && (world.isEmpty(x, y, z)))
@@ -31,7 +36,6 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
         // y = floor
         y -= 4;
 
-
         synchronized (BooleanBuffer)
         {
             boolean[] BooleanBuffer = new boolean[2048];
@@ -67,14 +71,17 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
                 {
                     for (i2 = 0; i2 < 8; i2++)
                     {
-                        boolean flag = (!BooleanBuffer[((j * 16 + i1) * 8 + i2)]) && (((j < 15) && (BooleanBuffer[(((j + 1) * 16 + i1) * 8 + i2)])) || ((j > 0) && (BooleanBuffer[(((j - 1) * 16 + i1) * 8 + i2)])) || ((i1 < 15) && (BooleanBuffer[((j * 16 + (i1 + 1)) * 8 + i2)])) || ((i1 > 0) && (BooleanBuffer[((j * 16 + (i1 - 1)) * 8 + i2)])) || ((i2 < 7) && (BooleanBuffer[((j * 16 + i1) * 8 + (i2 + 1))])) || ((i2 > 0) && (BooleanBuffer[((j * 16 + i1) * 8 + (i2 - 1))])));
+                        boolean flag = (!BooleanBuffer[((j * 16 + i1) * 8 + i2)])
+                                && (((j < 15) && (BooleanBuffer[(((j + 1) * 16 + i1) * 8 + i2)])) || ((j > 0) && (BooleanBuffer[(((j - 1) * 16 + i1) * 8 + i2)]))
+                                        || ((i1 < 15) && (BooleanBuffer[((j * 16 + (i1 + 1)) * 8 + i2)])) || ((i1 > 0) && (BooleanBuffer[((j * 16 + (i1 - 1)) * 8 + i2)]))
+                                        || ((i2 < 7) && (BooleanBuffer[((j * 16 + i1) * 8 + (i2 + 1))])) || ((i2 > 0) && (BooleanBuffer[((j * 16 + i1) * 8 + (i2 - 1))])));
 
                         if (flag)
                         {
                             DefaultMaterial localMaterial = world.getMaterial(x + j, y + i2, z + i1);
                             if ((i2 >= 4) && (localMaterial.isLiquid()))
                                 return;
-                            if ((i2 < 4) && (!localMaterial.isSolid()) && (world.getTypeId(x + j, y + i2, z + i1) != res.BlockId))
+                            if ((i2 < 4) && (!localMaterial.isSolid()) && (world.getTypeId(x + j, y + i2, z + i1) != blockId))
                                 return;
                         }
                     }
@@ -90,7 +97,7 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
                     {
                         if (BooleanBuffer[((j * 16 + i1) * 8 + i2)])
                         {
-                            world.setBlock(x + j, y + i2, z + i1, res.BlockId, res.BlockData);
+                            world.setBlock(x + j, y + i2, z + i1, blockId, blockData);
                             BooleanBuffer[((j * 16 + i1) * 8 + i2)] = false;
                         }
                     }
@@ -104,77 +111,31 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
                     }
                 }
             }
-            /*
-           for (j = 0; j < 16; j++) {
-               for (i1 = 0; i1 < 16; i1++) {
-                   for (i2 = 4; i2 < 8; i2++) {
-                       if ((BooleanBuffer[((j * 16 + i1) * 8 + i2)] == 0) ||
-                               (paramWorld.getTypeId(x + j, y + i2 - 1, z + i1) != Block.DIRT.id) || (paramWorld.a(EnumSkyBlock.SKY, x + j, y + i2, z + i1) <= 0)) continue;
-                       BiomeBase localBiomeBase = paramWorld.getBiome(x + j, z + i1);
-                       if (localBiomeBase.A == Block.MYCEL.id) paramWorld.setRawTypeId(x + j, y + i2 - 1, z + i1, Block.MYCEL.id); else {
-                           paramWorld.setRawTypeId(x + j, y + i2 - 1, z + i1, Block.GRASS.id);
-                       }
-                   }
-               }
-
-           }
-
-           if (Block.byId[this.a].material == Material.LAVA) {
-               for (j = 0; j < 16; j++) {
-                   for (i1 = 0; i1 < 16; i1++) {
-                       for (i2 = 0; i2 < 8; i2++) {
-                           int i4 = (BooleanBuffer[((j * 16 + i1) * 8 + i2)] == 0) && (((j < 15) && (BooleanBuffer[(((j + 1) * 16 + i1) * 8 + i2)] != 0)) || ((j > 0) && (BooleanBuffer[(((j - 1) * 16 + i1) * 8 + i2)] != 0)) || ((i1 < 15) && (BooleanBuffer[((j * 16 + (i1 + 1)) * 8 + i2)] != 0)) || ((i1 > 0) && (BooleanBuffer[((j * 16 + (i1 - 1)) * 8 + i2)] != 0)) || ((i2 < 7) && (BooleanBuffer[((j * 16 + i1) * 8 + (i2 + 1))] != 0)) || ((i2 > 0) && (BooleanBuffer[((j * 16 + i1) * 8 + (i2 - 1))] != 0))) ? 1 : 0;
-
-                           if ((i4 == 0) ||
-                                   ((i2 >= 4) && (rand.nextInt(2) == 0)) || (!paramWorld.getMaterial(x + j, y + i2, z + i1).isBuildable())) continue;
-                           paramWorld.setRawTypeId(x + j, y + i2, z + i1, Block.STONE.id);
-                       }
-                   }
-
-               }
-
-           }
-
-           if (Block.byId[this.a].material == Material.WATER) {
-               for (j = 0; j < 16; j++) {
-                   for (i1 = 0; i1 < 16; i1++) {
-                       i2 = 4;
-                       if (!paramWorld.s(x + j, y + i2, z + i1)) continue; paramWorld.setRawTypeId(x + j, y + i2, z + i1, Block.ICE.id);
-                   }
-               }
-           } */
 
         }
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        if (Props[0].contains("".""))
-        {
-            String[] block = Props[0].split(""\\."");
-            res.BlockId = CheckBlock(block[0]);
-            res.BlockData = CheckValue(block[1], 0, 16);
-        } else
-        {
-            res.BlockId = CheckBlock(Props[0]);
-        }
+        assureSize(5, args);
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        frequency = getInt(args.get(1), 1, 100);
+        rarity = getInt(args.get(2), 1, 100);
+        minAltitude = getInt(args.get(3), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(4), minAltitude + 1, TerrainControl.worldHeight);
+    }
 
-        res.Frequency = CheckValue(Props[1], 1, 100);
-        res.Rarity = CheckValue(Props[2], 0, 100);
-        res.MinAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        String blockId = res.BlockIdToName(res.BlockId);
-        if (res.BlockData > 0)
-        {
-            blockId += ""."" + res.BlockData;
-        }
-        return blockId + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude;
+        return ""SmallLake("" + makeMaterial(blockId, blockData) + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + "")"";
     }
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeGen.java
index 842080d89..c9d1ad663 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeGen.java
@@ -1,304 +1,90 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
-import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.customobjects.BODefaultValues;
-import com.khorn.terraincontrol.customobjects.CustomObjectCompiled;
-import com.khorn.terraincontrol.customobjects.CustomObjectGen;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
-
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.List;
 import java.util.Random;
 
-public class TreeGen extends ResourceGenBase
-{
-    @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
-    {
+import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.customobjects.CustomObject;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
-    }
+public class TreeGen extends Resource
+{
+    private List<CustomObject> trees;
+    private List<String> treeNames;
+    private List<Integer> treeChances;
 
     @Override
-    public void Process(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void process(LocalWorld world, Random random, int chunkX, int chunkZ)
     {
-        for (int i = 0; i < res.Frequency; i++)
+        for (int i = 0; i < frequency; i++)
         {
-
-            int _x = x + rand.nextInt(16) + 8;
-            int _z = z + rand.nextInt(16) + 8;
-            int _y = world.getHighestBlockYAt(_x, _z);
-            SpawnTree(world, rand, res, _x, _y, _z);
-        }
-    }
-
-    public boolean SpawnTree(LocalWorld world, Random rand, Resource res, int x, int y, int z)
-    {
-        boolean treeSpawned = false;
-
-        for (int t = 0; t < res.TreeTypes.length && !treeSpawned; t++)
-        {
-            if (rand.nextInt(100) < res.TreeChances[t])
+            for (int treeNumber = 0; treeNumber < trees.size(); treeNumber++)
             {
-                switch (res.TreeTypes[t])
+                if (random.nextInt(100) < treeChances.get(treeNumber))
                 {
-                    case CustomTree:
-                        CustomObjectCompiled SelectedObject = res.CUObjects[t];
-                        // TODO Branch check ?!!!
-
-                        if (!CustomObjectGen.ObjectCanSpawn(world, x, y, z, SelectedObject))
-                            continue;
-
-                        treeSpawned = CustomObjectGen.GenerateCustomObject(world, rand, x, y, z, SelectedObject);
-
-                        if (treeSpawned)
-                            CustomObjectGen.GenerateCustomObjectFromGroup(world, rand, x, y, z, SelectedObject);
-                        break;
-                    case CustomTreeWorld:
-                        treeSpawned = SpawnCustomTreeFromArray(world, rand, x, y, z, res.CUObjectsWorld);
-                        break;
-                    case CustomTreeBiome:
-                        treeSpawned = SpawnCustomTreeFromArray(world, rand, x, y, z, res.CUObjectsBiome);
-                        break;
-                    default:
-                        treeSpawned = world.PlaceTree(res.TreeTypes[t], rand, x, y, z);
+                    int x = chunkX * 16 + random.nextInt(16);
+                    int z = chunkZ * 16 + random.nextInt(16);
+                    if (trees.get(treeNumber).spawnAsTree(world, random, x, z))
+                    {
+                        // Success, on to the next tree!
                         break;
+                    }
                 }
             }
         }
-        return treeSpawned;
-
-    }
-
-    private boolean SpawnCustomTreeFromArray(LocalWorld world, Random rand, int x, int y, int z, CustomObjectCompiled[] CUObjects)
-    {
-
-        if (CUObjects.length == 0)
-            return false;
-
-        boolean objectSpawned = false;
-        int spawnAttempts = 0;
-        while (!objectSpawned)
-        {
-            if (spawnAttempts > world.getSettings().objectSpawnRatio)
-                return false;
-
-            spawnAttempts++;
-
-            CustomObjectCompiled SelectedObject = CUObjects[rand.nextInt(CUObjects.length)];
-            if (SelectedObject.Branch)
-                continue;
-
-            if (rand.nextInt(100) < SelectedObject.Rarity)
-            {
-
-                if (!CustomObjectGen.ObjectCanSpawn(world, x, y, z, SelectedObject))
-                    continue;
-
-                objectSpawned = CustomObjectGen.GenerateCustomObject(world, rand, x, y, z, SelectedObject);
-
-                if (objectSpawned)
-                    CustomObjectGen.GenerateCustomObjectFromGroup(world, rand, x, y, z, SelectedObject);
-            }
-        }
-
-        return objectSpawned;
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        if (res.Type == ResourceType.Sapling)
-        {
-            if (Props[0].equals(""All""))
-                res.BlockData = -1;
-            else
-                res.BlockData = CheckValue(Props[0], 0, 3);
-
-        } else
-            res.Frequency = CheckValue(Props[0], 1, 100);
-
-        ArrayList<TreeType> treeTypes = new ArrayList<TreeType>();
-        ArrayList<Integer> treeChances = new ArrayList<Integer>();
-
-        ArrayList<CustomObjectCompiled> customTrees = new ArrayList<CustomObjectCompiled>();
-        HashMap<String, ArrayList<CustomObjectCompiled>> Groups = new HashMap<String, ArrayList<CustomObjectCompiled>>();
-
-        boolean hasCustomTreeWorld = false;
-        boolean hasCustomTreeBiome = false;
-
-        for (int index = 1; (index + 1) < Props.length; index += 2)
-        {
-            String tree = Props[index];
-            boolean defaultTreeFound = false;
-            for (TreeType type : TreeType.values())
-            {
-                if (type == TreeType.CustomTree || type == TreeType.CustomTreeWorld || type == TreeType.CustomTreeBiome)
-                    continue;
-
-                if (type.name().equals(tree))
-                {
-                    defaultTreeFound = true;
-
-                    treeTypes.add(type);
-                    treeChances.add(CheckValue(Props[index + 1], 0, 100));
-                    break;
-                }
-            }
-            if (defaultTreeFound)
-                continue;
-
-            // Check custom objects
-
-            if (tree.equals(BODefaultValues.BO_Use_World.stringValue()))
-            {
-                treeTypes.add(TreeType.CustomTreeWorld);
-                treeChances.add(CheckValue(Props[index + 1], 0, 100));
-                hasCustomTreeWorld = true;
-                continue;
-            }
-
-            if (tree.equals(BODefaultValues.BO_Use_Biome.stringValue()))
-            {
-                treeTypes.add(TreeType.CustomTreeBiome);
-                treeChances.add(CheckValue(Props[index + 1], 0, 100));
-                hasCustomTreeBiome = true;
-                continue;
-            }
-
-            CustomObjectCompiled obj = ObjectsStore.CompileString(tree, biomeConfig.worldConfig.CustomObjectsDirectory);
-            if (obj == null)
-                obj = ObjectsStore.CompileString(tree, ObjectsStore.GlobalDirectory);
-            if (obj != null)
-            {
-                customTrees.add(obj);
-                treeTypes.add(TreeType.CustomTree);
-                treeChances.add(CheckValue(Props[index + 1], 0, 100));
+        assureSize(3, args);
 
-                if (!obj.GroupId.equals(""""))
-                {
-                    if (!Groups.containsKey(obj.GroupId))
-                        Groups.put(obj.GroupId, new ArrayList<CustomObjectCompiled>());
+        frequency = getInt(args.get(0), 1, 100);
 
-                    Groups.get(obj.GroupId).add(obj);
-
-                }
-            }
+        trees = new ArrayList<CustomObject>();
+        treeNames = new ArrayList<String>();
+        treeChances = new ArrayList<Integer>();
 
-
-        }
-        if (treeChances.size() == 0)
-            return false;
-
-
-        if (hasCustomTreeBiome)
+        for (int i = 1; i < args.size() - 1; i += 2)
         {
-            ArrayList<CustomObjectCompiled> customTreesBiome = new ArrayList<CustomObjectCompiled>();
-            for (CustomObjectCompiled objectCompiled : biomeConfig.CustomObjectsCompiled)
+            CustomObject object = TerrainControl.getCustomObjectManager().getObjectFromString(args.get(i), worldConfig);
+            if (object == null)
             {
-                if (!objectCompiled.Tree)
-                    continue;
-                customTreesBiome.add(objectCompiled);
-                if (!objectCompiled.GroupId.equals(""""))
-                {
-                    if (!Groups.containsKey(objectCompiled.GroupId))
-                        Groups.put(objectCompiled.GroupId, new ArrayList<CustomObjectCompiled>());
-
-                    Groups.get(objectCompiled.GroupId).add(objectCompiled);
-
-                }
-
+                throw new InvalidResourceException(""Custom object "" + args.get(i) + "" not found!"");
             }
-
-            res.CUObjectsBiome = customTreesBiome.toArray(res.CUObjectsBiome);
-
-        }
-
-        if (hasCustomTreeWorld)
-        {
-            ArrayList<CustomObjectCompiled> customTreesWorld = new ArrayList<CustomObjectCompiled>();
-            for (CustomObjectCompiled objectCompiled : biomeConfig.worldConfig.CustomObjectsCompiled)
+            if(!object.canSpawnAsTree())
             {
-                if (objectCompiled.CheckBiome(biomeConfig.Name))
-                {
-                    if (!objectCompiled.Tree)
-                        continue;
-                    customTreesWorld.add(objectCompiled);
-                    if (!objectCompiled.GroupId.equals(""""))
-                    {
-                        if (!Groups.containsKey(objectCompiled.GroupId))
-                            Groups.put(objectCompiled.GroupId, new ArrayList<CustomObjectCompiled>());
-
-                        Groups.get(objectCompiled.GroupId).add(objectCompiled);
-
-                    }
-                }
-
+                throw new InvalidResourceException(""Custom object "" + args.get(i) + "" is not a tree!"");
             }
-
-            res.CUObjectsWorld = customTreesWorld.toArray(res.CUObjectsBiome);
-
+            trees.add(object);
+            treeNames.add(args.get(i));
+            treeChances.add(getInt(args.get(i + 1), 1, 100));
         }
+    }
 
-        for (CustomObjectCompiled objectCompiled : res.CUObjectsBiome)
-            if (Groups.containsKey(objectCompiled.GroupId))
-                objectCompiled.GroupObjects = Groups.get(objectCompiled.GroupId).toArray(objectCompiled.GroupObjects);
-
-        for (CustomObjectCompiled objectCompiled : res.CUObjectsWorld)
-            if (Groups.containsKey(objectCompiled.GroupId))
-                objectCompiled.GroupObjects = Groups.get(objectCompiled.GroupId).toArray(objectCompiled.GroupObjects);
-
-        for (CustomObjectCompiled objectCompiled : customTrees)
-            if (Groups.containsKey(objectCompiled.GroupId))
-                objectCompiled.GroupObjects = Groups.get(objectCompiled.GroupId).toArray(objectCompiled.GroupObjects);
-
-        Groups.clear();
-
-
-        res.TreeTypes = new TreeType[treeChances.size()];
-        res.TreeChances = new int[treeChances.size()];
-        res.CUObjects = new CustomObjectCompiled[treeChances.size()];
-        res.CUObjectsNames = new String[treeChances.size()];
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
+    }
 
-        int customIndex = 0;
-        for (int t = 0; t < treeTypes.size(); t++)
+    @Override
+    public String makeString()
+    {
+        String output = ""Tree("" + frequency;
+        for (int i = 0; i < treeNames.size(); i++)
         {
-            res.TreeTypes[t] = treeTypes.get(t);
-            res.TreeChances[t] = treeChances.get(t);
-            if (treeTypes.get(t) == TreeType.CustomTree)
-                res.CUObjects[t] = customTrees.get(customIndex++);
+            output += "","" + treeNames.get(i) + "","" + treeChances.get(i);
         }
-
-        return true;
+        return output + "")"";
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public void spawn(LocalWorld world, Random random, int x, int z)
     {
-        String output;
-        if (res.Type == ResourceType.Sapling)
-        {
-            if (res.BlockData == -1)
-                output = ""All"";
-            else
-                output = """" + res.BlockData;
-
-        } else
-            output = String.valueOf(res.Frequency);
-        for (int i = 0; i < res.TreeChances.length; i++)
-        {
-            output += "","";
-
-            if (res.TreeTypes[i] == TreeType.CustomTreeWorld)
-                output += BODefaultValues.BO_Use_World.stringValue() + "","" + res.TreeChances[i];
-            else if (res.TreeTypes[i] == TreeType.CustomTreeBiome)
-                output += BODefaultValues.BO_Use_Biome.stringValue() + "","" + res.TreeChances[i];
-            else if (res.TreeTypes[i] == TreeType.CustomTree)
-                output += res.CUObjects[i].Name + (res.CUObjects[i].ChangedSettings.equals("""") ? """" : (""("" + res.CUObjects[i].ChangedSettings + "")"")) + "","" + res.TreeChances[i];
-            else
-                output += res.TreeTypes[i].name() + "","" + res.TreeChances[i];
-        }
-        return output;
+        // Left blank, as process() already handles this
     }
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeType.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeType.java
index 4cf9d4f78..32271c4de 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeType.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/TreeType.java
@@ -2,17 +2,5 @@
 
 public enum TreeType
 {
-    Tree,
-    BigTree,
-    Forest,
-    HugeMushroom,
-    SwampTree,
-    Taiga1,
-    Taiga2,
-    JungleTree,
-    GroundBush,
-    CocoaTree,
-    CustomTree,
-    CustomTreeWorld,
-    CustomTreeBiome
+    Tree, BigTree, Forest, HugeMushroom, SwampTree, Taiga1, Taiga2, JungleTree, GroundBush, CocoaTree, CustomTree, CustomTreeWorld, CustomTreeBiome
 }
\ No newline at end of file
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/UnderWaterOreGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/UnderWaterOreGen.java
index 02506b868..0a3c2daa2 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/UnderWaterOreGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/UnderWaterOreGen.java
@@ -1,36 +1,43 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
-import java.util.Random;
-
-public class UnderWaterOreGen extends ResourceGenBase
+public class UnderWaterOreGen extends Resource
 {
+    private int blockId;
+    private List<Integer> sourceBlocks;
+    private int size;
+    private int blockData;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
         int y = world.getSolidHeight(x, z);
         if (world.getLiquidHeight(x, z) < y || y == -1)
             return;
 
-        int i = rand.nextInt(res.MaxSize);
-        int j = 2;
-        for (int k = x - i; k <= x + i; k++)
+        int currentSize = rand.nextInt(size);
+        int two = 2;
+        for (int k = x - currentSize; k <= x + currentSize; k++)
         {
-            for (int m = z - i; m <= z + i; m++)
+            for (int m = z - currentSize; m <= z + currentSize; m++)
             {
                 int n = k - x;
                 int i1 = m - z;
-                if (n * n + i1 * i1 <= i * i)
+                if (n * n + i1 * i1 <= currentSize * currentSize)
                 {
-                    for (int i2 = y - j; i2 <= y + j; i2++)
+                    for (int i2 = y - two; i2 <= y + two; i2++)
                     {
                         int i3 = world.getTypeId(k, i2, m);
-                        if (res.CheckSourceId(i3))
+                        if (sourceBlocks.contains(i3))
                         {
-                            world.setBlock(k, i2, m, res.BlockId, 0, false, false, false);
+                            world.setBlock(k, i2, m, blockId, blockData, false, false, false);
                         }
                     }
                 }
@@ -39,25 +46,30 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
+        assureSize(5, args);
+        blockId = getBlockId(args.get(0));
+        blockData = getBlockData(args.get(0));
+        size = getInt(args.get(1), 1, 8);
+        frequency = getInt(args.get(2), 1, 100);
+        rarity = getInt(args.get(3), 1, 100);
+        sourceBlocks = new ArrayList<Integer>();
+        for (int i = 4; i < args.size(); i++)
+        {
+            sourceBlocks.add(getBlockId(args.get(i)));
+        }
+    }
 
-        res.BlockId = CheckBlock(Props[0]);
-        res.MaxSize = CheckValue(Props[1], 1, 8);
-        res.Frequency = CheckValue(Props[2], 1, 100);
-        res.Rarity = CheckValue(Props[3], 0, 100);
-
-
-        res.SourceBlockId = new int[Props.length - 4];
-        for (int i = 4; i < Props.length; i++)
-            res.SourceBlockId[i - 4] = CheckBlock(Props[i]);
-
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        return res.BlockIdToName(res.BlockId) + "","" + res.MaxSize + "","" + res.Frequency + "","" + res.Rarity + blockSources;
+        return ""UnderWaterOre("" + makeMaterial(blockId, blockData) + "","" + size + "","" + frequency + "","" + rarity + makeMaterial(sourceBlocks) + "")"";
     }
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/UndergroundLakeGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/UndergroundLakeGen.java
index 4ce19ea1d..61b3e417f 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/UndergroundLakeGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/UndergroundLakeGen.java
@@ -1,23 +1,30 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 import com.khorn.terraincontrol.DefaultMaterial;
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.util.MathHelper;
 
+import java.util.List;
 import java.util.Random;
 
-public class UndergroundLakeGen extends ResourceGenBase
+public class UndergroundLakeGen extends Resource
 {
+    private int minSize;
+    private int maxSize;
+    private int minAltitude;
+    private int maxAltitude;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
-        int y = rand.nextInt(res.MaxAltitude - res.MinAltitude) + res.MinAltitude;
+        int y = rand.nextInt(maxAltitude - minAltitude) + minAltitude;
 
         if (y >= world.getHighestBlockYAt(x, z))
             return;
-        int size = rand.nextInt(res.MaxSize - res.MinSize) + res.MinSize;
+        int size = rand.nextInt(maxSize - minSize) + minSize;
 
         float mPi = rand.nextFloat() * 3.141593F;
 
@@ -54,29 +61,34 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
                         int uBlock = world.getTypeId(xLake, yLake - 1, zLake);
                         if (uBlock != 0) // not air
                             world.setBlock(xLake, yLake, zLake, DefaultMaterial.WATER.id, 0, false, false, false);
-                        else // Air block
+                        else
+                            // Air block
                             world.setBlock(xLake, yLake, zLake, 0, 0, false, false, false);
                     }
         }
     }
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
+        assureSize(6, args);
+        minSize = getInt(args.get(0), 1, 25);
+        maxSize = getInt(args.get(1), minSize, 60);
+        frequency = getInt(args.get(2), 1, 100);
+        rarity = getInt(args.get(3), 1, 100);
+        minAltitude = getInt(args.get(4), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(5), minAltitude + 1, TerrainControl.worldHeight);
+    }
 
-        res.MinSize = CheckValue(Props[0], 1, 25);
-        res.MaxSize = CheckValue(Props[1], 1, 60, res.MinSize);
-        res.Frequency = CheckValue(Props[2], 1, 100);
-        res.Rarity = CheckValue(Props[3], 0, 100);
-        res.MinAltitude = CheckValue(Props[4], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[5], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
-
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        return res.MinSize + "","" + res.MaxSize + "","" + res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude;
+        return ""UnderGroundLake("" + minSize + "","" + maxSize + "","" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + "")"";
     }
 }
diff --git a/common/src/com/khorn/terraincontrol/generator/resourcegens/VinesGen.java b/common/src/com/khorn/terraincontrol/generator/resourcegens/VinesGen.java
index d921efc66..73328bc50 100644
--- a/common/src/com/khorn/terraincontrol/generator/resourcegens/VinesGen.java
+++ b/common/src/com/khorn/terraincontrol/generator/resourcegens/VinesGen.java
@@ -1,22 +1,27 @@
 package com.khorn.terraincontrol.generator.resourcegens;
 
-import com.khorn.terraincontrol.configuration.BiomeConfig;
-import com.khorn.terraincontrol.configuration.Resource;
+import java.util.List;
+import java.util.Random;
+
 import com.khorn.terraincontrol.DefaultMaterial;
 import com.khorn.terraincontrol.LocalWorld;
+import com.khorn.terraincontrol.TerrainControl;
+import com.khorn.terraincontrol.configuration.Resource;
+import com.khorn.terraincontrol.exception.InvalidResourceException;
 
-import java.util.Random;
-
-public class VinesGen extends ResourceGenBase
+public class VinesGen extends Resource
 {
+    private int minAltitude;
+    private int maxAltitude;
+
     @Override
-    protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x, int z)
+    public void spawn(LocalWorld world, Random rand, int x, int z)
     {
         int _x = x;
         int _z = z;
-        int y = res.MinAltitude;
+        int y = minAltitude;
 
-        while (y < res.MaxAltitude)
+        while (y < maxAltitude)
         {
             if (world.isEmpty(_x, y, _z))
             {
@@ -36,51 +41,54 @@ protected void SpawnResource(LocalWorld world, Random rand, Resource res, int x,
 
     }
 
-
     public boolean canPlace(LocalWorld world, int x, int y, int z, int paramInt4)
     {
         int id;
         switch (paramInt4)
         {
-            default:
-                return false;
-            case 1:
-                id = (world.getTypeId(x, y + 1, z));
-                break;
-            case 2:
-                id = (world.getTypeId(x, y, z + 1));
-                break;
-            case 3:
-                id = (world.getTypeId(x, y, z - 1));
-                break;
-            case 5:
-                id = (world.getTypeId(x - 1, y, z));
-                break;
-            case 4:
-                id = (world.getTypeId(x + 1, y, z));
-                break;
+        default:
+            return false;
+        case 1:
+            id = (world.getTypeId(x, y + 1, z));
+            break;
+        case 2:
+            id = (world.getTypeId(x, y, z + 1));
+            break;
+        case 3:
+            id = (world.getTypeId(x, y, z - 1));
+            break;
+        case 5:
+            id = (world.getTypeId(x - 1, y, z));
+            break;
+        case 4:
+            id = (world.getTypeId(x + 1, y, z));
+            break;
         }
         return DefaultMaterial.getMaterial(id).isSolid();
     }
 
-
-    public static final int[] d = {-1, -1, 2, 0, 1, 3};
-    public static final int[] OPPOSITE_FACING = {1, 0, 3, 2, 5, 4};
+    public static final int[] d = { -1, -1, 2, 0, 1, 3 };
+    public static final int[] OPPOSITE_FACING = { 1, 0, 3, 2, 5, 4 };
 
     @Override
-    protected boolean ReadString(Resource res, String[] Props, BiomeConfig biomeConfig) throws NumberFormatException
+    public void load(List<String> args) throws InvalidResourceException
     {
-        res.Frequency = CheckValue(Props[0], 1, 100);
-        res.Rarity = CheckValue(Props[1], 0, 100);
-        res.MinAltitude = CheckValue(Props[2], 0, biomeConfig.worldConfig.WorldHeight);
-        res.MaxAltitude = CheckValue(Props[3], 0, biomeConfig.worldConfig.WorldHeight, res.MinAltitude);
+        assureSize(4, args);
+        frequency = getInt(args.get(0), 1, 100);
+        rarity = getInt(args.get(1), 1, 100);
+        minAltitude = getInt(args.get(2), TerrainControl.worldDepth, TerrainControl.worldHeight);
+        maxAltitude = getInt(args.get(3), minAltitude + 1, TerrainControl.worldHeight);
+    }
 
-        return true;
+    @Override
+    public ResourceType getType()
+    {
+        return ResourceType.biomeConfigResource;
     }
 
     @Override
-    protected String WriteString(Resource res, String blockSources)
+    public String makeString()
     {
-        return res.Frequency + "","" + res.Rarity + "","" + res.MinAltitude + "","" + res.MaxAltitude;
+        return ""Vines("" + frequency + "","" + rarity + "","" + minAltitude + "","" + maxAltitude + "")"";
     }
 }
diff --git a/forge/src/com/khorn/terraincontrol/forge/TCPlugin.java b/forge/src/com/khorn/terraincontrol/forge/TCPlugin.java
index 8491df29c..a17b48b74 100644
--- a/forge/src/com/khorn/terraincontrol/forge/TCPlugin.java
+++ b/forge/src/com/khorn/terraincontrol/forge/TCPlugin.java
@@ -9,7 +9,7 @@
 import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.TerrainControlEngine;
 import com.khorn.terraincontrol.configuration.TCDefaultValues;
-import com.khorn.terraincontrol.customobjects.ObjectsStore;
+import com.khorn.terraincontrol.customobjects.BODefaultValues;
 import com.khorn.terraincontrol.util.Txt;
 
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -52,8 +52,6 @@ public void load(FMLInitializationEvent event)
         TerrainControl.startEngine(this);
         // Register localization
         LanguageRegistry.instance().addStringLocalization(""generator.TerrainControl"", ""TerrainControl"");
-        // Load global custom objects
-        ObjectsStore.ReadObjects(terrainControlDirectory);
         // Register world type
         worldType = new TCWorldType(this, 4, ""TerrainControl"");
         // Register channel
@@ -98,4 +96,10 @@ public void log(Level level, String... messages)
         System.out.println(""TerrainControl: "" + Txt.implode(messages, "",""));
     }
 
+    @Override
+    public File getGlobalObjectsDirectory()
+    {
+        return new File(terrainControlDirectory, BODefaultValues.BO_GlobalDirectoryName.stringValue());
+    }
+
 }"
8ee465103850a3dca018273fe5952e40d5c45a66,spring-framework,Improve StringUtils.cleanPath--Issue: SPR-11793-,c,https://github.com/spring-projects/spring-framework,"diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 126cab69fcd3..b659486a19d0 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -622,7 +622,12 @@ public static String cleanPath(String path) {
 		String prefix = """";
 		if (prefixIndex != -1) {
 			prefix = pathToUse.substring(0, prefixIndex + 1);
-			pathToUse = pathToUse.substring(prefixIndex + 1);
+			if (prefix.contains(""/"")) {
+				prefix = """";
+			}
+			else {
+				pathToUse = pathToUse.substring(prefixIndex + 1);
+			}
 		}
 		if (pathToUse.startsWith(FOLDER_SEPARATOR)) {
 			prefix = prefix + FOLDER_SEPARATOR;
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index b366ed7f96d0..c362a92ed529 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -299,6 +299,8 @@ public void testCleanPath() {
 		assertEquals(""../mypath/myfile"", StringUtils.cleanPath(""../mypath/../mypath/myfile""));
 		assertEquals(""../mypath/myfile"", StringUtils.cleanPath(""mypath/../../mypath/myfile""));
 		assertEquals(""/../mypath/myfile"", StringUtils.cleanPath(""/../mypath/myfile""));
+		assertEquals(""/mypath/myfile"", StringUtils.cleanPath(""/a/:b/../../mypath/myfile""));
+		assertEquals(""file:///c:/path/to/the%20file.txt"", StringUtils.cleanPath(""file:///c:/some/../path/to/the%20file.txt""));
 	}
 
 	public void testPathEquals() {"
5a273e85d77f50d49612ab7ad05b6a8b049c4bae,brandonborkholder$glg2d,"Well, realized that the fragment shader can't composite or blend. So I think this is the closest I'll get to a decent implementation of the Duff-Porter blend functionality.",p,https://github.com/brandonborkholder/glg2d,"diff --git a/src/joglg2d/JOGLG2D.java b/src/joglg2d/JOGLG2D.java
index a5479fde..ceadf90b 100644
--- a/src/joglg2d/JOGLG2D.java
+++ b/src/joglg2d/JOGLG2D.java
@@ -221,52 +221,41 @@ public Composite getComposite() {
   public void setComposite(Composite comp) {
     if (comp instanceof AlphaComposite) {
       switch (((AlphaComposite) comp).getRule()) {
-      case AlphaComposite.CLEAR:
-        gl.glBlendFunc(GL.GL_ZERO, GL.GL_ZERO);
-        break;
-
+        /*
+         * Since the destination _always_ covers the entire canvas (i.e. there
+         * are always color components for every pixel), some of these
+         * composites can be collapsed into each other. They matter when Java2D
+         * is drawing into an image and the destination may not take up the
+         * entire canvas.
+         */
       case AlphaComposite.SRC:
-        gl.glBlendFunc(GL.GL_ONE, GL.GL_ZERO);
+      case AlphaComposite.SRC_IN:
+        gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ZERO);
         break;
 
       case AlphaComposite.SRC_OVER:
-        gl.glBlendFunc(GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA);
-        break;
-
-      case AlphaComposite.SRC_IN:
-        gl.glBlendFunc(GL.GL_DST_ALPHA, GL.GL_ZERO);
+      case AlphaComposite.SRC_ATOP:
+        gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
         break;
 
       case AlphaComposite.SRC_OUT:
-        gl.glBlendFunc(GL.GL_ONE_MINUS_DST_ALPHA, GL.GL_ZERO);
-        break;
-
-      case AlphaComposite.SRC_ATOP:
-        gl.glBlendFunc(GL.GL_DST_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
+      case AlphaComposite.CLEAR:
+        gl.glBlendFunc(GL.GL_ZERO, GL.GL_ZERO);
         break;
 
       case AlphaComposite.DST:
-        gl.glBlendFunc(GL.GL_ZERO, GL.GL_ONE);
-        break;
-
       case AlphaComposite.DST_OVER:
-        gl.glBlendFunc(GL.GL_ONE_MINUS_DST_ALPHA, GL.GL_ONE);
+        gl.glBlendFunc(GL.GL_ZERO, GL.GL_ONE);
         break;
 
       case AlphaComposite.DST_IN:
+      case AlphaComposite.DST_ATOP:
         gl.glBlendFunc(GL.GL_ZERO, GL.GL_SRC_ALPHA);
         break;
 
       case AlphaComposite.DST_OUT:
-        gl.glBlendFunc(GL.GL_ZERO, GL.GL_ONE_MINUS_SRC_ALPHA);
-        break;
-
-      case AlphaComposite.DST_ATOP:
-        gl.glBlendFunc(GL.GL_ONE_MINUS_DST_ALPHA, GL.GL_SRC_ALPHA);
-        break;
-
       case AlphaComposite.XOR:
-        gl.glBlendFunc(GL.GL_ONE_MINUS_DST_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
+        gl.glBlendFunc(GL.GL_ZERO, GL.GL_ONE_MINUS_SRC_ALPHA);
         break;
       }
 
@@ -587,10 +576,9 @@ public void fillRect(int x, int y, int width, int height) {
 
   @Override
   public void clearRect(int x, int y, int width, int height) {
-    Color origColor = color;
-    setColor(background);
+    setColor(gl, background);
     fillRect(x, y, width, height);
-    setColor(origColor);
+    setColor(gl, color);
   }
 
   @Override
diff --git a/test/joglg2d/VisualTest.java b/test/joglg2d/VisualTest.java
index 6b704dc4..59fecb75 100644
--- a/test/joglg2d/VisualTest.java
+++ b/test/joglg2d/VisualTest.java
@@ -396,7 +396,7 @@ public void paint(Graphics2D g2d) {
   }
 
   @Test
-  public void srcOverRuleTest() throws Exception {
+  public void compositeTest() throws Exception {
     tester.setPainter(new Painter() {
       @Override
       public void paint(Graphics2D g2d) {
@@ -434,7 +434,6 @@ void draw(Graphics2D g2d, AlphaComposite composite, String name) {
         dest.lineTo(100, 0);
         dest.lineTo(100, 100);
         dest.closePath();
-        g2d.setColor(g2d.getBackground());
         g2d.setComposite(AlphaComposite.SrcOver);
         g2d.setColor(new Color(255, 0, 0, 190));
         g2d.fill(dest);"
b07575194155e5f90e3ab514812d11dd74eef75f,abashev$vfs-s3,"Added support for Server Side Encryption
- Added S3FileSystemConfigBuilder
- Refactored S3FileSystem + Object so that FileSystem encapsulates
the various options (similar to SftpFileSystem+Object)
- Added get/setServerSideEncryption as necessary
- Added integration tests
- Fixed a bug in copy file tests where file counts were not being
tested properly.
",a,https://github.com/abashev/vfs-s3,"diff --git a/src/main/java/com/intridea/io/vfs/provider/s3/S3FileObject.java b/src/main/java/com/intridea/io/vfs/provider/s3/S3FileObject.java
index 683a6dde..96572709 100644
--- a/src/main/java/com/intridea/io/vfs/provider/s3/S3FileObject.java
+++ b/src/main/java/com/intridea/io/vfs/provider/s3/S3FileObject.java
@@ -47,18 +47,8 @@ public class S3FileObject extends AbstractFileObject {
 
     private static final String MIMETYPE_JETS3T_DIRECTORY = ""application/x-directory"";
 
-    /** Amazon S3 service */
-    private final AWSCredentials awsCredentials;
-    private final AmazonS3 service;
-
-    private final TransferManager transferManager;
-
-    /** Amazon S3 bucket */
-     private final Bucket bucket;
-
     /** Amazon S3 object */
     private ObjectMetadata objectMetadata;
-
     private String objectKey;
 
     /**
@@ -82,16 +72,9 @@ public class S3FileObject extends AbstractFileObject {
      */
     private Owner fileOwner;
 
-    public S3FileObject(
-            AbstractFileName fileName, S3FileSystem fileSystem, AWSCredentials awsCredentials, AmazonS3 service,
-            TransferManager transferManager, Bucket bucket
-    ) throws FileSystemException {
+    public S3FileObject(AbstractFileName fileName,
+                        S3FileSystem fileSystem) throws FileSystemException {
         super(fileName, fileSystem);
-
-        this.awsCredentials = awsCredentials;
-        this.service = service;
-        this.bucket = bucket;
-        this.transferManager = transferManager;
     }
 
     @Override
@@ -100,7 +83,7 @@ protected void doAttach() {
             try {
                 // Do we have file with name?
                 String candidateKey = getS3Key();
-                objectMetadata = service.getObjectMetadata(bucket.getName(), candidateKey);
+                objectMetadata = getService().getObjectMetadata(getBucket().getName(), candidateKey);
                 objectKey = candidateKey;
                 logger.info(""Attach file to S3 Object: "" + objectKey);
 
@@ -116,7 +99,7 @@ protected void doAttach() {
             try {
                 // Do we have folder with that name?
                 String candidateKey = getS3Key() + FileName.SEPARATOR;
-                objectMetadata = service.getObjectMetadata(bucket.getName(), candidateKey);
+                objectMetadata = getService().getObjectMetadata(getBucket().getName(), candidateKey);
                 objectKey = candidateKey;
                 logger.info(""Attach folder to S3 Object: "" + objectKey);
 
@@ -156,7 +139,7 @@ protected void doDetach() throws Exception {
 
     @Override
     protected void doDelete() throws Exception {
-        service.deleteObject(bucket.getName(), objectKey);
+        getService().deleteObject(getBucket().getName(), objectKey);
     }
 
     @Override
@@ -164,7 +147,7 @@ protected void doCreateFolder() throws Exception {
         if (logger.isDebugEnabled()) {
             logger.debug(
                     ""Create new folder in bucket ["" +
-                    ((bucket != null) ? bucket.getName() : ""null"") +
+                    ((getBucket() != null) ? getBucket().getName() : ""null"") +
                     ""] with key ["" +
                     ((objectMetadata != null) ? objectKey : ""null"") +
                     ""]""
@@ -178,7 +161,9 @@ protected void doCreateFolder() throws Exception {
         InputStream input = new ByteArrayInputStream(new byte[0]);
         ObjectMetadata metadata = new ObjectMetadata();
         metadata.setContentLength(0);
-        service.putObject(new PutObjectRequest(bucket.getName(), objectKey + FileName.SEPARATOR, input, metadata));
+        if (((S3FileSystem)getFileSystem()).getServerSideEncryption())
+            metadata.setServerSideEncryption(ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
+        getService().putObject(new PutObjectRequest(getBucket().getName(), objectKey + FileName.SEPARATOR, input, metadata));
     }
 
     @Override
@@ -228,13 +213,13 @@ protected String[] doListChildren() throws Exception {
             path = path + ""/"";
         }
 
-        ObjectListing listing = service.listObjects(bucket.getName(), path);
+        ObjectListing listing = getService().listObjects(getBucket().getName(), path);
         final List<S3ObjectSummary> summaries = new ArrayList<S3ObjectSummary>(listing.getObjectSummaries());
         while (listing.isTruncated()) {
             final ListObjectsRequest loReq = new ListObjectsRequest();
-            loReq.setBucketName(bucket.getName());
+            loReq.setBucketName(getBucket().getName());
             loReq.setMarker(listing.getNextMarker());
-            listing = service.listObjects(loReq);
+            listing = getService().listObjects(loReq);
             summaries.addAll(listing.getObjectSummaries());
         }
 
@@ -275,13 +260,13 @@ protected FileObject[] doListChildrenResolved() throws Exception
 			path = path + ""/"";
 		}
 
-		ObjectListing listing = service.listObjects(bucket.getName(), path);
+		ObjectListing listing = getService().listObjects(getBucket().getName(), path);
 		final List<S3ObjectSummary> summaries = new ArrayList<S3ObjectSummary>(listing.getObjectSummaries());
 		while (listing.isTruncated()) {
 			final ListObjectsRequest loReq = new ListObjectsRequest();
-			loReq.setBucketName(bucket.getName());
+			loReq.setBucketName(getBucket().getName());
 			loReq.setMarker(listing.getNextMarker());
-			listing = service.listObjects(loReq);
+			listing = getService().listObjects(loReq);
 			summaries.addAll(listing.getObjectSummaries());
 		}
 
@@ -332,7 +317,7 @@ private void downloadOnce () throws FileSystemException {
             final String failedMessage = ""Failed to download S3 Object %s. %s"";
             final String objectPath = getName().getPath();
             try {
-                S3Object obj = service.getObject(bucket.getName(), objectKey);
+                S3Object obj = getService().getObject(getBucket().getName(), objectKey);
                 logger.info(String.format(""Downloading S3 Object: %s"", objectPath));
                 InputStream is = obj.getObjectContent();
                 if (obj.getObjectMetadata().getContentLength() > 0) {
@@ -438,7 +423,7 @@ private Owner getS3Owner() {
      */
     private AccessControlList getS3Acl() {
         String key = getS3Key();
-        return """".equals(key) ? service.getBucketAcl(bucket.getName()) : service.getObjectAcl(bucket.getName(), key);
+        return """".equals(key) ? getService().getBucketAcl(getBucket().getName()) : getService().getObjectAcl(getBucket().getName(), key);
     }
 
     /**
@@ -450,12 +435,12 @@ private void putS3Acl (AccessControlList s3Acl) {
         String key = getS3Key();
         // Determine context. Object or Bucket
         if ("""".equals(key)) {
-            service.setBucketAcl(bucket.getName(), s3Acl);
+            getService().setBucketAcl(getBucket().getName(), s3Acl);
         } else {
             // Before any operations with object it must be attached
             doAttach();
             // Put ACL to S3
-            service.setObjectAcl(bucket.getName(), objectKey, s3Acl);
+            getService().setObjectAcl(getBucket().getName(), objectKey, s3Acl);
         }
     }
 
@@ -608,7 +593,7 @@ public void setAcl (Acl acl) throws FileSystemException {
      * @return
      */
     public String getHttpUrl() {
-        StringBuilder sb = new StringBuilder(""http://"" + bucket.getName() + "".s3.amazonaws.com/"");
+        StringBuilder sb = new StringBuilder(""http://"" + getBucket().getName() + "".s3.amazonaws.com/"");
         String key = getS3Key();
 
         // Determine context. Object or Bucket
@@ -627,9 +612,9 @@ public String getHttpUrl() {
     public String getPrivateUrl() {
         return String.format(
                 ""s3://%s:%s@%s/%s"",
-                awsCredentials.getAWSAccessKeyId(),
-                awsCredentials.getAWSSecretKey(),
-                bucket.getName(),
+                getAwsCredentials().getAWSAccessKeyId(),
+                getAwsCredentials().getAWSSecretKey(),
+                getBucket().getName(),
                 getS3Key()
         );
     }
@@ -646,7 +631,9 @@ public String getSignedUrl(int expireInSeconds) throws FileSystemException {
         cal.add(SECOND, expireInSeconds);
 
         try {
-            return service.generatePresignedUrl(bucket.getName(), getS3Key(), cal.getTime()).toString();
+            return getService().generatePresignedUrl(
+                getBucket().getName(),
+                getS3Key(), cal.getTime()).toString();
         } catch (AmazonServiceException e) {
             throw new FileSystemException(e);
         }
@@ -658,19 +645,40 @@ public String getSignedUrl(int expireInSeconds) throws FileSystemException {
      * @throws FileSystemException
      */
     public String getMD5Hash() throws FileSystemException {
-        final String key = getS3Key();
         String hash = null;
 
+        ObjectMetadata metadata = getObjectMetadata();
+        if (metadata != null) {
+            hash = metadata.getETag(); // TODO this is something different than mentioned in methodname / javadoc
+        }
+
+        return hash;
+    }
+
+    public ObjectMetadata getObjectMetadata() throws FileSystemException {
         try {
-            ObjectMetadata metadata = service.getObjectMetadata(bucket.getName(), key);
-            if (metadata != null) {
-                hash = metadata.getETag(); // TODO this is something different than mentioned in methodname / javadoc
-            }
+            return getService().getObjectMetadata(getBucket().getName(), getS3Key());
         } catch (AmazonServiceException e) {
             throw new FileSystemException(e);
         }
+    }
 
-        return hash;
+    /** FileSystem object containing configuration */
+    protected AWSCredentials getAwsCredentials() {
+        return ((S3FileSystem)getFileSystem()).getAwsCredentials();
+    }
+
+    protected AmazonS3 getService() {
+        return ((S3FileSystem)getFileSystem()).getService();
+    }
+
+    protected TransferManager getTransferManager() {
+        return ((S3FileSystem)getFileSystem()).getTransferManager();
+    }
+
+    /** Amazon S3 bucket */
+    protected Bucket getBucket() {
+        return ((S3FileSystem)getFileSystem()).getBucket();
     }
 
     /**
@@ -689,11 +697,15 @@ protected void onClose() throws IOException {
             FileChannel cacheFileChannel = getCacheFileChannel();
 
             objectMetadata.setContentLength(cacheFileChannel.size());
-            objectMetadata.setContentType(Mimetypes.getInstance().getMimetype(getName().getBaseName()));
-
+            objectMetadata.setContentType(
+                Mimetypes.getInstance().getMimetype(getName().getBaseName()));
+            if (((S3FileSystem)getFileSystem()).getServerSideEncryption())
+                objectMetadata.setServerSideEncryption(
+                    ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
             try {
-                final Upload upload = transferManager.upload(
-                        bucket.getName(), objectKey, newInputStream(cacheFileChannel), objectMetadata
+                final Upload upload = getTransferManager().upload(
+                    getBucket().getName(), objectKey,
+                    newInputStream(cacheFileChannel), objectMetadata
                 );
 
                 upload.addProgressListener(new ProgressListener() {
@@ -708,7 +720,7 @@ public void progressChanged(ProgressEvent progressEvent) {
                         if ((progress - lastValue) > REPORT_THRESHOLD) {
                             logger.info(
                                     ""File "" + objectKey +
-                                    "" was uploaded to "" + bucket.getName() +
+                                    "" was uploaded to "" + getBucket().getName() +
                                     "" for "" + (int) progress + ""%""
                             );
 
@@ -716,7 +728,7 @@ public void progressChanged(ProgressEvent progressEvent) {
                         }
 
                         if (progressEvent.getEventCode() == COMPLETED_EVENT_CODE) {
-                            logger.info(""File "" + objectKey + "" was successfully uploaded to "" + bucket.getName());
+                            logger.info(""File "" + objectKey + "" was successfully uploaded to "" + getBucket().getName());
                         }
                     }
                 });
@@ -790,21 +802,23 @@ public void copyFrom(final FileObject file, final FileSelector selector)
 				// Copy across
 				try
 				{
+                    String srcBucketName = ((S3FileObject)srcFile).getBucket().getName();
+                    String srcFileName = ((S3FileObject)srcFile).getS3Key();
+                    String destBucketName = ((S3FileObject)destFile).getBucket().getName();
+                    String destFileName = ((S3FileObject)destFile).getS3Key();
 					if (srcFile.getType() == FileType.FOLDER) {
-						service.copyObject(
-							((S3FileObject)srcFile).bucket.getName(),
-							((S3FileObject)srcFile).getS3Key() + FileName.SEPARATOR,
-							((S3FileObject)destFile).bucket.getName(),
-							((S3FileObject)destFile).getS3Key() + FileName.SEPARATOR
-						);
-					} else {
-						service.copyObject(
-							((S3FileObject)srcFile).bucket.getName(),
-							((S3FileObject)srcFile).getS3Key(),
-							((S3FileObject)destFile).bucket.getName(),
-							((S3FileObject)destFile).getS3Key()
-						);
-					}
+                        srcFileName = srcFileName + FileName.SEPARATOR;
+                        destFileName = destFileName + FileName.SEPARATOR;
+                    }
+                    CopyObjectRequest copy = new CopyObjectRequest(
+                        srcBucketName, srcFileName, destBucketName, destFileName);
+                    if (srcFile.getType() == FileType.FILE
+                        && ((S3FileSystem)destFile.getFileSystem()).getServerSideEncryption()) {
+                        ObjectMetadata meta = ((S3FileObject)srcFile).getObjectMetadata();
+                        meta.setServerSideEncryption(ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
+                        copy.setNewObjectMetadata(meta);
+                    }
+                    getService().copyObject(copy);
 
                     destFile.close();
 				} catch (AmazonServiceException e) {
diff --git a/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystem.java b/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystem.java
index b2653f7a..74dd428a 100644
--- a/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystem.java
+++ b/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystem.java
@@ -33,15 +33,19 @@ public class S3FileSystem extends AbstractFileSystem {
     private final Bucket bucket;
     private final TransferManager transferManager;
 
+    private Boolean serverSideEncryption;
+
     public S3FileSystem(
-            S3FileName fileName, AWSCredentials awsCredentials, AmazonS3 service, FileSystemOptions fileSystemOptions
-    ) throws FileSystemException {
+            S3FileName fileName, AWSCredentials awsCredentials, AmazonS3 service,
+            FileSystemOptions fileSystemOptions) throws FileSystemException {
         super(fileName, null, fileSystemOptions);
 
         String bucketId = fileName.getBucketId();
 
         this.awsCredentials = awsCredentials;
         this.service = service;
+        this.serverSideEncryption = S3FileSystemConfigBuilder.getInstance()
+            .getServerSideEncryption(fileSystemOptions);
 
         try {
             if (service.doesBucketExist(bucketId)) {
@@ -71,8 +75,32 @@ protected void addCapabilities(Collection<Capability> caps) {
         caps.addAll(S3FileProvider.capabilities);
     }
 
+    public Boolean getServerSideEncryption() {
+        return serverSideEncryption;
+    }
+
+    public void setServerSideEncryption(Boolean serverSideEncryption) {
+        this.serverSideEncryption = serverSideEncryption;
+    }
+
+    protected Bucket getBucket() {
+        return bucket;
+    }
+
+    protected AWSCredentials getAwsCredentials() {
+        return awsCredentials;
+    }
+
+    protected AmazonS3 getService() {
+        return service;
+    }
+
+    protected TransferManager getTransferManager() {
+        return transferManager;
+    }
+
     @Override
     protected FileObject createFile(AbstractFileName fileName) throws Exception {
-        return new S3FileObject(fileName, this, awsCredentials, service, transferManager, bucket);
+        return new S3FileObject(fileName, this);
     }
 }
diff --git a/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystemConfigBuilder.java b/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystemConfigBuilder.java
new file mode 100644
index 00000000..15de92fd
--- /dev/null
+++ b/src/main/java/com/intridea/io/vfs/provider/s3/S3FileSystemConfigBuilder.java
@@ -0,0 +1,47 @@
+package com.intridea.io.vfs.provider.s3;
+
+import org.apache.commons.vfs2.FileSystem;
+import org.apache.commons.vfs2.FileSystemConfigBuilder;
+import org.apache.commons.vfs2.FileSystemOptions;
+
+public class S3FileSystemConfigBuilder extends FileSystemConfigBuilder {
+    private static final S3FileSystemConfigBuilder BUILDER = new S3FileSystemConfigBuilder();
+    
+    private static final String SERVER_SIDE_ENCRYPTION = S3FileSystemConfigBuilder.class.getName() + "".SERVER_SIDE_ENCRYPTION"";
+
+    private S3FileSystemConfigBuilder()
+    {
+        super(""s3."");
+    }
+
+    public static S3FileSystemConfigBuilder getInstance()
+    {
+        return BUILDER;
+    }
+
+    @Override
+    protected Class<? extends FileSystem> getConfigClass() {
+        return S3FileSystem.class;
+    }
+
+    /**
+     * use server-side encryption.
+     *
+     * @param opts The FileSystemOptions.
+     * @param serverSideEncryption true if server-side encryption should be used.
+     */
+    public void setServerSideEncryption(FileSystemOptions opts, boolean serverSideEncryption)
+    {
+        setParam(opts, SERVER_SIDE_ENCRYPTION, serverSideEncryption ? Boolean.TRUE : Boolean.FALSE);
+    }
+
+    /**
+     * @param opts The FileSystemOptions.
+     * @return true if server-side encryption is being used.
+     * @see #setServerSideEncryption(org.apache.commons.vfs2.FileSystemOptions, boolean)
+     */
+    public Boolean getServerSideEncryption(FileSystemOptions opts)
+    {
+        return getBoolean(opts, SERVER_SIDE_ENCRYPTION, false);
+    }
+}
diff --git a/src/test/java/com/intridea/io/vfs/provider/s3/S3ProviderTest.java b/src/test/java/com/intridea/io/vfs/provider/s3/S3ProviderTest.java
index d60c3eab..ca911083 100644
--- a/src/test/java/com/intridea/io/vfs/provider/s3/S3ProviderTest.java
+++ b/src/test/java/com/intridea/io/vfs/provider/s3/S3ProviderTest.java
@@ -1,5 +1,6 @@
 package com.intridea.io.vfs.provider.s3;
 
+import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.intridea.io.vfs.TestEnvironment;
 import com.intridea.io.vfs.operations.IMD5HashGetter;
 import com.intridea.io.vfs.operations.IPublicUrlsGetter;
@@ -14,6 +15,7 @@
 import java.io.FileNotFoundException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Random;
@@ -29,8 +31,7 @@ public class S3ProviderTest {
     private static final String BACKUP_ZIP = ""src/test/resources/backup.zip"";
 
     private FileSystemManager fsManager;
-
-    private String fileName, dirName, bucketName, bigFile;
+    private String fileName, encryptedFileName, dirName, bucketName, bigFile;
     private FileObject file, dir;
 
     private FileSystemOptions opts;
@@ -41,6 +42,7 @@ public void setUp() throws FileNotFoundException, IOException {
 
         fsManager = VFS.getManager();
         Random r = new Random();
+        encryptedFileName = ""vfs-encrypted-file"" + r.nextInt(1000);
         fileName = ""vfs-file"" + r.nextInt(1000);
         dirName = ""vfs-dir"" + r.nextInt(1000);
         bucketName = config.getProperty(""s3.testBucket"", ""vfs-s3-tests"");
@@ -54,6 +56,17 @@ public void createFileOk() throws FileSystemException {
         assertTrue(file.exists());
     }
 
+    @Test
+    public void createEncryptedFileOk() throws FileSystemException {
+        file = fsManager.resolveFile(""s3://"" + bucketName + ""/test-place/"" + encryptedFileName, opts);
+        ((S3FileSystem)file.getFileSystem()).setServerSideEncryption(true);
+        file.createFile();
+        assertTrue(file.exists());
+        assertEquals(
+            ((S3FileObject) file).getObjectMetadata().getServerSideEncryption(),
+            ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
+    }
+
     @Test(expectedExceptions={FileSystemException.class})
     public void createFileFailed() throws FileSystemException {
         FileObject tmpFile = fsManager.resolveFile(""s3://../new-mpoint/vfs-bad-file"");
@@ -130,6 +143,31 @@ public void upload() throws FileNotFoundException, IOException {
         dest.copyFrom(src, Selectors.SELECT_SELF);
 
         assertTrue(dest.exists() && dest.getType().equals(FileType.FILE));
+        assertEquals(((S3FileObject)dest).getObjectMetadata().getServerSideEncryption(),
+            null);
+    }
+
+    @Test(dependsOnMethods = {""createEncryptedFileOk""})
+    public void uploadEncrypted() throws FileNotFoundException, IOException {
+        FileObject dest = fsManager.resolveFile(""s3://"" + bucketName + ""/test-place/backup.zip"");
+        ((S3FileSystem)dest.getFileSystem()).setServerSideEncryption(true);
+
+        // Delete file if exists
+        if (dest.exists()) {
+            dest.delete();
+        }
+
+        // Copy data
+        final File backupFile = new File(BACKUP_ZIP);
+
+        assertTrue(backupFile.exists(), ""Backup file should exists"");
+
+        FileObject src = fsManager.resolveFile(backupFile.getAbsolutePath());
+        dest.copyFrom(src, Selectors.SELECT_SELF);
+
+        assertTrue(dest.exists() && dest.getType().equals(FileType.FILE));
+        assertEquals(((S3FileObject)dest).getObjectMetadata().getServerSideEncryption(),
+            ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
     }
 
     @Test(dependsOnMethods={""createFileOk""})
@@ -318,7 +356,9 @@ public void getUrls() throws FileSystemException {
 
         final String signedUrl = urlsGetter.getSignedUrl(60);
 
-        assertTrue(signedUrl.startsWith(""https://"" + bucketName + "".s3.amazonaws.com/test-place%2Fbackup.zip?""));
+        assertTrue(
+            signedUrl.startsWith(""https://s3.amazonaws.com/"" + bucketName + ""/test-place%2Fbackup.zip?""),
+            signedUrl);
         assertTrue(signedUrl.indexOf(""Signature="") != (-1));
         assertTrue(signedUrl.indexOf(""Expires="") != (-1));
         assertTrue(signedUrl.indexOf(""AWSAccessKeyId="") != (-1));
@@ -347,16 +387,40 @@ public void getMD5Hash() throws NoSuchAlgorithmException, FileNotFoundException,
 
     @Test(dependsOnMethods={""findFiles""})
 	public void copyInsideBucket() throws FileSystemException {
-		FileObject testsDir = fsManager.resolveFile(dir, ""find-tests"");
-		FileObject testsDirCopy = testsDir.getParent().resolveFile(""find-tests-copy"");
-		testsDirCopy.copyFrom(testsDir, Selectors.SELECT_SELF_AND_CHILDREN);
-
-		// Should have same number of files
-		FileObject[] files = testsDir.findFiles(Selectors.SELECT_ALL);
-		FileObject[] filesCopy = testsDir.findFiles(Selectors.SELECT_ALL);
-		assertEquals(files.length, filesCopy.length);
+        FileObject testsDir = fsManager.resolveFile(dir, ""find-tests"");
+        FileObject testsDirCopy = testsDir.getParent().resolveFile(""find-tests-copy"");
+        testsDirCopy.copyFrom(testsDir, Selectors.SELECT_SELF_AND_CHILDREN);
+
+        // Should have same number of files
+        FileObject[] files = testsDir.findFiles(Selectors.SELECT_SELF_AND_CHILDREN);
+        FileObject[] filesCopy = testsDirCopy.findFiles(Selectors.SELECT_SELF_AND_CHILDREN);
+        assertEquals(files.length, filesCopy.length,
+            Arrays.deepToString(files) + "" vs. "" + Arrays.deepToString(filesCopy));
 	}
 
+    @Test(dependsOnMethods={""findFiles""})
+    public void copyAllToEncryptedInsideBucket() throws FileSystemException {
+        FileObject testsDir = fsManager.resolveFile(dir, ""find-tests"");
+        FileObject testsDirCopy = testsDir.getParent().resolveFile(""find-tests-encrypted-copy"");
+        ((S3FileSystem)testsDirCopy.getFileSystem()).setServerSideEncryption(true);
+
+        testsDirCopy.copyFrom(testsDir, Selectors.SELECT_ALL);
+
+        // Should have same number of files
+        FileObject[] files = testsDir.findFiles(Selectors.SELECT_ALL);
+        FileObject[] filesCopy = testsDirCopy.findFiles(Selectors.SELECT_ALL);
+        assertEquals(files.length, filesCopy.length);
+
+        for (int i = 0; i < files.length; i++) {
+            if (files[i].getType() == FileType.FILE) {
+                assertEquals(((S3FileObject)files[i]).getObjectMetadata().getServerSideEncryption(),
+                    null);
+                assertEquals(((S3FileObject)filesCopy[i]).getObjectMetadata().getServerSideEncryption(),
+                    ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
+            }
+        }
+    }
+
     @Test(dependsOnMethods={""findFiles"", ""download""})
     public void delete() throws FileSystemException {
         FileObject testsDir = fsManager.resolveFile(dir, ""find-tests"");"
4ae79b6666c22898decaee37c3e33e209ff23b30,d3scomp$jdeeco,Remove old MATSimSimulation and move the functionality into the plugin,p,https://github.com/d3scomp/jdeeco,"diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
deleted file mode 100644
index 7da955166..000000000
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.matsim.api.core.v01.TransportMode;
-import org.matsim.core.controler.Controler;
-import org.matsim.core.controler.events.StartupEvent;
-import org.matsim.core.controler.listener.StartupListener;
-import org.matsim.core.mobsim.framework.Mobsim;
-import org.matsim.core.router.util.TravelTime;
-import org.matsim.withinday.trafficmonitoring.TravelTimeCollector;
-import org.matsim.withinday.trafficmonitoring.TravelTimeCollectorFactory;
-
-import cz.cuni.mff.d3s.deeco.logging.Log;
-import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.Simulation;
-
-public class MATSimSimulation extends Simulation implements MATSimSimulationStepListener {
-
-	private static final String SIMULATION_CALLBACK = ""SIMULATION_CALLBACK"";
-
-	private long currentMilliseconds;
-	private final long simulationStep; // in milliseconds
-	private final TravelTime travelTime;
-	private final TreeSet<Callback> callbacks;
-	private final Map<String, Callback> hostIdToCallback;
-	private final Controler controler;
-	private final JDEECoWithinDayMobsimListener listener;
-	private final MATSimDataProvider matSimProvider;
-	private final MATSimDataReceiver matSimReceiver;
-	private final Map<String, cz.cuni.mff.d3s.jdeeco.matsim.MATSimSimulation.Host> hosts;
-	private final MATSimExtractor extractor;
-
-	public MATSimSimulation(MATSimDataReceiver matSimReceiver, MATSimDataProvider matSimProvider,
-			MATSimUpdater updater, MATSimExtractor extractor,
-			final Collection<? extends AdditionAwareAgentSource> agentSources, String matSimConf) {
-		this.callbacks = new TreeSet<>();
-		this.hostIdToCallback = new HashMap<>();
-		this.hosts = new HashMap<>();
-
-		this.controler = new MATSimPreloadingControler(matSimConf);
-		this.controler.setOverwriteFiles(true);
-		this.controler.getConfig().getQSimConfigGroup().setSimStarttimeInterpretation(""onlyUseStarttime"");
-
-		double end = this.controler.getConfig().getQSimConfigGroup().getEndTime();
-		double start = this.controler.getConfig().getQSimConfigGroup().getStartTime();
-		double step = this.controler.getConfig().getQSimConfigGroup().getTimeStepSize();
-		Log.i(""Starting simulation: matsimStartTime: "" + start + "" matsimEndTime: "" + end);
-		this.extractor = extractor;
-		this.listener = new JDEECoWithinDayMobsimListener(this, updater, extractor);
-		this.matSimProvider = matSimProvider;
-		this.matSimReceiver = matSimReceiver;
-
-		Set<String> analyzedModes = new HashSet<String>();
-		analyzedModes.add(TransportMode.car);
-		travelTime = new TravelTimeCollectorFactory().createTravelTimeCollector(controler.getScenario(), analyzedModes);
-
-		controler.addControlerListener(new StartupListener() {
-			public void notifyStartup(StartupEvent event) {
-				controler.getEvents().addHandler((TravelTimeCollector) travelTime);
-				controler.getMobsimListeners().add((TravelTimeCollector) travelTime);
-				controler.setMobsimFactory(new JDEECoMobsimFactory(listener, agentSources));
-			}
-		});
-		/**
-		 * Bind MATSim listener with the agent source. It is necessary to let the listener know about the jDEECo agents
-		 * that it needs to update with data coming from a jDEECo runtime.
-		 */
-		for (AdditionAwareAgentSource source : agentSources) {
-			if (source instanceof JDEECoAgentSource) {
-				listener.registerAgentProvider((JDEECoAgentSource) source);
-			}
-		}
-
-		this.simulationStep = secondsToMilliseconds(step);
-		currentMilliseconds = secondsToMilliseconds(controler.getConfig().getQSimConfigGroup().getStartTime());
-	}
-
-	public void addHost(String id, cz.cuni.mff.d3s.jdeeco.matsim.MATSimSimulation.Host host) {
-		hosts.put(id, host);
-	}
-
-	public cz.cuni.mff.d3s.jdeeco.matsim.MATSimSimulation.Host getHost(String id) {
-		return hosts.get(id);
-	}
-
-	public Controler getControler() {
-		return this.controler;
-	}
-
-	public TravelTime getTravelTime() {
-		return this.travelTime;
-	}
-
-	@Override
-	public long getCurrentMilliseconds() {
-		return currentMilliseconds;
-	}
-
-	@Override
-	public synchronized void callAt(long absoluteTime, String hostId) {
-		Callback callback = hostIdToCallback.remove(hostId);
-		if (callback != null) {
-			callbacks.remove(callback);
-		}
-		callback = new Callback(hostId, absoluteTime);
-		hostIdToCallback.put(hostId, callback);
-		// System.out.println(""For "" + absoluteTime);
-		callbacks.add(callback);
-	}
-
-	@Override
-	public void at(double seconds, Mobsim mobsim) {
-		// Exchange data with MATSim
-		long milliseconds = secondsToMilliseconds(seconds);
-		matSimReceiver.setMATSimData(extractor.extractFromMATSim(listener.getAllJDEECoAgents(), mobsim));
-		listener.updateJDEECoAgents(matSimProvider.getMATSimData());
-		// Add callback for the MATSim step
-		callAt(milliseconds + simulationStep, SIMULATION_CALLBACK);
-		cz.cuni.mff.d3s.jdeeco.matsim.MATSimSimulation.Host host;
-		Callback callback;
-		// Iterate through all the callbacks until the MATSim callback.
-		while (!callbacks.isEmpty()) {
-			callback = callbacks.pollFirst();
-			if (callback.getHostId().equals(SIMULATION_CALLBACK)) {
-				break;
-			}
-			currentMilliseconds = callback.getAbsoluteTime();
-			// System.out.println(""At: "" + currentMilliseconds);
-			host = (cz.cuni.mff.d3s.jdeeco.matsim.MATSimSimulation.Host) hosts.get(callback.hostId);
-			host.at(millisecondsToSeconds(currentMilliseconds));
-		}
-	}
-
-	public synchronized void run() {
-		controler.run();
-	}
-
-	private class Callback implements Comparable<Callback> {
-
-		private final long milliseconds;
-		private final String hostId;
-
-		public Callback(String hostId, long milliseconds) {
-			this.hostId = hostId;
-			this.milliseconds = milliseconds;
-		}
-
-		public long getAbsoluteTime() {
-			return milliseconds;
-		}
-
-		public String getHostId() {
-			return hostId;
-		}
-
-		@Override
-		public int compareTo(Callback c) {
-			if (c.getAbsoluteTime() < milliseconds) {
-				return 1;
-			} else if (c.getAbsoluteTime() > milliseconds) {
-				return -1;
-			} else if (this == c) {
-				return 0;
-			} else {
-				return this.hashCode() < c.hashCode() ? 1 : -1;
-			}
-		}
-
-		public String toString() {
-			return hostId + "" "" + milliseconds;
-		}
-
-		@Override
-		public int hashCode() {
-			final int prime = 31;
-			int result = 1;
-			result = prime * result + getOuterType().hashCode();
-			result = prime * result + ((hostId == null) ? 0 : hostId.hashCode());
-			result = prime * result + (int) (milliseconds ^ (milliseconds >>> 32));
-			return result;
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			if (obj == null)
-				return false;
-			if (getClass() != obj.getClass())
-				return false;
-			Callback other = (Callback) obj;
-			if (!getOuterType().equals(other.getOuterType()))
-				return false;
-			if (hostId == null) {
-				if (other.hostId != null)
-					return false;
-			} else if (!hostId.equals(other.hostId))
-				return false;
-			if (milliseconds != other.milliseconds)
-				return false;
-			return true;
-		}
-
-		private MATSimSimulation getOuterType() {
-			return MATSimSimulation.this;
-		}
-	}
-}
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/package-info.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/package-info.java
deleted file mode 100644
index 7b4598c6b..000000000
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Ported sources from jDEECo 2
- */
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
\ No newline at end of file
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/MATSimSimulation.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/MATSimSimulation.java
index 270690016..7476b88cd 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/MATSimSimulation.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/MATSimSimulation.java
@@ -3,54 +3,122 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.TransportMode;
 import org.matsim.core.basic.v01.IdImpl;
 import org.matsim.core.controler.Controler;
+import org.matsim.core.controler.events.StartupEvent;
+import org.matsim.core.controler.listener.StartupListener;
+import org.matsim.core.mobsim.framework.Mobsim;
+import org.matsim.core.router.util.TravelTime;
+import org.matsim.withinday.trafficmonitoring.TravelTimeCollector;
+import org.matsim.withinday.trafficmonitoring.TravelTimeCollectorFactory;
 
+import cz.cuni.mff.d3s.deeco.logging.Log;
 import cz.cuni.mff.d3s.deeco.network.AbstractHost;
 import cz.cuni.mff.d3s.deeco.runtime.DEECoContainer;
 import cz.cuni.mff.d3s.deeco.runtime.DEECoPlugin;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.AdditionAwareAgentSource;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.DefaultMATSimExtractor;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.DefaultMATSimUpdater;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.JDEECoAgent;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.JDEECoAgentSource;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimRouter;
 import cz.cuni.mff.d3s.deeco.timer.CurrentTimeProvider;
 import cz.cuni.mff.d3s.deeco.timer.SimulationTimer;
 import cz.cuni.mff.d3s.deeco.timer.TimerEventListener;
 import cz.cuni.mff.d3s.jdeeco.matsim.old.roadtrains.MATSimDataProviderReceiver;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.AdditionAwareAgentSource;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.DefaultMATSimExtractor;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.DefaultMATSimUpdater;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.JDEECoAgent;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.JDEECoAgentSource;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.JDEECoMobsimFactory;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.JDEECoWithinDayMobsimListener;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimDataProvider;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimDataReceiver;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimExtractor;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimPreloadingControler;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimRouter;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimSimulationStepListener;
 
 /**
  * Plug-in providing MATSim simulation
  * 
+ * Based on the code from the jDEECo 2 simulation project
+ * 
  * @author Vladimir Matena <matena@d3s.mff.cuni.cz>
  *
  */
 public class MATSimSimulation implements DEECoPlugin {
-	class TimerProvider implements SimulationTimer {
+	private final TreeSet<Callback> callbacks;
+
+	class TimerProvider implements SimulationTimer, CurrentTimeProvider /*
+																		 * TODO: Current time provider or simulation
+																		 * timer
+																		 */, MATSimSimulationStepListener {
 		@Override
 		public void notifyAt(long time, TimerEventListener listener, DEECoContainer node) {
 			// System.out.println(""NOTIFY AT CALLED FOR: "" + time + "" NODE:"" + node.getId());
-			MATSimSimulation.this.oldSimulation.callAt(time, String.valueOf(node.getId()));
-			oldSimulation.getHost(String.valueOf(node.getId())).listener = listener;
+			// MATSimSimulation.this.oldSimulation.callAt(time, String.valueOf(node.getId()));
+			final String hostId = String.valueOf(node.getId());
+
+			callAt(time, hostId);
+
+			MATSimSimulation.this.getHost(String.valueOf(node.getId())).listener = listener;
+		}
+
+		public synchronized void callAt(long absoluteTime, String hostId) {
+			Callback callback = hostIdToCallback.remove(hostId);
+			if (callback != null) {
+				callbacks.remove(callback);
+			}
+			callback = new Callback(hostId, absoluteTime);
+			hostIdToCallback.put(hostId, callback);
+			// System.out.println(""For "" + absoluteTime);
+			callbacks.add(callback);
 		}
 
 		@Override
 		public long getCurrentMilliseconds() {
-			return MATSimSimulation.this.oldSimulation.getCurrentMilliseconds();
+			return MATSimSimulation.this.currentMilliseconds;
 		}
 
 		@Override
 		public void start(long duration) {
-			double startTime = MATSimSimulation.this.oldSimulation.getControler().getConfig().getQSimConfigGroup()
-					.getStartTime();
+			double startTime = MATSimSimulation.this.getController().getConfig().getQSimConfigGroup().getStartTime();
 			double endTime = startTime + (((double) (duration)) / 1000);
-			MATSimSimulation.this.oldSimulation.getControler().getConfig().getQSimConfigGroup().setEndTime(endTime);
-			MATSimSimulation.this.oldSimulation.run();
+			MATSimSimulation.this.getController().getConfig().getQSimConfigGroup().setEndTime(endTime);
+			MATSimSimulation.this.getController().run();
+		}
+
+		@Override
+		public void at(double seconds, Mobsim mobsim) {
+			// Exchange data with MATSim
+			long milliseconds = secondsToMilliseconds(seconds);
+			matSimReceiver.setMATSimData(extractor.extractFromMATSim(listener.getAllJDEECoAgents(), mobsim));
+			listener.updateJDEECoAgents(matSimProvider.getMATSimData());
+			// Add callback for the MATSim step
+			callAt(milliseconds + simulationStep, SIMULATION_CALLBACK);
+			Host host;
+			Callback callback;
+			// Iterate through all the callbacks until the MATSim callback.
+			while (!callbacks.isEmpty()) {
+				callback = callbacks.pollFirst();
+				if (callback.getHostId().equals(SIMULATION_CALLBACK)) {
+					break;
+				}
+				currentMilliseconds = callback.getAbsoluteTime();
+				// System.out.println(""At: "" + currentMilliseconds);
+				host = hosts.get(callback.hostId);
+				host.at(millisecondsToSeconds(currentMilliseconds));
+			}
+		}
+
+		private double millisecondsToSeconds(long milliseconds) {
+			return ((double) (milliseconds)) / 1000;
 		}
 	}
 
@@ -69,23 +137,165 @@ public void at(double absoluteTime) {
 
 	}
 
+	private class Callback implements Comparable<Callback> {
+
+		private final long milliseconds;
+		private final String hostId;
+
+		public Callback(String hostId, long milliseconds) {
+			this.hostId = hostId;
+			this.milliseconds = milliseconds;
+		}
+
+		public long getAbsoluteTime() {
+			return milliseconds;
+		}
+
+		public String getHostId() {
+			return hostId;
+		}
+
+		@Override
+		public int compareTo(Callback c) {
+			if (c.getAbsoluteTime() < milliseconds) {
+				return 1;
+			} else if (c.getAbsoluteTime() > milliseconds) {
+				return -1;
+			} else if (this == c) {
+				return 0;
+			} else {
+				return this.hashCode() < c.hashCode() ? 1 : -1;
+			}
+		}
+
+		public String toString() {
+			return hostId + "" "" + milliseconds;
+		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + getOuterType().hashCode();
+			result = prime * result + ((hostId == null) ? 0 : hostId.hashCode());
+			result = prime * result + (int) (milliseconds ^ (milliseconds >>> 32));
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			Callback other = (Callback) obj;
+			if (!getOuterType().equals(other.getOuterType()))
+				return false;
+			if (hostId == null) {
+				if (other.hostId != null)
+					return false;
+			} else if (!hostId.equals(other.hostId))
+				return false;
+			if (milliseconds != other.milliseconds)
+				return false;
+			return true;
+		}
+
+		private MATSimSimulation getOuterType() {
+			return MATSimSimulation.this;
+		}
+	}
+
 	private final TimerProvider timer = new TimerProvider();
-	private final cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimSimulation oldSimulation;
 	private final JDEECoAgentSource agentSource = new JDEECoAgentSource();
 	private final MATSimRouter router;
 	private final MATSimDataProviderReceiver matSimProviderReceiver = new MATSimDataProviderReceiver(
 			new LinkedList<String>());
 
+	// private final cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimSimulation oldSimulation;
+
+	private static final String SIMULATION_CALLBACK = ""SIMULATION_CALLBACK"";
+	private long currentMilliseconds;
+	private final long simulationStep; // in milliseconds
+	private final TravelTime travelTime;
+	private final Map<String, Callback> hostIdToCallback;
+	private final Controler controler;
+	private final JDEECoWithinDayMobsimListener listener;
+	private final MATSimDataProvider matSimProvider;
+	private final MATSimDataReceiver matSimReceiver;
+	private final Map<String, Host> hosts;
+	private final MATSimExtractor extractor;
+
+	// private final Exchanger<Object> exchanger;
+
 	public MATSimSimulation(File config, AdditionAwareAgentSource... additionalAgentSources) throws IOException {
 		List<AdditionAwareAgentSource> agentSources = new LinkedList<>();
 		agentSources.add(agentSource);
 		agentSources.addAll(Arrays.asList(additionalAgentSources));
 
-		oldSimulation = new cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimSimulation(matSimProviderReceiver,
-				matSimProviderReceiver, new DefaultMATSimUpdater(), new DefaultMATSimExtractor(), agentSources,
-				config.getAbsolutePath());
+		/*
+		 * oldSimulation = new cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimSimulation(matSimProviderReceiver,
+		 * matSimProviderReceiver, new DefaultMATSimUpdater(), new DefaultMATSimExtractor(), agentSources,
+		 * config.getAbsolutePath());
+		 */
+		// this.exchanger = new Exchanger<Object>();
+
+		this.callbacks = new TreeSet<>();
+		this.hostIdToCallback = new HashMap<>();
+		this.hosts = new HashMap<>();
+
+		this.controler = new MATSimPreloadingControler(config.getAbsolutePath());
+		this.controler.setOverwriteFiles(true);
+		this.controler.getConfig().getQSimConfigGroup().setSimStarttimeInterpretation(""onlyUseStarttime"");
 
-		router = new MATSimRouter(oldSimulation.getControler(), oldSimulation.getTravelTime(), 10 /* TODO: FAKE VALUE */);
+		double end = this.controler.getConfig().getQSimConfigGroup().getEndTime();
+		double start = this.controler.getConfig().getQSimConfigGroup().getStartTime();
+		double step = this.controler.getConfig().getQSimConfigGroup().getTimeStepSize();
+		Log.i(""Starting simulation: matsimStartTime: "" + start + "" matsimEndTime: "" + end);
+		this.extractor = new DefaultMATSimExtractor();
+		this.listener = new JDEECoWithinDayMobsimListener(timer, new DefaultMATSimUpdater(), extractor);
+		this.matSimProvider = (MATSimDataProvider) matSimProviderReceiver;
+		this.matSimReceiver = (MATSimDataReceiver) matSimProviderReceiver;
+
+		Set<String> analyzedModes = new HashSet<String>();
+		analyzedModes.add(TransportMode.car);
+		travelTime = new TravelTimeCollectorFactory().createTravelTimeCollector(controler.getScenario(), analyzedModes);
+
+		controler.addControlerListener(new StartupListener() {
+			public void notifyStartup(StartupEvent event) {
+				controler.getEvents().addHandler((TravelTimeCollector) travelTime);
+				controler.getMobsimListeners().add((TravelTimeCollector) travelTime);
+				controler.setMobsimFactory(new JDEECoMobsimFactory(listener, agentSources));
+			}
+		});
+		/**
+		 * Bind MATSim listener with the agent source. It is necessary to let the listener know about the jDEECo agents
+		 * that it needs to update with data coming from a jDEECo runtime.
+		 */
+		for (AdditionAwareAgentSource source : agentSources) {
+			if (source instanceof JDEECoAgentSource) {
+				listener.registerAgentProvider((JDEECoAgentSource) source);
+			}
+		}
+
+		this.simulationStep = secondsToMilliseconds(step);
+		currentMilliseconds = secondsToMilliseconds(controler.getConfig().getQSimConfigGroup().getStartTime());
+
+		router = new MATSimRouter(getController(), travelTime, 10 /* TODO: FAKE VALUE */);
+	}
+
+	private long secondsToMilliseconds(double seconds) {
+		return (long) (seconds * 1000);
+	}
+
+	public void addHost(String id, cz.cuni.mff.d3s.jdeeco.matsim.MATSimSimulation.Host host) {
+		hosts.put(id, host);
+	}
+
+	public Host getHost(String id) {
+		return hosts.get(id);
 	}
 
 	public SimulationTimer getTimer() {
@@ -95,9 +305,9 @@ public SimulationTimer getTimer() {
 	public MATSimRouter getRouter() {
 		return router;
 	}
-	
+
 	public Controler getController() {
-		return oldSimulation.getControler();
+		return controler;
 	}
 
 	public MATSimDataProviderReceiver getMATSimProviderReceiver() {
@@ -116,8 +326,8 @@ public List<Class<? extends DEECoPlugin>> getDependencies() {
 
 	@Override
 	public void init(DEECoContainer container) {
-		Host host = new Host(String.valueOf(container.getId()), oldSimulation);
+		Host host = new Host(String.valueOf(container.getId()), getTimer());
 
-		oldSimulation.addHost(String.valueOf(container.getId()), host);
+		addHost(String.valueOf(container.getId()), host);
 	}
 }
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/roadtrains/MATSimDataProviderReceiver.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/roadtrains/MATSimDataProviderReceiver.java
index 205cbe3b7..c7047fde2 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/roadtrains/MATSimDataProviderReceiver.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/roadtrains/MATSimDataProviderReceiver.java
@@ -8,10 +8,11 @@
 import org.matsim.api.core.v01.Id;
 import org.matsim.core.basic.v01.IdImpl;
 
-import cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimDataProvider;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimDataReceiver;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimInput;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimOutput;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimDataProvider;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimDataReceiver;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimInput;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimOutput;
+
 
 public class MATSimDataProviderReceiver implements MATSimDataReceiver,
 		MATSimDataProvider {
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/AdditionAwareAgentSource.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/AdditionAwareAgentSource.java
similarity index 90%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/AdditionAwareAgentSource.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/AdditionAwareAgentSource.java
index 9dcd57c46..f5e1086a5 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/AdditionAwareAgentSource.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/AdditionAwareAgentSource.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import org.matsim.core.mobsim.framework.AgentSource;
 import org.matsim.core.mobsim.qsim.QSim;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/DefaultMATSimExtractor.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/DefaultMATSimExtractor.java
similarity index 91%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/DefaultMATSimExtractor.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/DefaultMATSimExtractor.java
index 6f38f5bff..c12919b95 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/DefaultMATSimExtractor.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/DefaultMATSimExtractor.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/DefaultMATSimUpdater.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/DefaultMATSimUpdater.java
similarity index 91%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/DefaultMATSimUpdater.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/DefaultMATSimUpdater.java
index a82f18c09..bbfb9844b 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/DefaultMATSimUpdater.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/DefaultMATSimUpdater.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgent.java
similarity index 99%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgent.java
index 6daade023..c5875fb3f 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgent.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentProvider.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgentProvider.java
similarity index 84%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentProvider.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgentProvider.java
index bc64756ac..ca3f768da 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentProvider.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgentProvider.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentSource.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgentSource.java
similarity index 96%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentSource.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgentSource.java
index 5b18954af..f21290b8c 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentSource.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoAgentSource.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoMobsimFactory.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoMobsimFactory.java
similarity index 97%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoMobsimFactory.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoMobsimFactory.java
index a1c03bd98..2ca34fbb9 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoMobsimFactory.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoMobsimFactory.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoWithinDayMobsimListener.java
similarity index 98%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoWithinDayMobsimListener.java
index c5cf1e25b..0f3f0cffb 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/JDEECoWithinDayMobsimListener.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimDataProvider.java
similarity index 83%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimDataProvider.java
index 2f0479567..cdf574239 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimDataProvider.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Map;
 
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimDataReceiver.java
similarity index 80%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimDataReceiver.java
index c8485854e..0536552fc 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimDataReceiver.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 
 /**
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimExtractor.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimExtractor.java
similarity index 78%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimExtractor.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimExtractor.java
index ab6a9828d..8aa7b655d 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimExtractor.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimExtractor.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimInput.java
similarity index 91%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimInput.java
index e8c21f89f..d3f3f1b8e 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimInput.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetCoordinatesTranslator.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimOMNetCoordinatesTranslator.java
similarity index 96%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetCoordinatesTranslator.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimOMNetCoordinatesTranslator.java
index cc7664c2b..a3059ae5c 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetCoordinatesTranslator.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimOMNetCoordinatesTranslator.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.network.Network;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimOutput.java
similarity index 88%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimOutput.java
index bbdc67ae5..db4169079 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimOutput.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.List;
 
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPopulationAgentSource.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimPopulationAgentSource.java
similarity index 98%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPopulationAgentSource.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimPopulationAgentSource.java
index 2f0bca14d..a79186398 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPopulationAgentSource.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimPopulationAgentSource.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimPreloadingControler.java
similarity index 93%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimPreloadingControler.java
index c01dcfcd5..00be66f28 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimPreloadingControler.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import org.matsim.core.controler.Controler;
 import org.matsim.core.scenario.ScenarioImpl;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimRouter.java
similarity index 99%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimRouter.java
index 2cee0d5e3..d49692255 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimRouter.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulationStepListener.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimSimulationStepListener.java
similarity index 73%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulationStepListener.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimSimulationStepListener.java
index c00c4412b..076df9048 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulationStepListener.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimSimulationStepListener.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import org.matsim.core.mobsim.framework.Mobsim;
 
diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimUpdater.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimUpdater.java
similarity index 72%
rename from jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimUpdater.java
rename to jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimUpdater.java
index 5c63f650e..7ace9385c 100644
--- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimUpdater.java
+++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/old/simulation/MATSimUpdater.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.deeco.simulation.matsim;
+package cz.cuni.mff.d3s.jdeeco.matsim.old.simulation;
 
 import java.util.Collection;
 
diff --git a/jdeeco-matsim-plugin/test/cz/cuni/mff/d3s/jdeeco/matsim/demo/convoy/Vehicle.java b/jdeeco-matsim-plugin/test/cz/cuni/mff/d3s/jdeeco/matsim/demo/convoy/Vehicle.java
index 7d6bada36..400c20e51 100644
--- a/jdeeco-matsim-plugin/test/cz/cuni/mff/d3s/jdeeco/matsim/demo/convoy/Vehicle.java
+++ b/jdeeco-matsim-plugin/test/cz/cuni/mff/d3s/jdeeco/matsim/demo/convoy/Vehicle.java
@@ -13,7 +13,6 @@
 import cz.cuni.mff.d3s.deeco.annotations.PeriodicScheduling;
 import cz.cuni.mff.d3s.deeco.annotations.Process;
 import cz.cuni.mff.d3s.deeco.logging.Log;
-import cz.cuni.mff.d3s.deeco.simulation.matsim.MATSimRouter;
 import cz.cuni.mff.d3s.deeco.task.ParamHolder;
 import cz.cuni.mff.d3s.deeco.timer.CurrentTimeProvider;
 import cz.cuni.mff.d3s.jdeeco.matsim.MATSimVehicle;
@@ -21,6 +20,7 @@
 import cz.cuni.mff.d3s.jdeeco.matsim.old.roadtrains.ActuatorType;
 import cz.cuni.mff.d3s.jdeeco.matsim.old.roadtrains.Sensor;
 import cz.cuni.mff.d3s.jdeeco.matsim.old.roadtrains.SensorType;
+import cz.cuni.mff.d3s.jdeeco.matsim.old.simulation.MATSimRouter;
 
 @Component
 public class Vehicle {"
6d7a01a1ea85e77f7f323604ea7ba104dc0944f3,ning$compress,"Overload of factory methods and constructors in Encoders and Streams, to allow specifying a concrete BufferRecycler instance, as an alternative to the default ThreadLocal soft-references policy.
The change does not break compatibility with existing API, but adds flexibility for resource-eficiency if used from pools (different threads could reuse the same BufferRecycler instances, avoiding the creation of instances on a per Thread basis) and some minor performance gain in preexistent LZFOutputStream constructors (because ThreadLocal is only accessed once).",p,https://github.com/ning/compress,"diff --git a/src/main/java/com/ning/compress/gzip/GZIPUncompressor.java b/src/main/java/com/ning/compress/gzip/GZIPUncompressor.java
index 7f357a4..0338522 100644
--- a/src/main/java/com/ning/compress/gzip/GZIPUncompressor.java
+++ b/src/main/java/com/ning/compress/gzip/GZIPUncompressor.java
@@ -171,17 +171,22 @@ public class GZIPUncompressor extends Uncompressor
     
     public GZIPUncompressor(DataHandler h)
     {
-        this(h, DEFAULT_CHUNK_SIZE);
+        this(h, DEFAULT_CHUNK_SIZE, BufferRecycler.instance(), GZIPRecycler.instance());
     }
     
     public GZIPUncompressor(DataHandler h, int inputChunkLength)
+    {
+        this(h, inputChunkLength, BufferRecycler.instance(), GZIPRecycler.instance());
+    }
+
+    public GZIPUncompressor(DataHandler h, int inputChunkLength, BufferRecycler bufferRecycler, GZIPRecycler gzipRecycler)
     {
         _inputChunkLength = inputChunkLength;
         _handler = h;
-        _recycler = BufferRecycler.instance();
-        _decodeBuffer = _recycler.allocDecodeBuffer(DECODE_BUFFER_SIZE);
-        _gzipRecycler = GZIPRecycler.instance();
-        _inflater = _gzipRecycler.allocInflater();
+        _recycler = bufferRecycler;
+        _decodeBuffer = bufferRecycler.allocDecodeBuffer(DECODE_BUFFER_SIZE);
+        _gzipRecycler = gzipRecycler;
+        _inflater = gzipRecycler.allocInflater();
         _crc = new CRC32();
     }
 
diff --git a/src/main/java/com/ning/compress/gzip/OptimizedGZIPInputStream.java b/src/main/java/com/ning/compress/gzip/OptimizedGZIPInputStream.java
index 80024dd..bec84e3 100644
--- a/src/main/java/com/ning/compress/gzip/OptimizedGZIPInputStream.java
+++ b/src/main/java/com/ning/compress/gzip/OptimizedGZIPInputStream.java
@@ -77,15 +77,20 @@ enum State {
      */
     
     public OptimizedGZIPInputStream(InputStream in) throws IOException
+    {
+        this(in, BufferRecycler.instance(), GZIPRecycler.instance());
+    }
+
+    public OptimizedGZIPInputStream(InputStream in, BufferRecycler bufferRecycler, GZIPRecycler gzipRecycler) throws IOException
     {
         super();
-        _bufferRecycler = BufferRecycler.instance();
-        _gzipRecycler = GZIPRecycler.instance();
+        _bufferRecycler = bufferRecycler;
+        _gzipRecycler = gzipRecycler;
         _rawInput = in;
-        _buffer = _bufferRecycler.allocInputBuffer(INPUT_BUFFER_SIZE);
+        _buffer = bufferRecycler.allocInputBuffer(INPUT_BUFFER_SIZE);
 
         _bufferPtr = _bufferEnd = 0;
-        _inflater = _gzipRecycler.allocInflater();
+        _inflater = gzipRecycler.allocInflater();
         _crc = new CRC32();
 
         // And then need to process header...
diff --git a/src/main/java/com/ning/compress/lzf/ChunkEncoder.java b/src/main/java/com/ning/compress/lzf/ChunkEncoder.java
index 799864d..6c5df0a 100644
--- a/src/main/java/com/ning/compress/lzf/ChunkEncoder.java
+++ b/src/main/java/com/ning/compress/lzf/ChunkEncoder.java
@@ -75,34 +75,56 @@ public abstract class ChunkEncoder
     protected byte[] _headerBuffer;
 
     /**
+	 * Uses a ThreadLocal soft-referenced BufferRecycler instance.
+	 * 
      * @param totalLength Total encoded length; used for calculating size
      *   of hash table to use
      */
     protected ChunkEncoder(int totalLength)
+    {
+        this(totalLength, BufferRecycler.instance());
+    }
+
+    /**
+     * @param totalLength Total encoded length; used for calculating size
+     *   of hash table to use
+	 * @param bufferRecycler Buffer recycler instance, for usages where the
+	 *   caller manages the recycler instances
+     */
+    protected ChunkEncoder(int totalLength, BufferRecycler bufferRecycler)
     {
         // Need room for at most a single full chunk
         int largestChunkLen = Math.min(totalLength, LZFChunk.MAX_CHUNK_LEN);       
         int suggestedHashLen = calcHashLen(largestChunkLen);
-        _recycler = BufferRecycler.instance();
-        _hashTable = _recycler.allocEncodingHash(suggestedHashLen);
+        _recycler = bufferRecycler;
+        _hashTable = bufferRecycler.allocEncodingHash(suggestedHashLen);
         _hashModulo = _hashTable.length - 1;
         // Ok, then, what's the worst case output buffer length?
         // length indicator for each 32 literals, so:
         // 21-Feb-2013, tatu: Plus we want to prepend chunk header in place:
         int bufferLen = largestChunkLen + ((largestChunkLen + 31) >> 5) + LZFChunk.MAX_HEADER_LEN;
-        _encodeBuffer = _recycler.allocEncodingBuffer(bufferLen);
+        _encodeBuffer = bufferRecycler.allocEncodingBuffer(bufferLen);
     }
-
+	
     /**
      * Alternate constructor used when we want to avoid allocation encoding
      * buffer, in cases where caller wants full control over allocations.
      */
     protected ChunkEncoder(int totalLength, boolean bogus)
+    {
+        this(totalLength, BufferRecycler.instance(), bogus);
+    }
+
+    /**
+     * Alternate constructor used when we want to avoid allocation encoding
+     * buffer, in cases where caller wants full control over allocations.
+     */
+    protected ChunkEncoder(int totalLength, BufferRecycler bufferRecycler, boolean bogus)
     {
         int largestChunkLen = Math.max(totalLength, LZFChunk.MAX_CHUNK_LEN);
         int suggestedHashLen = calcHashLen(largestChunkLen);
-        _recycler = BufferRecycler.instance();
-        _hashTable = _recycler.allocEncodingHash(suggestedHashLen);
+        _recycler = bufferRecycler;
+        _hashTable = bufferRecycler.allocEncodingHash(suggestedHashLen);
         _hashModulo = _hashTable.length - 1;
         _encodeBuffer = null;
     }
@@ -297,6 +319,10 @@ public boolean encodeAndWriteChunkIfCompresses(byte[] data, int offset, int inpu
         return false;
     }
     
+	public BufferRecycler getBufferRecycler() {
+		return _recycler;
+	}
+
     /*
     ///////////////////////////////////////////////////////////////////////
     // Abstract methods for sub-classes
diff --git a/src/main/java/com/ning/compress/lzf/LZFCompressingInputStream.java b/src/main/java/com/ning/compress/lzf/LZFCompressingInputStream.java
index 6c49924..e46b8b2 100644
--- a/src/main/java/com/ning/compress/lzf/LZFCompressingInputStream.java
+++ b/src/main/java/com/ning/compress/lzf/LZFCompressingInputStream.java
@@ -76,16 +76,24 @@ public class LZFCompressingInputStream extends InputStream
     
     public LZFCompressingInputStream(InputStream in)
     {
-        this(null, in);
+        this(null, in, BufferRecycler.instance());
     }
 
     public LZFCompressingInputStream(final ChunkEncoder encoder, InputStream in)
+    {
+        this(encoder, in, null);
+    }
+
+    public LZFCompressingInputStream(final ChunkEncoder encoder, InputStream in, BufferRecycler bufferRecycler)
     {
         // may be passed by caller, or could be null
         _encoder = encoder;
         _inputStream = in;
-        _recycler = BufferRecycler.instance();
-        _inputBuffer = _recycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
+		if (bufferRecycler==null) {
+			bufferRecycler = (encoder!=null) ? _encoder._recycler : BufferRecycler.instance();
+		}
+        _recycler = bufferRecycler;
+        _inputBuffer = bufferRecycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
         // let's not yet allocate encoding buffer; don't know optimal size
     }
 
@@ -259,7 +267,7 @@ protected boolean readyBuffer() throws IOException
         if (_encoder == null) {
             // need 7 byte header, plus regular max buffer size:
             int bufferLen = chunkLength + ((chunkLength + 31) >> 5) + 7;
-            _encoder = ChunkEncoderFactory.optimalNonAllocatingInstance(bufferLen);
+            _encoder = ChunkEncoderFactory.optimalNonAllocatingInstance(bufferLen, _recycler);
         }
         if (_encodedBytes == null) {
             int bufferLen = chunkLength + ((chunkLength + 31) >> 5) + 7;
diff --git a/src/main/java/com/ning/compress/lzf/LZFEncoder.java b/src/main/java/com/ning/compress/lzf/LZFEncoder.java
index b147071..9835e2d 100644
--- a/src/main/java/com/ning/compress/lzf/LZFEncoder.java
+++ b/src/main/java/com/ning/compress/lzf/LZFEncoder.java
@@ -11,6 +11,7 @@
 
 package com.ning.compress.lzf;
 
+import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.util.ChunkEncoderFactory;
 
 /**
@@ -121,6 +122,36 @@ public static byte[] safeEncode(byte[] data, int offset, int length)
         return result;
     }    
 
+    /**
+     * Method for compressing given input data using LZF encoding and
+     * block structure (compatible with lzf command line utility).
+     * Result consists of a sequence of chunks.
+     *<p>
+     * Note that {@link ChunkEncoder} instance used is one produced by
+     * {@link ChunkEncoderFactory#optimalInstance}, which typically
+     * is ""unsafe"" instance if one can be used on current JVM.
+     */
+    public static byte[] encode(byte[] data, int offset, int length, BufferRecycler bufferRecycler)
+    {
+        ChunkEncoder enc = ChunkEncoderFactory.optimalInstance(length, bufferRecycler);
+        byte[] result = encode(enc, data, offset, length);
+        enc.close(); // important for buffer reuse!
+        return result;
+    }
+
+    /**
+     * Method that will use ""safe"" {@link ChunkEncoder}, as produced by
+     * {@link ChunkEncoderFactory#safeInstance}, for encoding. Safe here
+     * means that it does not use any non-compliant features beyond core JDK.
+     */
+    public static byte[] safeEncode(byte[] data, int offset, int length, BufferRecycler bufferRecycler)
+    {
+        ChunkEncoder enc = ChunkEncoderFactory.safeInstance(length, bufferRecycler);
+        byte[] result = encode(enc, data, offset, length);
+        enc.close();
+        return result;
+    }    
+
     /**
      * Compression method that uses specified {@link ChunkEncoder} for actual
      * encoding.
@@ -207,6 +238,36 @@ public static int safeAppendEncoded(byte[] input, int inputPtr, int inputLength,
     
     /**
      * Alternate version that accepts pre-allocated output buffer.
+     *<p>
+     * Note that {@link ChunkEncoder} instance used is one produced by
+     * {@link ChunkEncoderFactory#optimalNonAllocatingInstance}, which typically
+     * is ""unsafe"" instance if one can be used on current JVM.
+     */
+    public static int appendEncoded(byte[] input, int inputPtr, int inputLength,
+            byte[] outputBuffer, int outputPtr, BufferRecycler bufferRecycler) {
+        ChunkEncoder enc = ChunkEncoderFactory.optimalNonAllocatingInstance(inputLength, bufferRecycler);
+        int len = appendEncoded(enc, input, inputPtr, inputLength, outputBuffer, outputPtr);
+        enc.close();
+        return len;
+    }
+
+    /**
+     * Alternate version that accepts pre-allocated output buffer.
+     *<p>
+     * Method that will use ""safe"" {@link ChunkEncoder}, as produced by
+     * {@link ChunkEncoderFactory#safeInstance}, for encoding. Safe here
+     * means that it does not use any non-compliant features beyond core JDK.
+     */
+    public static int safeAppendEncoded(byte[] input, int inputPtr, int inputLength,
+            byte[] outputBuffer, int outputPtr, BufferRecycler bufferRecycler) {
+        ChunkEncoder enc = ChunkEncoderFactory.safeNonAllocatingInstance(inputLength, bufferRecycler);
+        int len = appendEncoded(enc, input, inputPtr, inputLength, outputBuffer, outputPtr);
+        enc.close();
+        return len;
+    }
+
+	/**
+     * Alternate version that accepts pre-allocated output buffer.
      */
     public static int appendEncoded(ChunkEncoder enc, byte[] input, int inputPtr, int inputLength,
             byte[] outputBuffer, int outputPtr)
diff --git a/src/main/java/com/ning/compress/lzf/LZFInputStream.java b/src/main/java/com/ning/compress/lzf/LZFInputStream.java
index cd0c280..6626089 100644
--- a/src/main/java/com/ning/compress/lzf/LZFInputStream.java
+++ b/src/main/java/com/ning/compress/lzf/LZFInputStream.java
@@ -83,7 +83,7 @@ public LZFInputStream(final InputStream inputStream) throws IOException
     public LZFInputStream(final ChunkDecoder decoder, final InputStream in)
         throws IOException
     {
-        this(decoder, in, false);
+        this(decoder, in, BufferRecycler.instance(), false);
     }
     
     /**
@@ -94,21 +94,45 @@ public LZFInputStream(final ChunkDecoder decoder, final InputStream in)
      */
     public LZFInputStream(final InputStream in, boolean fullReads) throws IOException
     {
-        this(ChunkDecoderFactory.optimalInstance(), in, fullReads);
+        this(ChunkDecoderFactory.optimalInstance(), in, BufferRecycler.instance(), fullReads);
     }
 
     public LZFInputStream(final ChunkDecoder decoder, final InputStream in, boolean fullReads)
         throws IOException
+    {
+        this(decoder, in, BufferRecycler.instance(), fullReads);
+    }
+
+    public LZFInputStream(final InputStream inputStream, final BufferRecycler bufferRecycler) throws IOException
+    {
+        this(inputStream, bufferRecycler, false);
+    }
+
+    /**
+     * @param in Underlying input stream to use
+     * @param fullReads Whether {@link #read(byte[])} should try to read exactly
+     *   as many bytes as requested (true); or just however many happen to be
+     *   available (false)
+	 * @param bufferRecycler Buffer recycler instance, for usages where the
+	 *   caller manages the recycler instances
+     */
+    public LZFInputStream(final InputStream in, final BufferRecycler bufferRecycler, boolean fullReads) throws IOException
+    {
+        this(ChunkDecoderFactory.optimalInstance(), in, bufferRecycler, fullReads);
+    }
+
+	public LZFInputStream(final ChunkDecoder decoder, final InputStream in, final BufferRecycler bufferRecycler, boolean fullReads)
+        throws IOException
     {
         super();
         _decoder = decoder;
-        _recycler = BufferRecycler.instance();
+        _recycler = bufferRecycler;
         _inputStream = in;
         _inputStreamClosed = false;
         _cfgFullReads = fullReads;
 
-        _inputBuffer = _recycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
-        _decodedBytes = _recycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _inputBuffer = bufferRecycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _decodedBytes = bufferRecycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
     }
 
     /**
diff --git a/src/main/java/com/ning/compress/lzf/LZFOutputStream.java b/src/main/java/com/ning/compress/lzf/LZFOutputStream.java
index fe7bdab..c55a8b9 100644
--- a/src/main/java/com/ning/compress/lzf/LZFOutputStream.java
+++ b/src/main/java/com/ning/compress/lzf/LZFOutputStream.java
@@ -28,7 +28,7 @@
  */
 public class LZFOutputStream extends FilterOutputStream implements WritableByteChannel
 {
-    private static final int OUTPUT_BUFFER_SIZE = LZFChunk.MAX_CHUNK_LEN;
+    private static final int DEFAULT_OUTPUT_BUFFER_SIZE = LZFChunk.MAX_CHUNK_LEN;
 
     private final ChunkEncoder _encoder;
     private final BufferRecycler _recycler;
@@ -58,15 +58,34 @@ public class LZFOutputStream extends FilterOutputStream implements WritableByteC
 
     public LZFOutputStream(final OutputStream outputStream)
     {
-        this(ChunkEncoderFactory.optimalInstance(OUTPUT_BUFFER_SIZE), outputStream);
+        this(ChunkEncoderFactory.optimalInstance(DEFAULT_OUTPUT_BUFFER_SIZE), outputStream);
     }
 
     public LZFOutputStream(final ChunkEncoder encoder, final OutputStream outputStream)
+    {
+        this(encoder, outputStream, DEFAULT_OUTPUT_BUFFER_SIZE, encoder._recycler);
+    }
+
+    public LZFOutputStream(final OutputStream outputStream, final BufferRecycler bufferRecycler)
+    {
+        this(ChunkEncoderFactory.optimalInstance(bufferRecycler), outputStream, bufferRecycler);
+    }
+
+    public LZFOutputStream(final ChunkEncoder encoder, final OutputStream outputStream, final BufferRecycler bufferRecycler)
+    {
+        this(encoder, outputStream, DEFAULT_OUTPUT_BUFFER_SIZE, bufferRecycler);
+    }
+
+    public LZFOutputStream(final ChunkEncoder encoder, final OutputStream outputStream,
+			               final int bufferSize, BufferRecycler bufferRecycler)
     {
         super(outputStream);
         _encoder = encoder;
-        _recycler = BufferRecycler.instance();
-        _outputBuffer = _recycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
+		if (bufferRecycler==null) {
+			bufferRecycler = _encoder._recycler;
+		}
+        _recycler = bufferRecycler;
+        _outputBuffer = bufferRecycler.allocOutputBuffer(bufferSize);
         _outputStreamClosed = false;
     }
 
diff --git a/src/main/java/com/ning/compress/lzf/LZFUncompressor.java b/src/main/java/com/ning/compress/lzf/LZFUncompressor.java
index e8e756f..0cd6a44 100644
--- a/src/main/java/com/ning/compress/lzf/LZFUncompressor.java
+++ b/src/main/java/com/ning/compress/lzf/LZFUncompressor.java
@@ -109,14 +109,23 @@ public class LZFUncompressor extends Uncompressor
      */
     
     public LZFUncompressor(DataHandler handler) {
-        this(handler, ChunkDecoderFactory.optimalInstance());
+        this(handler, ChunkDecoderFactory.optimalInstance(), BufferRecycler.instance());
+    }
+    
+    public LZFUncompressor(DataHandler handler, BufferRecycler bufferRecycler) {
+        this(handler, ChunkDecoderFactory.optimalInstance(), bufferRecycler);
     }
     
     public LZFUncompressor(DataHandler handler, ChunkDecoder dec)
+    {
+        this(handler, dec, BufferRecycler.instance());
+    }
+
+    public LZFUncompressor(DataHandler handler, ChunkDecoder dec, BufferRecycler bufferRecycler)
     {
         _handler = handler;
         _decoder = dec;
-        _recycler = BufferRecycler.instance();
+        _recycler = bufferRecycler;
     }
 
     /*
diff --git a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoder.java b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoder.java
index 3a7648e..6dab20e 100644
--- a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoder.java
+++ b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoder.java
@@ -1,5 +1,6 @@
 package com.ning.compress.lzf.impl;
 
+import com.ning.compress.BufferRecycler;
 import java.lang.reflect.Field;
 
 import sun.misc.Unsafe;
@@ -44,6 +45,14 @@ public UnsafeChunkEncoder(int totalLength, boolean bogus) {
         super(totalLength, bogus);
     }
 
+    public UnsafeChunkEncoder(int totalLength, BufferRecycler bufferRecycler) {
+        super(totalLength, bufferRecycler);
+    }
+
+    public UnsafeChunkEncoder(int totalLength, BufferRecycler bufferRecycler, boolean bogus) {
+        super(totalLength, bufferRecycler, bogus);
+    }
+
     /*
     ///////////////////////////////////////////////////////////////////////
     // Shared helper methods
diff --git a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderBE.java b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderBE.java
index 72dcedb..bba0139 100644
--- a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderBE.java
+++ b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderBE.java
@@ -1,5 +1,6 @@
 package com.ning.compress.lzf.impl;
 
+import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.LZFChunk;
 
 /**
@@ -16,6 +17,14 @@ public UnsafeChunkEncoderBE(int totalLength) {
     public UnsafeChunkEncoderBE(int totalLength, boolean bogus) {
         super(totalLength, bogus);
     }
+    public UnsafeChunkEncoderBE(int totalLength, BufferRecycler bufferRecycler) {
+        super(totalLength, bufferRecycler);
+    }
+
+    public UnsafeChunkEncoderBE(int totalLength, BufferRecycler bufferRecycler, boolean bogus) {
+        super(totalLength, bufferRecycler, bogus);
+    }
+
 
     @Override
     protected int tryCompress(byte[] in, int inPos, int inEnd, byte[] out, int outPos)
diff --git a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderLE.java b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderLE.java
index 21350de..33d1e7d 100644
--- a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderLE.java
+++ b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoderLE.java
@@ -1,5 +1,6 @@
 package com.ning.compress.lzf.impl;
 
+import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.LZFChunk;
 
 /**
@@ -17,7 +18,15 @@ public UnsafeChunkEncoderLE(int totalLength, boolean bogus) {
         super(totalLength, bogus);
     }
 
-    @Override
+    public UnsafeChunkEncoderLE(int totalLength, BufferRecycler bufferRecycler) {
+        super(totalLength, bufferRecycler);
+    }
+
+    public UnsafeChunkEncoderLE(int totalLength, BufferRecycler bufferRecycler, boolean bogus) {
+        super(totalLength, bufferRecycler, bogus);
+    }
+
+	@Override
     protected int tryCompress(byte[] in, int inPos, int inEnd, byte[] out, int outPos)
     {
         final int[] hashTable = _hashTable;
diff --git a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoders.java b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoders.java
index 2ae6777..36489e8 100644
--- a/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoders.java
+++ b/src/main/java/com/ning/compress/lzf/impl/UnsafeChunkEncoders.java
@@ -11,6 +11,7 @@
 
 package com.ning.compress.lzf.impl;
 
+import com.ning.compress.BufferRecycler;
 import java.nio.ByteOrder;
 
 
@@ -39,4 +40,18 @@ public static UnsafeChunkEncoder createNonAllocatingEncoder(int totalLength) {
         }
         return new UnsafeChunkEncoderBE(totalLength, false);
     }
+
+    public static UnsafeChunkEncoder createEncoder(int totalLength, BufferRecycler bufferRecycler) {
+        if (LITTLE_ENDIAN) {
+            return new UnsafeChunkEncoderLE(totalLength, bufferRecycler);
+        }
+        return new UnsafeChunkEncoderBE(totalLength, bufferRecycler);
+    }
+
+    public static UnsafeChunkEncoder createNonAllocatingEncoder(int totalLength, BufferRecycler bufferRecycler) {
+        if (LITTLE_ENDIAN) {
+            return new UnsafeChunkEncoderLE(totalLength, bufferRecycler, false);
+        }
+        return new UnsafeChunkEncoderBE(totalLength, bufferRecycler, false);
+    }
 }
diff --git a/src/main/java/com/ning/compress/lzf/impl/VanillaChunkEncoder.java b/src/main/java/com/ning/compress/lzf/impl/VanillaChunkEncoder.java
index 9e68ac6..74a52d5 100644
--- a/src/main/java/com/ning/compress/lzf/impl/VanillaChunkEncoder.java
+++ b/src/main/java/com/ning/compress/lzf/impl/VanillaChunkEncoder.java
@@ -1,5 +1,6 @@
 package com.ning.compress.lzf.impl;
 
+import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.ChunkEncoder;
 import com.ning.compress.lzf.LZFChunk;
 
@@ -22,10 +23,31 @@ protected VanillaChunkEncoder(int totalLength, boolean bogus) {
         super(totalLength, bogus);
     }
 
+    /**
+     * @param totalLength Total encoded length; used for calculating size
+     *   of hash table to use
+	 * @param bufferRecycler The BufferRecycler instance
+     */
+    public VanillaChunkEncoder(int totalLength, BufferRecycler bufferRecycler) {
+        super(totalLength, bufferRecycler);
+    }
+
+    /**
+     * Alternate constructor used when we want to avoid allocation encoding
+     * buffer, in cases where caller wants full control over allocations.
+     */
+    protected VanillaChunkEncoder(int totalLength, BufferRecycler bufferRecycler, boolean bogus) {
+        super(totalLength, bufferRecycler, bogus);
+    }
+
     public static VanillaChunkEncoder nonAllocatingEncoder(int totalLength) {
         return new VanillaChunkEncoder(totalLength, true);
     }
     
+    public static VanillaChunkEncoder nonAllocatingEncoder(int totalLength, BufferRecycler bufferRecycler) {
+        return new VanillaChunkEncoder(totalLength, bufferRecycler, true);
+    }
+    
     /*
     ///////////////////////////////////////////////////////////////////////
     // Abstract method implementations
diff --git a/src/main/java/com/ning/compress/lzf/parallel/PLZFOutputStream.java b/src/main/java/com/ning/compress/lzf/parallel/PLZFOutputStream.java
index fe52761..0236dec 100644
--- a/src/main/java/com/ning/compress/lzf/parallel/PLZFOutputStream.java
+++ b/src/main/java/com/ning/compress/lzf/parallel/PLZFOutputStream.java
@@ -41,7 +41,7 @@
  */
 public class PLZFOutputStream extends FilterOutputStream implements WritableByteChannel
 {
-    private static final int OUTPUT_BUFFER_SIZE = LZFChunk.MAX_CHUNK_LEN;
+    private static final int DEFAULT_OUTPUT_BUFFER_SIZE = LZFChunk.MAX_CHUNK_LEN;
 
     protected byte[] _outputBuffer;
     protected int _position = 0;
@@ -65,16 +65,20 @@ public class PLZFOutputStream extends FilterOutputStream implements WritableByte
      */
 
     public PLZFOutputStream(final OutputStream outputStream) {
-        this(outputStream, getNThreads());
+        this(outputStream, DEFAULT_OUTPUT_BUFFER_SIZE, getNThreads());
     }
 
     protected PLZFOutputStream(final OutputStream outputStream, int nThreads) {
+        this(outputStream, DEFAULT_OUTPUT_BUFFER_SIZE, nThreads);
+    }
+
+    protected PLZFOutputStream(final OutputStream outputStream, final int bufferSize, int nThreads) {
         super(outputStream);
         _outputStreamClosed = false;
         compressExecutor = new ThreadPoolExecutor(nThreads, nThreads, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>()); // unbounded
         ((ThreadPoolExecutor)compressExecutor).allowCoreThreadTimeOut(true);
         writeExecutor = Executors.newSingleThreadExecutor(); // unbounded
-        blockManager = new BlockManager(nThreads * 2, OUTPUT_BUFFER_SIZE); // this is where the bounds will be enforced!
+        blockManager = new BlockManager(nThreads * 2, bufferSize); // this is where the bounds will be enforced!
         _outputBuffer = blockManager.getBlockFromPool();
     }
 
diff --git a/src/main/java/com/ning/compress/lzf/util/ChunkEncoderFactory.java b/src/main/java/com/ning/compress/lzf/util/ChunkEncoderFactory.java
index af2134a..f61379f 100644
--- a/src/main/java/com/ning/compress/lzf/util/ChunkEncoderFactory.java
+++ b/src/main/java/com/ning/compress/lzf/util/ChunkEncoderFactory.java
@@ -1,5 +1,6 @@
 package com.ning.compress.lzf.util;
 
+import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.ChunkEncoder;
 import com.ning.compress.lzf.LZFChunk;
 import com.ning.compress.lzf.impl.UnsafeChunkEncoders;
@@ -35,6 +36,8 @@ public static ChunkEncoder optimalInstance() {
      * non-standard platforms it may be necessary to either directly load
      * instances, or use {@link #safeInstance}.
      *
+	 * <p/>Uses a ThreadLocal soft-referenced BufferRecycler instance.
+	 * 
      * @param totalLength Expected total length of content to compress; only matters
      *    for content that is smaller than maximum chunk size (64k), to optimize
      *    encoding hash tables
@@ -50,6 +53,8 @@ public static ChunkEncoder optimalInstance(int totalLength) {
     /**
      * Factory method for constructing encoder that is always passed buffer
      * externally, so that it will not (nor need) allocate encoding buffer.
+     *
+	 * <p/>Uses a ThreadLocal soft-referenced BufferRecycler instance.
      */
     public static ChunkEncoder optimalNonAllocatingInstance(int totalLength) {
         try {
@@ -68,9 +73,12 @@ public static ChunkEncoder optimalNonAllocatingInstance(int totalLength) {
     public static ChunkEncoder safeInstance() {
         return safeInstance(LZFChunk.MAX_CHUNK_LEN);
     }
+	
     /**
      * Method that can be used to ensure that a ""safe"" compressor instance is loaded.
      * Safe here means that it should work on any and all Java platforms.
+     *
+	 * <p/>Uses a ThreadLocal soft-referenced BufferRecycler instance.
      *
      * @param totalLength Expected total length of content to compress; only matters
      *    for content that is smaller than maximum chunk size (64k), to optimize
@@ -83,8 +91,82 @@ public static ChunkEncoder safeInstance(int totalLength) {
     /**
      * Factory method for constructing encoder that is always passed buffer
      * externally, so that it will not (nor need) allocate encoding buffer.
+     *
+	 * <p/>Uses a ThreadLocal soft-referenced BufferRecycler instance.
      */
     public static ChunkEncoder safeNonAllocatingInstance(int totalLength) {
         return VanillaChunkEncoder.nonAllocatingEncoder(totalLength);
     }
+
+    /**
+     * Convenience method, equivalent to:
+     *<code>
+     *   return optimalInstance(LZFChunk.MAX_CHUNK_LEN, bufferRecycler);
+     *</code>
+     */
+    public static ChunkEncoder optimalInstance(BufferRecycler bufferRecycler) {
+        return optimalInstance(LZFChunk.MAX_CHUNK_LEN, bufferRecycler);
+    }
+
+    /**
+     * Method to use for getting compressor instance that uses the most optimal
+     * available methods for underlying data access. It should be safe to call
+     * this method as implementations are dynamically loaded; however, on some
+     * non-standard platforms it may be necessary to either directly load
+     * instances, or use {@link #safeInstance}.
+	 * 
+     * @param totalLength Expected total length of content to compress; only matters
+     *    for content that is smaller than maximum chunk size (64k), to optimize
+     *    encoding hash tables
+	 * @param bufferRecycler The BufferRecycler instance
+     */
+    public static ChunkEncoder optimalInstance(int totalLength, BufferRecycler bufferRecycler) {
+        try {
+            return UnsafeChunkEncoders.createEncoder(totalLength, bufferRecycler);
+        } catch (Exception e) {
+            return safeInstance(totalLength, bufferRecycler);
+        }
+    }
+
+    /**
+     * Factory method for constructing encoder that is always passed buffer
+     * externally, so that it will not (nor need) allocate encoding buffer.
+     */
+    public static ChunkEncoder optimalNonAllocatingInstance(int totalLength, BufferRecycler bufferRecycler) {
+        try {
+            return UnsafeChunkEncoders.createNonAllocatingEncoder(totalLength, bufferRecycler);
+        } catch (Exception e) {
+            return safeNonAllocatingInstance(totalLength, bufferRecycler);
+        }
+    }
+
+    /**
+     * Convenience method, equivalent to:
+     *<code>
+     *   return safeInstance(LZFChunk.MAX_CHUNK_LEN, bufferRecycler);
+     *</code>
+     */
+    public static ChunkEncoder safeInstance(BufferRecycler bufferRecycler) {
+        return safeInstance(LZFChunk.MAX_CHUNK_LEN, bufferRecycler);
+    }
+    /**
+     * Method that can be used to ensure that a ""safe"" compressor instance is loaded.
+     * Safe here means that it should work on any and all Java platforms.
+     *
+     * @param totalLength Expected total length of content to compress; only matters
+     *    for content that is smaller than maximum chunk size (64k), to optimize
+     *    encoding hash tables
+	 * @param bufferRecycler The BufferRecycler instance
+     */
+    public static ChunkEncoder safeInstance(int totalLength, BufferRecycler bufferRecycler) {
+        return new VanillaChunkEncoder(totalLength, bufferRecycler);
+    }
+
+    /**
+     * Factory method for constructing encoder that is always passed buffer
+     * externally, so that it will not (nor need) allocate encoding buffer.
+     */
+    public static ChunkEncoder safeNonAllocatingInstance(int totalLength, BufferRecycler bufferRecycler) {
+        return VanillaChunkEncoder.nonAllocatingEncoder(totalLength, bufferRecycler);
+    }
 }
diff --git a/src/main/java/com/ning/compress/lzf/util/LZFFileInputStream.java b/src/main/java/com/ning/compress/lzf/util/LZFFileInputStream.java
index 27e5d25..19f7caa 100644
--- a/src/main/java/com/ning/compress/lzf/util/LZFFileInputStream.java
+++ b/src/main/java/com/ning/compress/lzf/util/LZFFileInputStream.java
@@ -77,47 +77,62 @@ public class LZFFileInputStream
      */
 
     public LZFFileInputStream(File file) throws FileNotFoundException {
-        this(file, ChunkDecoderFactory.optimalInstance());
+        this(file, ChunkDecoderFactory.optimalInstance(), BufferRecycler.instance());
     }
 
     public LZFFileInputStream(FileDescriptor fdObj) {
-        this(fdObj, ChunkDecoderFactory.optimalInstance());
+        this(fdObj, ChunkDecoderFactory.optimalInstance(), BufferRecycler.instance());
     }
 
     public LZFFileInputStream(String name) throws FileNotFoundException {
-        this(name, ChunkDecoderFactory.optimalInstance());
+        this(name, ChunkDecoderFactory.optimalInstance(), BufferRecycler.instance());
     }
     
     public LZFFileInputStream(File file, ChunkDecoder decompressor) throws FileNotFoundException
+    {
+        this(file, decompressor, BufferRecycler.instance());
+    }
+
+    public LZFFileInputStream(FileDescriptor fdObj, ChunkDecoder decompressor)
+    {
+        this(fdObj, decompressor, BufferRecycler.instance());
+    }
+
+    public LZFFileInputStream(String name, ChunkDecoder decompressor) throws FileNotFoundException
+    {
+        this(name, decompressor, BufferRecycler.instance());
+    }
+
+    public LZFFileInputStream(File file, ChunkDecoder decompressor, BufferRecycler bufferRecycler) throws FileNotFoundException
     {
         super(file);
         _decompressor = decompressor;
-        _recycler = BufferRecycler.instance();
+        _recycler = bufferRecycler;
         _inputStreamClosed = false;
-        _inputBuffer = _recycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
-        _decodedBytes = _recycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _inputBuffer = bufferRecycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _decodedBytes = bufferRecycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
         _wrapper = new Wrapper();
     }
 
-    public LZFFileInputStream(FileDescriptor fdObj, ChunkDecoder decompressor)
+    public LZFFileInputStream(FileDescriptor fdObj, ChunkDecoder decompressor, BufferRecycler bufferRecycler)
     {
         super(fdObj);
         _decompressor = decompressor;
-        _recycler = BufferRecycler.instance();
+        _recycler = bufferRecycler;
         _inputStreamClosed = false;
-        _inputBuffer = _recycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
-        _decodedBytes = _recycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _inputBuffer = bufferRecycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _decodedBytes = bufferRecycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
         _wrapper = new Wrapper();
     }
 
-    public LZFFileInputStream(String name, ChunkDecoder decompressor) throws FileNotFoundException
+    public LZFFileInputStream(String name, ChunkDecoder decompressor, BufferRecycler bufferRecycler) throws FileNotFoundException
     {
         super(name);
         _decompressor = decompressor;
-        _recycler = BufferRecycler.instance();
+        _recycler = bufferRecycler;
         _inputStreamClosed = false;
-        _inputBuffer = _recycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
-        _decodedBytes = _recycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _inputBuffer = bufferRecycler.allocInputBuffer(LZFChunk.MAX_CHUNK_LEN);
+        _decodedBytes = bufferRecycler.allocDecodeBuffer(LZFChunk.MAX_CHUNK_LEN);
         _wrapper = new Wrapper();
     }
 
diff --git a/src/main/java/com/ning/compress/lzf/util/LZFFileOutputStream.java b/src/main/java/com/ning/compress/lzf/util/LZFFileOutputStream.java
index b20aa5d..3a5f457 100644
--- a/src/main/java/com/ning/compress/lzf/util/LZFFileOutputStream.java
+++ b/src/main/java/com/ning/compress/lzf/util/LZFFileOutputStream.java
@@ -86,42 +86,65 @@ public LZFFileOutputStream(String name, boolean append) throws FileNotFoundExcep
     }
 
     public LZFFileOutputStream(ChunkEncoder encoder, File file) throws FileNotFoundException {
+        this(encoder, file, encoder.getBufferRecycler());
+    }
+
+    public LZFFileOutputStream(ChunkEncoder encoder, File file, boolean append) throws FileNotFoundException {
+        this(encoder, file, append, encoder.getBufferRecycler());
+    }
+
+    public LZFFileOutputStream(ChunkEncoder encoder, FileDescriptor fdObj) {
+        this(encoder, fdObj, encoder.getBufferRecycler());
+    }
+
+    public LZFFileOutputStream(ChunkEncoder encoder, String name) throws FileNotFoundException {
+        this(encoder, name, encoder.getBufferRecycler());
+    }
+
+    public LZFFileOutputStream(ChunkEncoder encoder, String name, boolean append) throws FileNotFoundException {
+        this(encoder, name, append, encoder.getBufferRecycler());
+    }
+
+    public LZFFileOutputStream(ChunkEncoder encoder, File file, BufferRecycler bufferRecycler) throws FileNotFoundException {
         super(file);
         _encoder = encoder;
-        _recycler = BufferRecycler.instance();
-        _outputBuffer = _recycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
+		if (bufferRecycler==null) {
+			bufferRecycler = encoder.getBufferRecycler();
+		}
+        _recycler = bufferRecycler;
+        _outputBuffer = bufferRecycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
         _wrapper = new Wrapper();
     }
 
-    public LZFFileOutputStream(ChunkEncoder encoder, File file, boolean append) throws FileNotFoundException {
+    public LZFFileOutputStream(ChunkEncoder encoder, File file, boolean append, BufferRecycler bufferRecycler) throws FileNotFoundException {
         super(file, append);
         _encoder = encoder;
-        _recycler = BufferRecycler.instance();
-        _outputBuffer = _recycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
+        _recycler = bufferRecycler;
+        _outputBuffer = bufferRecycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
         _wrapper = new Wrapper();
     }
 
-    public LZFFileOutputStream(ChunkEncoder encoder, FileDescriptor fdObj) {
+    public LZFFileOutputStream(ChunkEncoder encoder, FileDescriptor fdObj, BufferRecycler bufferRecycler) {
         super(fdObj);
         _encoder = encoder;
-        _recycler = BufferRecycler.instance();
-        _outputBuffer = _recycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
+        _recycler = bufferRecycler;
+        _outputBuffer = bufferRecycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
         _wrapper = new Wrapper();
     }
 
-    public LZFFileOutputStream(ChunkEncoder encoder, String name) throws FileNotFoundException {
+    public LZFFileOutputStream(ChunkEncoder encoder, String name, BufferRecycler bufferRecycler) throws FileNotFoundException {
         super(name);
         _encoder = encoder;
-        _recycler = BufferRecycler.instance();
-        _outputBuffer = _recycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
+        _recycler = bufferRecycler;
+        _outputBuffer = bufferRecycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
         _wrapper = new Wrapper();
     }
 
-    public LZFFileOutputStream(ChunkEncoder encoder, String name, boolean append) throws FileNotFoundException {
+    public LZFFileOutputStream(ChunkEncoder encoder, String name, boolean append, BufferRecycler bufferRecycler) throws FileNotFoundException {
         super(name, append);
         _encoder = encoder;
-        _recycler = BufferRecycler.instance();
-        _outputBuffer = _recycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
+        _recycler = bufferRecycler;
+        _outputBuffer = bufferRecycler.allocOutputBuffer(OUTPUT_BUFFER_SIZE);
         _wrapper = new Wrapper();
     }"
d3ec4cab768b7062fa7625d623402f25f349028c,Mylyn Reviews,"380843: index commit messages of changesets

Created custom filter for changesets, which works better with task
numbers like used in jira (Prefix-Number).

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=380843
Change-Id: Ice1cf8e3a558c36d9e832312a0a6259e7f6e7e86
",a,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/BracketFilter.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/BracketFilter.java
new file mode 100644
index 00000000..df4575c3
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/BracketFilter.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.versions.tasks.mapper.internal;
+
+import java.util.Arrays;
+
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+
+/**
+ *
+ * @author Kilian Matt
+ *
+ */
+public class BracketFilter extends TokenFilter {
+	  private TermAttribute attribute;
+	  private char[] illegalChars= {'(',')','[',']','{','}'};
+	  public BracketFilter(TokenStream in) {
+	    super(in);
+	    attribute = (TermAttribute) addAttribute(TermAttribute.class);
+	    Arrays.sort(illegalChars);
+	  }
+
+	  /** Returns the next token in the stream, or null at EOS.
+	   * <p>Removes <tt>'s</tt> from the end of words.
+	   * <p>Removes dots from acronyms.
+	   */
+	  public final boolean incrementToken() throws java.io.IOException {
+		  if(!input.incrementToken()) return false;
+
+		  char[] buffer = attribute.termBuffer();
+		  char[] target = new char[buffer.length];
+		  int targetPos=0;
+		  for(int i =0; i < buffer.length; i++) {
+			  if(Arrays.binarySearch(illegalChars,buffer[i])<0) {
+				  target[targetPos++] = buffer[i];
+			  }
+		  }
+		  attribute.setTermBuffer(target,0,targetPos);
+		  return true;
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetAnalyzer.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetAnalyzer.java
new file mode 100644
index 00000000..ae61a595
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetAnalyzer.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.versions.tasks.mapper.internal;
+
+import java.io.Reader;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.KeywordAnalyzer;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.util.Version;
+
+/**
+ *
+ * @author Kilian Matt
+ *
+ */
+public class ChangeSetAnalyzer  {
+		public static Analyzer get() {
+			PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(Version.LUCENE_CURRENT));
+			analyzer.addAnalyzer(IndexedFields.REPOSITORY.getIndexKey(), new KeywordAnalyzer());
+			analyzer.addAnalyzer(IndexedFields.COMMIT_MESSAGE.getIndexKey(), new Analyzer() {
+				@Override
+				public TokenStream tokenStream(String fieldName, Reader reader) {
+					WhitespaceAnalyzer delegate =new WhitespaceAnalyzer();
+					TokenStream tokenStream = delegate.tokenStream(fieldName, reader);
+					BracketFilter filteredStream = new BracketFilter(tokenStream);
+					return filteredStream;
+				}
+			});
+			return analyzer;
+		}
+	}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexer.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexer.java
index d7460e44..08a0058b 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexer.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexer.java
@@ -9,14 +9,11 @@
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
 package org.eclipse.mylyn.versions.tasks.mapper.internal;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import org.apache.lucene.LucenePackage;
-import org.apache.lucene.analysis.KeywordAnalyzer;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.Field.Store;
@@ -25,22 +22,15 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriter.MaxFieldLength;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.DisjunctionMaxQuery;
 import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.PrefixQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.spans.SpanOrQuery;
-import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanTermQuery;
 import org.apache.lucene.store.NIOFSDirectory;
-import org.apache.lucene.util.Version;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.mylyn.tasks.core.ITask;
@@ -51,7 +41,7 @@
 import org.eclipse.mylyn.versions.tasks.mapper.generic.IChangeSetSource;
 
 /**
- * 
+ *
  * @author Kilian Matt
  */
 public class ChangeSetIndexer implements IChangeSetIndexSearcher {
@@ -67,12 +57,10 @@ public ChangeSetIndexer(File directory, IChangeSetSource source) {
 		this.source = source;
 	}
 
+
 	public void reindex(IProgressMonitor monitor) {
 		try {
-			PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(Version.LUCENE_CURRENT));
-			analyzer.addAnalyzer(IndexedFields.REPOSITORY.getIndexKey(), new KeywordAnalyzer());
-			indexWriter = new IndexWriter(new NIOFSDirectory(indexDirectory),
-					analyzer, true, MaxFieldLength.UNLIMITED);
+			indexWriter = new IndexWriter(new NIOFSDirectory(indexDirectory),ChangeSetAnalyzer.get(), true, MaxFieldLength.UNLIMITED);
 
 			IChangeSetIndexer indexer = new IChangeSetIndexer() {
 
@@ -96,29 +84,29 @@ public void index(ChangeSet changeset) {
 		}
 	}
 
-	public int search(ITask task, String scmRepositoryUrl, int resultsLimit, IChangeSetCollector collector) throws CoreException {
+	public int search(ITask task, String scmRepositoryUrl, int resultsLimit,IChangeSetCollector collector) throws CoreException {
 		int count = 0;
 		IndexReader indexReader = getIndexReader();
 		if (indexReader != null) {
 			IndexSearcher indexSearcher = new IndexSearcher(indexReader);
 			try {
-				Query query = createQuery(task,scmRepositoryUrl);
+				Query query = createQuery(task, scmRepositoryUrl);
 				TopDocs results = indexSearcher.search(query, resultsLimit);
 				for (ScoreDoc scoreDoc : results.scoreDocs) {
 					Document document = indexReader.document(scoreDoc.doc);
 					count++;
-					if(count > resultsLimit)
+					if (count > resultsLimit)
 						break;
-					
-					
+
 					String revision = document.getField(IndexedFields.REVISION.getIndexKey()).stringValue();
-					String repositoryUrl =document.getField(IndexedFields.REPOSITORY.getIndexKey()).stringValue();
-					
+					String repositoryUrl = document.getField(IndexedFields.REPOSITORY.getIndexKey()).stringValue();
+
 					collector.collect(revision, repositoryUrl);
 				}
 			} catch (IOException e) {
-//				StatusHandler.log(new Status(IStatus.ERROR, org.eclipse.mylyn.versions.tasks.ui.internal.TaPLUGIN_ID,
-//""Unexpected failure within task list index"", e)); //$NON-NLS-1$
+				// StatusHandler.log(new Status(IStatus.ERROR,
+				// org.eclipse.mylyn.versions.tasks.ui.internal.TaPLUGIN_ID,
+				//""Unexpected failure within task list index"", e)); //$NON-NLS-1$
 			} finally {
 				try {
 					indexSearcher.close();
@@ -132,20 +120,22 @@ public int search(ITask task, String scmRepositoryUrl, int resultsLimit, IChange
 	}
 
 	private Query createQuery(ITask task, String repositoryUrl) {
-		BooleanQuery query =new BooleanQuery();
+		BooleanQuery query = new BooleanQuery();
 		query.setMinimumNumberShouldMatch(1);
-		query.add(new TermQuery(new Term(IndexedFields.REPOSITORY.getIndexKey(),repositoryUrl)),Occur.MUST);
-		query.add(new PrefixQuery(new Term(IndexedFields.COMMIT_MESSAGE.getIndexKey(),task.getUrl())),Occur.SHOULD);
-		query.add(new PrefixQuery(new Term(IndexedFields.COMMIT_MESSAGE.getIndexKey(),task.getTaskId())),Occur.SHOULD);
+		query.add(new TermQuery(new Term(IndexedFields.REPOSITORY.getIndexKey(), repositoryUrl)), Occur.MUST);
+		query.add(new PrefixQuery(new Term(IndexedFields.COMMIT_MESSAGE.getIndexKey(), task.getUrl())), Occur.SHOULD);
+		query.add(new PrefixQuery(new Term(IndexedFields.COMMIT_MESSAGE.getIndexKey(), task.getTaskId())), Occur.SHOULD);
+		query.add(new PrefixQuery(new Term(IndexedFields.COMMIT_MESSAGE.getIndexKey(), task.getTaskKey())), Occur.SHOULD);
+
 		return query;
 	}
 
-
 	private IndexReader getIndexReader() {
 		try {
 			synchronized (this) {
 				if (indexReader == null) {
-					indexReader = IndexReader.open(new NIOFSDirectory(indexDirectory), true);
+					indexReader = IndexReader.open(new NIOFSDirectory(
+							indexDirectory), true);
 				}
 				return indexReader;
 			}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.tests/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexerTest.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.tests/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexerTest.java
index f909b736..f7aa8c42 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.tests/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexerTest.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.tests/src/org/eclipse/mylyn/versions/tasks/mapper/internal/ChangeSetIndexerTest.java
@@ -36,15 +36,16 @@
 import org.junit.Test;
 
 /**
- * 
+ *
  * @author Kilian Matt
  *
  */
+@SuppressWarnings(""restriction"")
 public class ChangeSetIndexerTest {
 
 	protected static final String REPO_URL = ""http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.versions.git"";
 	private ChangeSetIndexer indexer;
-	
+
 	@Before
 	public void prepareIndex() {
 		File dir = createTempDirectoryForIndex();
@@ -61,7 +62,7 @@ public void testSingleResult() throws CoreException{
 		collectors.expect(""1"", REPO_URL);
 		assertEquals(1, indexer.search(task,REPO_URL, 5,collectors));
 		collectors.verifyAllExpectations();
-	}	
+	}
 	@Test
 	public void testMultipleResults() throws CoreException{
 		ITask task =  new MockTask(REPO_URL,""2"");
@@ -73,13 +74,33 @@ public void testMultipleResults() throws CoreException{
 		collectors.verifyAllExpectations();
 	}
 
+	@Test
+	public void testFindByTaskUrl() throws CoreException{
+		ITask task =  new MockTask(REPO_URL,""4"");
+		task.setUrl(REPO_URL+""/4"");
+		ExpectingChangeSetCollector collectors= new ExpectingChangeSetCollector();
+		collectors.expect(""4"", REPO_URL);
+		assertEquals(1, indexer.search(task,REPO_URL, 5,collectors));
+		collectors.verifyAllExpectations();
+	}
+	@Test
+	public void testComplexTaskKeys() throws CoreException{
+		ITask task =  new MockTask(REPO_URL,""2131"");
+		task.setTaskKey(""SPR-9030"");
+		task.setUrl(REPO_URL+""/1"");
+		ExpectingChangeSetCollector collectors= new ExpectingChangeSetCollector();
+		collectors.expect(""5"", REPO_URL);
+		collectors.expect(""6"", REPO_URL);
+		assertEquals(2, indexer.search(task,REPO_URL, 5,collectors));
+		collectors.verifyAllExpectations();
+	}
 
 	static class ExpectingChangeSetCollector implements IChangeSetCollector{
 		private List<Pair> expected=new LinkedList<Pair>();
 		void expect(String revision, String repositoryUrl){
 			this.expected.add(new Pair(revision,repositoryUrl));
 		}
-		
+
 		public void verifyAllExpectations() {
 			if(expected.size()>0){
 				fail( expected.size() + "" expected changesets not collected"");
@@ -108,16 +129,20 @@ public void collect(String revision, String repositoryUrl)
 	}
 	private ListChangeSetSource createIndexerSource() {
 		ScmRepository repository=new ScmRepository(null, """", REPO_URL);
-		ScmRepository otherRepo=new ScmRepository(null, """", ""http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.reviews.git"");		
+		ScmRepository otherRepo=new ScmRepository(null, """", ""http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.reviews.git"");
 		ListChangeSetSource source = new ListChangeSetSource(Arrays.asList(
 				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""1"", ""commit message 1"", repository, new ArrayList<Change>()),
 				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""1"", ""commit message 1"", otherRepo, new ArrayList<Change>()),
 				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""2"", ""commit message 2"", repository, new ArrayList<Change>()),
-				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""3"", ""commit message 2"", repository, new ArrayList<Change>())
+				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""3"", ""commit message 2"", repository, new ArrayList<Change>()),
+				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""4"", ""another commit message with url http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.versions.git/4 "", repository, new ArrayList<Change>()),
+
+				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""5"", ""SPR-9030: Test"", repository, new ArrayList<Change>()),
+				new ChangeSet(new ScmUser(""test"", ""Name"", ""test@eclipse.org""), new Date(), ""6"", ""Fixed Bug (SPR-9030)"", repository, new ArrayList<Change>())
 		));
 		return source;
 	}
-	
+
 	class ListChangeSetSource implements IChangeSetSource {
 		private List<ChangeSet> changesets;
 		public ListChangeSetSource(List<ChangeSet> changesets){
@@ -131,7 +156,7 @@ public void fetchAllChangesets(IProgressMonitor monitor,
 			}
 		}
 	}
-	
+
 	private File createTempDirectoryForIndex() {
 		File dir = null;
 		try {
@@ -144,7 +169,7 @@ private File createTempDirectoryForIndex() {
 		}
 		return dir;
 	}
-	
-	
-	
+
+
+
 }"
36cfc1272adb7973aeb7437ac689ff2168c9777d,Vala,"glib-2.0: Add more GMarkup bindings

Add g_markup_collect_attributes, g_markup_parser_context_push,
g_markup_parser_context_pop, and GMarkupCollectType bindings,
based on patch by Yu Feng, fixes bug 564704.
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index d1d075f0de..ff9474eb3f 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -2684,7 +2684,8 @@ namespace GLib {
 		PARSE,
 		UNKNOWN_ELEMENT,
 		UNKNOWN_ATTRIBUTE,
-		INVALID_CONTENT
+		INVALID_CONTENT,
+		MISSING_ATTRIBUTE
 	}
 
 	[CCode (cprefix = ""G_MARKUP_"", has_type_id = false)]
@@ -2701,6 +2702,8 @@ namespace GLib {
 		public weak string get_element ();
 		public weak SList<string> get_element_stack ();
 		public void get_position (out int line_number, out int char_number);
+		public void push (MarkupParser parser, void* user_data);
+		public void* pop (MarkupParser parser);
 	}
 	
 	public delegate void MarkupParserStartElementFunc (MarkupParseContext context, string element_name, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_names, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_values) throws MarkupError;
@@ -2722,9 +2725,21 @@ namespace GLib {
 	}
 
 	namespace Markup {
+		[CCode (cprefix = ""G_MARKUP_COLLECT_"", has_type_id = false)]
+		public enum CollectType {
+			INVALID,
+			STRING,
+			STRDUP,
+			BOOLEAN,
+			TRISTATE,
+			OPTIONAL
+		}
+
 		public static string escape_text (string text, long length = -1);
 		[PrintfFormat]
 		public static string printf_escaped (string format, ...);
+		[CCode (sentinel = ""G_MARKUP_COLLECT_INVALID"")]
+		public static bool collect_attributes (string element_name, string[] attribute_names, string[] attribute_values, ...) throws MarkupError;
 	}
 
 	/* Key-value file parser */"
fef434b11eb3abf88fca6ac3073a5025447a646d,orientdb,Fixed issue -1521 about JSON management of- embedded lists with different types--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
index f4490b73182..7df87652f56 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
@@ -212,13 +212,9 @@ else if (firstValue instanceof Enum<?>)
                   else {
                     linkedType = OType.getTypeByClass(firstValue.getClass());
 
-                    if (linkedType != OType.LINK) {
-                      // EMBEDDED FOR SURE SINCE IT CONTAINS JAVA TYPES
-                      if (linkedType == null) {
-                        linkedType = OType.EMBEDDED;
-                        // linkedClass = new OClass(firstValue.getClass());
-                      }
-                    }
+                    if (linkedType != OType.LINK)
+                      // EMBEDDED FOR SURE DON'T USE THE LINKED TYPE
+                      linkedType = null;
                   }
 
                   if (type == null)
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java
index 411fe57fa61..e702f9d9fc1 100755
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java
@@ -15,7 +15,12 @@
  */
 package com.orientechnologies.orient.test.database.auto;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.Parameters;
@@ -37,6 +42,11 @@
 public class JSONTest {
   private String url;
 
+//  public static final void  main(String[] args) throws Exception {
+//    JSONTest test = new JSONTest(""memory:test"");
+//    test.testList();
+//  }
+
   @Parameters(value = ""url"")
   public JSONTest(final String iURL) {
     url = iURL;
@@ -687,4 +697,17 @@ public void nestedJsonTest() {
 
     db.close();
   }
+
+  @Test
+  public void testList() throws Exception {
+    ODocument documentSource = new ODocument();
+    documentSource.fromJSON(""{\""list\"" : [\""string\"", 42]}"");
+
+    ODocument documentTarget = new ODocument();
+    documentTarget.fromStream(documentSource.toStream());
+
+    OTrackedList<Object> list = documentTarget.field(""list"", OType.EMBEDDEDLIST);
+    Assert.assertEquals(list.get(0), ""string"");
+    Assert.assertEquals(list.get(1), 42);
+  }
 }"
ba424c200bb5b1321f2a8872dfbb1b6f95e2eab0,tapiji,"Adapts the namespace of all TapiJI plug-ins to org.eclipselabs.tapiji.*.
",p,https://github.com/tapiji/tapiji,"diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/.project b/at.ac.tuwien.inso.eclipse.i18n.java/.project
index fc4b668e..fe4d5b8a 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/.project
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/.project
@@ -1,6 +1,6 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <projectDescription>
-	<name>at.ac.tuwien.inso.eclipse.i18n.java</name>
+	<name>org.eclipselabs.tapiji.tools.java</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/META-INF/MANIFEST.MF b/at.ac.tuwien.inso.eclipse.i18n.java/META-INF/MANIFEST.MF
index d28b965f..979bf42a 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/META-INF/MANIFEST.MF
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JavaBuilderExtension
-Bundle-SymbolicName: at.ac.tuwien.inso.eclipse.i18n.java;singleton:=true
+Bundle-SymbolicName: org.eclipselabs.tapiji.tools.java;singleton:=true
 Bundle-Version: 0.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: at.ac.tuwien.inso.eclipse.i18n;bundle-version=""0.0.1"",
- org.eclipse.core.resources;bundle-version=""3.6.0"",
+Require-Bundle: org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.jdt.core;bundle-version=""3.6.0"",
  org.eclipse.core.runtime;bundle-version=""3.6.0"",
  org.eclipse.jdt.ui;bundle-version=""3.6.0"",
- org.eclipse.jface
-Import-Package: at.ac.tuwien.inso.eclipse.rbe.model.bundle,
- at.ac.tuwien.inso.eclipse.rbe.ui.wizards,
+ org.eclipse.jface,
+ org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.1""
+Import-Package: org.eclipselabs.tapiji.translator.rbe.model.bundle,
+ org.eclipselabs.tapiji.translator.rbe.ui.wizards,
  org.eclipse.core.filebuffers,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.text,
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/plugin.xml b/at.ac.tuwien.inso.eclipse.i18n.java/plugin.xml
index abdbec6b..33585177 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/plugin.xml
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version=""3.4""?>
 <plugin>
    <extension
-         point=""at.ac.tuwien.inso.eclipse.i18n.builderExtension"">
+         point=""org.eclipselabs.tapiji.tools.core.builderExtension"">
       <i18nResourceAuditor
             class=""auditor.JavaResourceAuditor"">
       </i18nResourceAuditor>
@@ -13,13 +13,13 @@
             activate=""true""
             class=""ui.ConstantStringHover""
             description=""hovers constant strings""
-            id=""at.ac.tuwien.inso.eclipse.i18n.ui.ConstantStringHover""
+            id=""org.eclipselabs.tapiji.tools.java.ui.ConstantStringHover""
             label=""Constant Strings"">
       </hover>
    </extension>
    <extension
-         id=""at.ac.tuwien.inso.eclipse.i18n.jdt.ui.MessageCompletionProcessor""
-         name=""at.ac.tuwien.inso.eclipse.i18n.jdt.ui.MessageCompletionProcessor""
+         id=""org.eclipselabs.tapiji.tools.java.ui.MessageCompletionProcessor""
+         name=""org.eclipselabs.tapiji.tools.java.ui.MessageCompletionProcessor""
          point=""org.eclipse.jdt.ui.javaCompletionProposalComputer"">
       <javaCompletionProposalComputer
             activate=""true""
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/JavaResourceAuditor.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/JavaResourceAuditor.java
index e5893b06..00f2793f 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/JavaResourceAuditor.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/JavaResourceAuditor.java
@@ -14,17 +14,17 @@
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.ui.SharedASTProvider;
 import org.eclipse.ui.IMarkerResolution;
+import org.eclipselabs.tapiji.tools.core.builder.quickfix.CreateResourceBundle;
+import org.eclipselabs.tapiji.tools.core.builder.quickfix.CreateResourceBundleEntry;
+import org.eclipselabs.tapiji.tools.core.builder.quickfix.IncludeResource;
+import org.eclipselabs.tapiji.tools.core.extensions.I18nResourceAuditor;
+import org.eclipselabs.tapiji.tools.core.extensions.ILocation;
+import org.eclipselabs.tapiji.tools.core.extensions.IMarkerConstants;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
 
 import quickfix.ExportToResourceBundleResolution;
 import quickfix.ReplaceResourceBundleDefReference;
 import quickfix.ReplaceResourceBundleReference;
-import at.ac.tuwien.inso.eclipse.i18n.builder.quickfix.CreateResourceBundle;
-import at.ac.tuwien.inso.eclipse.i18n.builder.quickfix.CreateResourceBundleEntry;
-import at.ac.tuwien.inso.eclipse.i18n.builder.quickfix.IncludeResource;
-import at.ac.tuwien.inso.eclipse.i18n.extensions.I18nResourceAuditor;
-import at.ac.tuwien.inso.eclipse.i18n.extensions.ILocation;
-import at.ac.tuwien.inso.eclipse.i18n.extensions.IMarkerConstants;
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
 import auditor.model.SLLocation;
 
 public class JavaResourceAuditor extends I18nResourceAuditor {
@@ -98,10 +98,10 @@ public String getContextId() {
 	}
 
 	@Override
-	public List<IMarkerResolution> getMarkerResolutions(IMarker marker,
-			int cause) {
+	public List<IMarkerResolution> getMarkerResolutions(IMarker marker) {
 		List<IMarkerResolution> resolutions = new ArrayList<IMarkerResolution>();
-		
+		int cause = marker.getAttribute(""cause"", -1);
+
 		switch (marker.getAttribute(""cause"", -1)) {
 			case IMarkerConstants.CAUSE_CONSTANT_LITERAL:
 				resolutions.add(new ExportToResourceBundleResolution());
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/ResourceAuditVisitor.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/ResourceAuditVisitor.java
index 4a22f0a5..74708c6b 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/ResourceAuditVisitor.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/ResourceAuditVisitor.java
@@ -24,9 +24,9 @@
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
 
 import util.ASTutils;
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
 import auditor.model.SLLocation;
 
 /**
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/model/SLLocation.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/model/SLLocation.java
index 97269552..3bfd8d28 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/model/SLLocation.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/model/SLLocation.java
@@ -3,8 +3,8 @@
 import java.io.Serializable;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipselabs.tapiji.tools.core.extensions.ILocation;
 
-import at.ac.tuwien.inso.eclipse.i18n.extensions.ILocation;
 
 public class SLLocation implements Serializable, ILocation {
 	
@@ -13,7 +13,7 @@ public class SLLocation implements Serializable, ILocation {
 	private int startPos = -1;
 	private int endPos = -1;
 	private String literal;
-	private Object data;
+	private Serializable data;
 	
 	public SLLocation(IFile file, int startPos, int endPos, String literal) {
 		super();
@@ -43,10 +43,10 @@ public void setEndPos(int endPos) {
 	public String getLiteral() {
 		return literal;
 	}
-	public Object getData () {
+	public Serializable getData () {
 		return data;
 	}
-	public void setData (Object data) {
+	public void setData (Serializable data) {
 		this.data = data;
 	}
 	
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ExportToResourceBundleResolution.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ExportToResourceBundleResolution.java
index af0afc60..8757c86c 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ExportToResourceBundleResolution.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ExportToResourceBundleResolution.java
@@ -12,10 +12,10 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IMarkerResolution2;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
+import org.eclipselabs.tapiji.tools.core.ui.dialogs.CreateResourceBundleEntryDialog;
 
 import util.ASTutils;
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
-import at.ac.tuwien.inso.eclipse.i18n.ui.dialogs.CreateResourceBundleEntryDialog;
 
 public class ExportToResourceBundleResolution implements IMarkerResolution2 {
 
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleDefReference.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleDefReference.java
index 58fefe76..8352326b 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleDefReference.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleDefReference.java
@@ -14,10 +14,10 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IMarkerResolution2;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
+import org.eclipselabs.tapiji.tools.core.ui.dialogs.InsertResourceBundleReferenceDialog;
+import org.eclipselabs.tapiji.tools.core.ui.dialogs.ResourceBundleSelectionDialog;
 
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
-import at.ac.tuwien.inso.eclipse.i18n.ui.dialogs.InsertResourceBundleReferenceDialog;
-import at.ac.tuwien.inso.eclipse.i18n.ui.dialogs.ResourceBundleSelectionDialog;
 
 public class ReplaceResourceBundleDefReference implements IMarkerResolution2 {
 
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleReference.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleReference.java
index 7b18a4cb..3e92be00 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleReference.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleReference.java
@@ -14,9 +14,9 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IMarkerResolution2;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
+import org.eclipselabs.tapiji.tools.core.ui.dialogs.InsertResourceBundleReferenceDialog;
 
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
-import at.ac.tuwien.inso.eclipse.i18n.ui.dialogs.InsertResourceBundleReferenceDialog;
 
 public class ReplaceResourceBundleReference implements IMarkerResolution2 {
 
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/ConstantStringHover.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/ConstantStringHover.java
index face8493..a0e12a53 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/ConstantStringHover.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/ConstantStringHover.java
@@ -9,8 +9,8 @@
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.ui.IEditorPart;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
 
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
 import auditor.ResourceAuditVisitor;
 
 public class ConstantStringHover implements IJavaEditorTextHover {
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/MessageCompletionProposalComputer.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/MessageCompletionProposalComputer.java
index 739cce7e..f6b77524 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/MessageCompletionProposalComputer.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/MessageCompletionProposalComputer.java
@@ -18,15 +18,15 @@
 import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipselabs.tapiji.tools.core.builder.InternationalizationNature;
+import org.eclipselabs.tapiji.tools.core.builder.quickfix.CreateResourceBundle;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
+import org.eclipselabs.tapiji.translator.rbe.model.bundle.IBundleGroup;
 
 import ui.autocompletion.InsertResourceBundleReferenceProposal;
 import ui.autocompletion.MessageCompletionProposal;
 import ui.autocompletion.NewResourceBundleEntryProposal;
 import ui.autocompletion.NoActionProposal;
-import at.ac.tuwien.inso.eclipse.i18n.builder.InternationalizationNature;
-import at.ac.tuwien.inso.eclipse.i18n.builder.quickfix.CreateResourceBundle;
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
-import at.ac.tuwien.inso.eclipse.rbe.model.bundle.IBundleGroup;
 import auditor.ResourceAuditVisitor;
 
 public class MessageCompletionProposalComputer implements
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java
index 9193c764..0382ba19 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java
@@ -13,10 +13,10 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
+import org.eclipselabs.tapiji.tools.core.ui.dialogs.InsertResourceBundleReferenceDialog;
 
 import util.ASTutils;
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
-import at.ac.tuwien.inso.eclipse.i18n.ui.dialogs.InsertResourceBundleReferenceDialog;
 
 public class InsertResourceBundleReferenceProposal implements IJavaCompletionProposal {
 
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/MessageCompletionProposal.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/MessageCompletionProposal.java
index d034358d..7c43856d 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/MessageCompletionProposal.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/MessageCompletionProposal.java
@@ -5,8 +5,8 @@
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
+import org.eclipselabs.tapiji.tools.core.util.ImageUtils;
 
-import at.ac.tuwien.inso.eclipse.i18n.util.ImageUtils;
 
 public class MessageCompletionProposal implements IJavaCompletionProposal {
 
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java
index 37261d98..7477d2d1 100644
--- a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java
+++ b/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java
@@ -10,10 +10,10 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
+import org.eclipselabs.tapiji.tools.core.model.manager.ResourceBundleManager;
+import org.eclipselabs.tapiji.tools.core.ui.dialogs.CreateResourceBundleEntryDialog;
 
 import util.ASTutils;
-import at.ac.tuwien.inso.eclipse.i18n.model.manager.ResourceBundleManager;
-import at.ac.tuwien.inso.eclipse.i18n.ui.dialogs.CreateResourceBundleEntryDialog;
 
 public class NewResourceBundleEntryProposal implements IJavaCompletionProposal {"
e56f26140787fbe76b3c155c0248558287370e2c,Delta Spike,"DELTASPIKE-208 explicitely enable global alternatives

This now works on Weld, OWB with BDA enabled, etc
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 88a59724e..22dd33cb1 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -44,8 +44,10 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
@@ -60,27 +62,56 @@
  */
 public class ExcludeExtension implements Extension, Deactivatable
 {
-    private static final Logger LOG = Logger.getLogger(ExcludeExtension.class.getName());
+    private static final String GLOBAL_ALTERNATIVES = ""globalAlternatives."";
 
-    private static Boolean isWeld1Detected = false;
+    private static final Logger LOG = Logger.getLogger(ExcludeExtension.class.getName());
 
     private boolean isActivated = true;
     private boolean isGlobalAlternativeActivated = true;
     private boolean isCustomProjectStageBeanFilterActivated = true;
 
+    /**
+     * Contains the globalAlternatives which should get used
+     * KEY=Interface class name
+     * VALUE=Implementation class name
+     */
+    private Map<String, String> globalAlternatives = new HashMap<String, String>();
+
+
     @SuppressWarnings(""UnusedDeclaration"")
     protected void init(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager)
     {
         isActivated =
                 ClassDeactivationUtils.isActivated(getClass());
 
-        isGlobalAlternativeActivated =
-                ClassDeactivationUtils.isActivated(GlobalAlternative.class);
-
         isCustomProjectStageBeanFilterActivated =
                 ClassDeactivationUtils.isActivated(CustomProjectStageBeanFilter.class);
 
-        isWeld1Detected = isWeld1(beanManager);
+        isGlobalAlternativeActivated =
+                ClassDeactivationUtils.isActivated(GlobalAlternative.class);
+        if (isGlobalAlternativeActivated)
+        {
+            Map<String, String> allProperties = ConfigResolver.getAllProperties();
+            for (Map.Entry<String, String> property : allProperties.entrySet())
+            {
+                if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
+                {
+                    String interfaceName = property.getKey().substring(GLOBAL_ALTERNATIVES.length());
+                    String implementation = property.getValue();
+                    if (LOG.isLoggable(Level.FINE))
+                    {
+                        LOG.fine(""Enabling global alternative for interface "" + interfaceName + "": "" + implementation);
+                    }
+
+                    globalAlternatives.put(interfaceName, implementation);
+                }
+            }
+
+            if (globalAlternatives.isEmpty())
+            {
+                isGlobalAlternativeActivated = false;
+            }
+        }
     }
 
     /**
@@ -101,9 +132,9 @@ protected void initProjectStage(@Observes AfterDeploymentValidation afterDeploym
     protected void vetoBeans(@Observes ProcessAnnotatedType processAnnotatedType, BeanManager beanManager)
     {
         //we need to do it before the exclude logic to keep the @Exclude support for global alternatives
-        if (isGlobalAlternativeActivated && isWeld1Detected)
+        if (isGlobalAlternativeActivated)
         {
-            activateGlobalAlternativesWeld1(processAnnotatedType, beanManager);
+            activateGlobalAlternatives(processAnnotatedType, beanManager);
         }
 
         if (isCustomProjectStageBeanFilterActivated)
@@ -158,8 +189,8 @@ protected void vetoCustomProjectStageBeans(ProcessAnnotatedType processAnnotated
 
 
 
-    private void activateGlobalAlternativesWeld1(ProcessAnnotatedType processAnnotatedType,
-                                                 BeanManager beanManager)
+    private void activateGlobalAlternatives(ProcessAnnotatedType processAnnotatedType,
+                                            BeanManager beanManager)
     {
         Class<Object> currentBean = processAnnotatedType.getAnnotatedType().getJavaClass();
 
@@ -184,7 +215,7 @@ private void activateGlobalAlternativesWeld1(ProcessAnnotatedType processAnnotat
         {
             alternativeBeanAnnotations = new HashSet<Annotation>();
 
-            configuredBeanName = ConfigResolver.getPropertyValue(currentType.getName());
+            configuredBeanName = globalAlternatives.get(currentType.getName());
             if (configuredBeanName != null && configuredBeanName.length() > 0)
             {
                 alternativeBeanClass = ClassUtils.tryToLoadClassForName(configuredBeanName);
@@ -442,26 +473,6 @@ private void veto(ProcessAnnotatedType processAnnotatedType, String vetoType)
                 processAnnotatedType.getAnnotatedType().getJavaClass());
     }
 
-    private boolean isWeld1(BeanManager beanManager)
-    {
-        if (beanManager.getClass().getName().startsWith(""org.apache""))
-        {
-            return false;
-        }
-
-        if (beanManager.getClass().getName().startsWith(""org.jboss.weld""))
-        {
-            String version = getJarVersion(beanManager.getClass());
-
-            if (version != null && version.startsWith(""1.""))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private static String getJarVersion(Class targetClass)
     {
         String manifestFileLocation = getManifestFileLocationOfClass(targetClass);
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
index b935ffcb8..ba2908684 100644
--- a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
+++ b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
@@ -20,10 +20,10 @@ org.apache.deltaspike.core.spi.activation.ClassDeactivator=org.apache.deltaspike
 testProperty02=test_value_02
 db=prodDB
 
-org.apache.deltaspike.test.core.api.alternative.global.BaseBean1=org.apache.deltaspike.test.core.api.alternative.global.SubBaseBean2
-org.apache.deltaspike.test.core.api.alternative.global.BaseInterface1=org.apache.deltaspike.test.core.api.alternative.global.BaseInterface1AlternativeImplementation
+globalAlternatives.org.apache.deltaspike.test.core.api.alternative.global.BaseBean1=org.apache.deltaspike.test.core.api.alternative.global.SubBaseBean2
+globalAlternatives.org.apache.deltaspike.test.core.api.alternative.global.BaseInterface1=org.apache.deltaspike.test.core.api.alternative.global.BaseInterface1AlternativeImplementation
 
-org.apache.deltaspike.test.core.api.alternative.global.qualifier.BaseInterface=org.apache.deltaspike.test.core.api.alternative.global.qualifier.AlternativeBaseBeanB
+globalAlternatives.org.apache.deltaspike.test.core.api.alternative.global.qualifier.BaseInterface=org.apache.deltaspike.test.core.api.alternative.global.qualifier.AlternativeBaseBeanB
 
 configProperty1=14
 configProperty2=7"
c251c539b5e9aaf8b1e8f957254917c0b18e850d,apache$maven-plugins,"[MCHANGES-168]: Fix non-Latin-script character handling.
The actual repair here was the change to maven-reporting-impl version 2.1. However, I then went off and set up a 
way to test JIRA functionality without actually talking to JIRA. That involved a bit of refactoring and mocking.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1131489 13f79535-47bb-0310-9956-ffa450edef68
",p,https://github.com/apache/maven-plugins,"diff --git a/maven-changes-plugin/pom.xml b/maven-changes-plugin/pom.xml
index ed3fb521c4..08bec40dc7 100644
--- a/maven-changes-plugin/pom.xml
+++ b/maven-changes-plugin/pom.xml
@@ -122,7 +122,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0.5</version>
+      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
diff --git a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
index dfb64e2e32..234ebb8b66 100644
--- a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
+++ b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
@@ -174,7 +174,7 @@ public void execute()
         {
             DecorationModel model = new DecorationModel();
             model.setBody( new Body() );
-            Map attributes = new HashMap();
+            Map<String, String> attributes = new HashMap<String, String>();
             attributes.put( ""outputEncoding"", getOutputEncoding() );
             Locale locale = Locale.getDefault();
             SiteRenderingContext siteContext = siteRenderer.createContextForSkin( getSkinArtifactFile(), attributes,
diff --git a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
index 777c3e430c..1063044f6a 100644
--- a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
+++ b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
@@ -69,7 +69,7 @@ public abstract class AbstractJiraDownloader
     private static final String UTF_8 = ""UTF-8"";
 
     /** Log for debug output. */
-    private Log log;
+    protected Log log;
     /** Output file for xml document. */
     private File output;
     /** The maximum number of entries to show. */
@@ -111,7 +111,7 @@ public abstract class AbstractJiraDownloader
     /** Mapping containing all allowed JIRA type values. */
     protected final Map<String,String> typeMap = new HashMap<String,String>( 8 );
     /** The pattern used to parse dates from the JIRA xml file. */
-    private String jiraDatePattern;
+    protected String jiraDatePattern;
 
     /**
      * Creates a filter given the parameters and some defaults.
@@ -421,7 +421,12 @@ public void doExecute()
         }
         catch ( Exception e )
         {
-            getLog().error( ""Error accessing "" + project.getIssueManagement().getUrl(), e );
+            if ( project.getIssueManagement() != null)
+            {
+                getLog().error( ""Error accessing "" + project.getIssueManagement().getUrl(), e );
+            } else {
+                getLog().error( ""Error accessing mock project issues"", e );
+            }
         }
     }
 
diff --git a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
index 4e31627fdd..3b677b415d 100644
--- a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
+++ b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
@@ -295,6 +295,11 @@ public class JiraMojo
      * @parameter default-value=""""
      */
     private String webUser;
+    
+    /*
+     * Used for tests.
+     */
+    private AbstractJiraDownloader mockDownloader;
 
     /* --------------------------------------------------------------------- */
     /* Public methods                                                        */
@@ -305,6 +310,10 @@ public class JiraMojo
      */
     public boolean canGenerateReport()
     {
+        if ( mockDownloader != null) 
+        {
+            return true;
+        }
         return ProjectUtils.validateIfIssueManagementComplete( project, ""JIRA"", ""JIRA Report"", getLog() );
     }
 
@@ -323,7 +332,13 @@ public void executeReport( Locale locale )
         try
         {
             // Download issues
-            JiraDownloader issueDownloader = new JiraDownloader();
+            AbstractJiraDownloader issueDownloader;
+            if ( mockDownloader != null) 
+            {
+                issueDownloader = mockDownloader;
+            } else {
+                issueDownloader = new JiraDownloader();
+            }
             configureIssueDownloader( issueDownloader );
             issueDownloader.doExecute();
 
@@ -386,7 +401,7 @@ private ResourceBundle getBundle( Locale locale )
         return ResourceBundle.getBundle( ""jira-report"", locale, this.getClass().getClassLoader() );
     }
 
-    private void configureIssueDownloader( JiraDownloader issueDownloader )
+    private void configureIssueDownloader( AbstractJiraDownloader issueDownloader )
     {
         issueDownloader.setLog( getLog() );
 
@@ -424,4 +439,14 @@ private void configureIssueDownloader( JiraDownloader issueDownloader )
 
         issueDownloader.setSettings( settings );
     }
+
+    public void setMockDownloader( AbstractJiraDownloader mockDownloader )
+    {
+        this.mockDownloader = mockDownloader;
+    }
+
+    public AbstractJiraDownloader getMockDownloader()
+    {
+        return mockDownloader;
+    }
 }
diff --git a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
index 3f03363212..0e4ce55487 100644
--- a/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
+++ b/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
@@ -20,6 +20,8 @@
  */
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -34,14 +36,14 @@
 import org.apache.maven.plugin.issues.Issue;
 import org.apache.maven.plugin.logging.Log;
 import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * XML parser that extracts <code>Issue</code>s from JIRA. This works on an XML
- * file downloaded from JIRA and creates a <code>List</code> of issues that is
- * exposed to the user of the class.
- *
+ * XML parser that extracts <code>Issue</code>s from JIRA. This works on an XML file downloaded from JIRA and creates a
+ * <code>List</code> of issues that is exposed to the user of the class.
+ * 
  * @version $Id$
  */
 public class JiraXML
@@ -64,7 +66,6 @@ public class JiraXML
     private SimpleDateFormat sdf = null;
 
     /**
-     *
      * @param log not null.
      * @param datePattern may be null.
      * @since 2.4
@@ -89,29 +90,49 @@ public JiraXML( Log log, String datePattern )
 
     /**
      * Parse the given xml file. The list of issues can then be retrieved with {@link #getIssueList()}.
-     *
+     * 
      * @param xmlPath the file to pares.
-     * @throws MojoExecutionException 
-     *
+     * @throws MojoExecutionException
      * @since 2.4
      */
-    public void parseXML( File xmlPath ) throws MojoExecutionException
+    public void parseXML( File xmlPath )
+        throws MojoExecutionException
     {
-        parse( xmlPath );
+        FileInputStream xmlStream = null;
+        try
+        {
+            InputSource inputSource = new InputSource( xmlStream );
+            parse( inputSource );
+        }
+        finally
+        {
+            if ( xmlStream != null )
+            {
+                try
+                {
+                    xmlStream.close();
+                }
+                catch ( IOException e )
+                {
+                    //
+                }
+            }
+        }
     }
 
-    private void parse( File xmlPath ) throws MojoExecutionException
+    void parse( InputSource xmlSource )
+        throws MojoExecutionException
     {
         try
         {
             SAXParserFactory factory = SAXParserFactory.newInstance();
             SAXParser saxParser = factory.newSAXParser();
 
-            saxParser.parse( xmlPath, this );
+            saxParser.parse( xmlSource, this );
         }
         catch ( Throwable t )
         {
-            throw new MojoExecutionException ( ""Failed to parse JIRA XML."", t );
+            throw new MojoExecutionException( ""Failed to parse JIRA XML."", t );
         }
     }
 
diff --git a/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java b/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
new file mode 100644
index 0000000000..113b1af698
--- /dev/null
+++ b/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.plugin.jira;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+
+/**
+ *
+ */
+public class JiraUnicodeTestCase extends AbstractMojoTestCase
+{
+    /*
+     * Something in Doxia escapes all non-Ascii even when the charset is UTF-8.
+     * This test will fail if that ever changes.
+     */
+    private final static String TEST_TURTLES = ""&#x6d77;&#x9f9f;&#x4e00;&#x8def;&#x4e0b;&#x8dcc;&#x3002;"";
+    public void testUnicodeReport() throws Exception {
+        
+        File pom = new File( getBasedir(), ""/src/test/unit/jira-plugin-config.xml"" );
+        assertNotNull( pom );
+        assertTrue( pom.exists() );
+
+        JiraMojo mojo = (JiraMojo) lookupMojo( ""jira-report"", pom );
+        InputStream testJiraXmlStream = JiraUnicodeTestCase.class.getResourceAsStream( ""unicode-jira-results.xml"" );
+        String jiraXml = IOUtils.toString( testJiraXmlStream, ""utf-8"" );
+        MockJiraDownloader mockDownloader = new MockJiraDownloader();
+        mockDownloader.setJiraXml( jiraXml );
+        mojo.setMockDownloader( mockDownloader );
+        File outputDir = new File ( ""target/jira-test-output"" );
+        outputDir.mkdirs();
+        mojo.setReportOutputDirectory( outputDir );
+        mojo.execute();
+        String reportHtml = FileUtils.readFileToString( new File( outputDir, ""jira-report.html"" ),
+                                                        ""utf-8"" ); 
+        int turtleIndex = reportHtml.indexOf( TEST_TURTLES );
+        assertTrue ( turtleIndex >= 0 );
+    }
+
+}
diff --git a/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java b/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
new file mode 100644
index 0000000000..7937bd7ac6
--- /dev/null
+++ b/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.plugin.jira;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+
+/**
+ */
+public class JiraUnicodeTestProjectStub
+    extends MavenProjectStub
+{
+
+    /** {@inheritDoc} */
+    @Override
+    public List<ArtifactRepository> getRemoteArtifactRepositories()
+    {
+        ArtifactRepository repository = new DefaultArtifactRepository( ""central"", ""http://repo1.maven.org/maven2"",
+                                                                       new DefaultRepositoryLayout() );
+
+        return Collections.singletonList( repository );
+    }
+
+}
diff --git a/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java b/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java
new file mode 100644
index 0000000000..02d27d8ae4
--- /dev/null
+++ b/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/MockJiraDownloader.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.plugin.jira;
+
+import java.io.StringReader;
+import java.util.List;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.issues.Issue;
+import org.xml.sax.InputSource;
+
+/**
+ * Allow test cases in the jira mojo without actually talking to jira.
+ *
+ */
+public class MockJiraDownloader extends AbstractJiraDownloader
+{
+    @Override
+    public void doExecute()
+        throws Exception
+    {
+        // do nothing
+    }
+
+    private String jiraXml;
+    @Override
+    public List<Issue> getIssueList()
+        throws MojoExecutionException
+    {
+        JiraXML jira = new JiraXML( log, jiraDatePattern );
+        InputSource inputSource = new InputSource ( new StringReader( jiraXml ));
+        jira.parse( inputSource );
+        log.info( ""The JIRA version is '"" + jira.getJiraVersion() + ""'"" );
+        return jira.getIssueList();
+    }
+
+    public void setJiraXml( String jiraXml )
+    {
+        this.jiraXml = jiraXml;
+    }
+
+    public String getJiraXml()
+    {
+        return jiraXml;
+    }
+
+}
diff --git a/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/jira/unicode-jira-results.xml b/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/jira/unicode-jira-results.xml
new file mode 100644
index 0000000000..00b337c77e
--- /dev/null
+++ b/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/jira/unicode-jira-results.xml
@@ -0,0 +1,309 @@
+<!--  RSS generated by JIRA (Enterprise Edition, Version: 3.13.2-#335) at Wed Aug 05 14:43:20 EEST 2009 -->
+<!-- If you wish to do custom client-side styling of RSS, uncomment this:
+<?xml-stylesheet href=""http://pcsjira.slg.gr/styles/jiraxml2html.xsl"" type=""text/xsl""?>
+-->
+<rss version=""0.92"" >
+<channel>
+    <title>Professional Computer Services S.A. JIRA</title>
+    <link>http://pcsjira.slg.gr/secure/IssueNavigator.jspa?reset=true&amp;pid=10101&amp;status=6&amp;resolution=1&amp;sorter/field=created&amp;sorter/order=DESC&amp;sorter/field=priority&amp;sorter/order=DESC</link>
+    <description>An XML representation of a search request</description>
+    <language>en-us</language>     <issue start=""0"" end=""2"" total=""2"" />     <build-info>
+        <version>3.13.2</version>
+        <build-number>335</build-number>
+        <build-date>26-11-2008</build-date>
+        <edition>Enterprise</edition>
+    </build-info>
+
+<item>
+<title>[PCSUNIT-2] 海龟一路下跌。 &#913;&#960;&#949;&#953;&#954;&#972;&#957;&#953;&#963;&#951; &#963;&#949; EXCEL &#964;&#969;&#957; data &#964;&#969;&#957; &#966;&#959;&#961;&#956;&#974;&#957;. &#928;&#949;&#961;&#943;&#960;&#964;&#969;&#963;&#951; &#956;&#949; &#960;&#959;&#955;&#955;&#940; blocks</title>
+<link>http://pcsjira.slg.gr/browse/PCSUNIT-2</link>
+
+                    <description></description>
+                <environment></environment>
+            <key id=""11137"">PCSUNIT-2</key>
+        <summary>海龟一路下跌。 &#913;&#960;&#949;&#953;&#954;&#972;&#957;&#953;&#963;&#951; &#963;&#949; EXCEL &#964;&#969;&#957; data &#964;&#969;&#957; &#966;&#959;&#961;&#956;&#974;&#957;. &#928;&#949;&#961;&#943;&#960;&#964;&#969;&#963;&#951; &#956;&#949; &#960;&#959;&#955;&#955;&#940; blocks</summary>
+
+            <type id=""4"" iconUrl=""http://pcsjira.slg.gr/images/icons/improvement.gif"">Improvement</type>
+
+    
+            <priority id=""6"" iconUrl=""http://pcsjira.slg.gr/images/icons/priority_minor.gif"">Normal</priority>    
+        <status id=""6"" iconUrl=""http://pcsjira.slg.gr/images/icons/status_closed.gif"">Closed</status>
+                        <resolution id=""1"">Fixed</resolution>
+            
+            <security id=""10000"">Internal Issue</security>
+    
+                        <assignee username=""nikoss"">Nikolaos Stais</assignee>
+            
+                        <reporter username=""nikoss"">Nikolaos Stais</reporter>
+            
+    <created>Wed, 18 Mar 2009 11:04:28 +0200 (EET)</created>
+    <updated>Thu, 23 Apr 2009 13:22:19 +0300 (EEST)</updated>
+
+                
+                
+                
+            <due></due>
+    
+            <votes>0</votes>
+    
+    
+
+            <comments>
+                    <comment id=""11583"" author=""nikoss"" created=""Thu, 19 Mar 2009 16:25:17 +0200 (EET)""   rolelevel=""PCS Internal"" >&#917;&#967;&#949;&#953; &#960;&#961;&#945;&#947;&#956;&#945;&#964;&#959;&#960;&#959;&#953;&#951;&#952;&#949;&#943; &#956;&#953;&#945; &#960;&#961;&#974;&#964;&#951; &#960;&#961;&#959;&#963;&#941;&#947;&#947;&#953;&#963;&#951; &#954; &#965;&#955;&#959;&#960;&#959;&#943;&#951;&#963;&#951;, &#967;&#961;&#949;&#953;&#940;&#950;&#949;&#964;&#945;&#953; &#932;&#917;&#931;&#932;</comment>
+                </comments>
+    
+    <attachments>
+        </attachments>
+
+    <subtasks>
+        </subtasks>
+
+            <customfields>
+                                                        <customfield id=""customfield_10011"" key=""com.atlassian.jira.plugin.system.customfieldtypes:float"">
+                    <customfieldname>&#913;/&#919;</customfieldname>
+                    <customfieldvalues>
+                        <customfieldvalue>2.0</customfieldvalue>
+                    </customfieldvalues>
+                </customfield>
+                        </customfields>
+    
+</item>
+
+<item>
+<title>[PCSUNIT-1] &#916;&#919;&#924;&#921;&#927;&#933;&#929;&#915;&#921;&#913; &#916;&#921;&#913;&#916;&#921;&#922;&#913;&#931;&#921;&#913;&#931; &#915;&#921;&#913; UNDO CHANGES</title>
+<link>http://pcsjira.slg.gr/browse/PCSUNIT-1</link>
+
+                    <description></description>
+                <environment></environment>
+            <key id=""10051"">PCSUNIT-1</key>
+        <summary>&#916;&#919;&#924;&#921;&#927;&#933;&#929;&#915;&#921;&#913; &#916;&#921;&#913;&#916;&#921;&#922;&#913;&#931;&#921;&#913;&#931; &#915;&#921;&#913; UNDO CHANGES</summary>
+
+            <type id=""2"" iconUrl=""http://pcsjira.slg.gr/images/icons/newfeature.gif"">New Feature</type>
+
+    
+            <priority id=""4"" iconUrl=""http://pcsjira.slg.gr/images/icons/priority_minor.gif"">Minor</priority>    
+        <status id=""6"" iconUrl=""http://pcsjira.slg.gr/images/icons/status_closed.gif"">Closed</status>
+                        <resolution id=""1"">Fixed</resolution>
+            
+            <security id=""10000"">Internal Issue</security>
+    
+                        <assignee username=""nikoss"">Nikolaos Stais</assignee>
+            
+                        <reporter username=""nikoss"">Nikolaos Stais</reporter>
+            
+    <created>Wed, 4 Feb 2009 13:47:25 +0200 (EET)</created>
+    <updated>Wed, 13 May 2009 13:32:49 +0300 (EEST)</updated>
+
+                
+                
+                
+            <due></due>
+    
+            <votes>0</votes>
+    
+    
+
+            <comments>
+                    <comment id=""10039"" author=""nikoss"" created=""Thu, 5 Feb 2009 10:07:35 +0200 (EET)""  >&#904;&#947;&#953;&#957;&#949; &#956;&#953;&#945; &#960;&#961;&#974;&#964;&#951; &#960;&#961;&#959;&#963;&#941;&#947;&#947;&#953;&#963;&#951; &#954;&#945;&#953; &#949;&#957;&#951;&#956;&#941;&#961;&#969;&#963;&#951; &#963;&#965;&#957;&#945;&#948;&#941;&#955;&#966;&#969;&#957;. &#931;&#949; &#945;&#957;&#945;&#956;&#959;&#957;&#942; &#948;&#959;&#954;&#953;&#956;&#942;&#962; &#945;&#960;&#972; &#964;&#959;&#965;&#962; &#949;&#957;&#948;&#953;&#945;&#966;&#949;&#961;&#972;&#956;&#949;&#957;&#959;&#965;&#962;.</comment>
+                    <comment id=""13509"" author=""nikoss"" created=""Wed, 13 May 2009 13:32:34 +0300 (EEST)""  >&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#904;&#967;&#959;&#957;&#964;&#945;&#962; &#955;&#940;&#946;&#949;&#953; &#954;&#940;&#960;&#959;&#953;&#945; requests &#945;&#960;&#972; &#960;&#949;&#955;&#940;&#964;&#949;&#962; &#959;&#953; &#959;&#960;&#959;&#943;&#959;&#953; &#949;&#960;&#953;&#952;&#965;&#956;&#959;&#973;&#957; &#957;&#945; &#954;&#940;&#957;&#959;&#965;&#957; undo &#963;&#949; batch &#961;&#959;&#941;&#962;,
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#952;&#949;&#969;&#961;&#974; &#972;&#964;&#953; &#965;&#960;&#940;&#961;&#967;&#949;&#953; &#941;&#957;&#945;&#962; &#949;&#973;&#954;&#959;&#955;&#959;&#962; &#964;&#961;&#972;&#960;&#959;&#962; &#957;&#945; &#964;&#959; &#960;&#949;&#964;&#973;&#967;&#959;&#965;&#956;&#949;, &#960;&#961;&#959;&#954;&#949;&#953;&#956;&#941;&#957;&#959;&#965; &#957;&#945; &#945;&#960;&#959;&#966;&#973;&#947;&#959;&#965;&#956;&#949; &#957;&#945; &#954;&#961;&#945;&#964;&#940;&#956;&#949; &#953;&#963;&#964;&#959;&#961;&#953;&#954;&#972;&#964;&#951;&#964;&#945; &#963;&#964;&#953;&#962; &#945;&#955;&#955;&#945;&#947;&#941;&#962; (&#960;&#959;&#965; &#941;&#969;&#962; &#964;&#974;&#961;&#945; &#952;&#945; &#954;&#940;&#957;&#945;&#956;&#949; commit).
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#932;&#959; &#963;&#965;&#947;&#954;&#949;&#954;&#961;&#953;&#956;&#941;&#957;&#959; &#952;&#941;&#956;&#945; &#948;&#949;&#957; &#941;&#967;&#949;&#953; &#949;&#966;&#945;&#961;&#956;&#959;&#963;&#964;&#949;&#943; (&#945;&#960;&#972; &#972;&#963;&#959; &#958;&#941;&#961;&#969;) &#956;&#949; &#964;&#961;&#972;&#960;&#959; &#960;&#959;&#965; &#957;&#945; &#949;&#953;&#963;&#940;&#947;&#959;&#965;&#956;&#949; &#948;&#949;&#948;&#959;&#956;&#941;&#957;&#945; &#954;&#945;&#953; &#957;&#945; &#964;&#945; &#948;&#949;&#943;&#967;&#957;&#959;&#965;&#956;&#949; &#967;&#969;&#961;&#943;&#962; &#957;&#945; &#941;&#967;&#959;&#965;&#957; &#947;&#943;&#957;&#949;&#953; commit.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#932;&#959;&#955;&#956;&#974; &#957;&#945; &#954;&#940;&#957;&#969; &#956;&#953;&#945; &#960;&#961;&#972;&#964;&#945;&#963;&#951; &#960;&#961;&#959;&#962; &#948;&#953;&#949;&#961;&#949;&#973;&#957;&#951;&#963;&#951; ... J
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#920;&#949;&#969;&#961;&#951;&#964;&#953;&#954;&#940; &#952;&#945; &#956;&#960;&#959;&#961;&#959;&#973;&#956;&#949; &#960;.&#967;. &#957;&#945; &#954;&#940;&#957;&#959;&#965;&#956;&#949; &#949;&#957;&#951;&#956;&#941;&#961;&#969;&#963;&#951; &#956;&#949; &#964;&#953;&#956;&#942; &#957;&#945; &#946;&#955;&#941;&#960;&#959;&#965;&#956;&#949; &#964;&#953; &#956;&#949;&#961;&#943;&#948;&#953;&#945; &#941;&#967;&#959;&#965;&#957; &#954;&#959;&#960;&#949;&#943; (&#954;&#945;&#955;&#974;&#957;&#964;&#945;&#962; &#964;&#951;&#957; inv3) &#954;&#945;&#953; &#956;&#949;&#964;&#940; &#945;&#957; &#948;&#949; &#960;&#945;&#964;&#940;&#956;&#949; &#964;&#959; &#959;&#961;&#953;&#963;&#964;&#953;&#954;&#972; commit button, &#946;&#947;&#945;&#943;&#957;&#959;&#957;&#964;&#945;&#962; &#945;&#960;&#972; &#964;&#951;&#957; 
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#959;&#952;&#972;&#957;&#951; &#952;&#945; &#949;&#943;&#957;&#945;&#953; &#963;&#945;&#957; &#957;&#945; &#956;&#951;&#957; &#941;&#967;&#959;&#965;&#956;&#949; &#954;&#940;&#957;&#949;&#953; &#964;&#943;&#960;&#959;&#964;&#945;.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#919; &#972;&#955;&#951; &#948;&#959;&#965;&#955;&#949;&#943;&#945; &#947;&#943;&#957;&#949;&#964;&#945;&#953; &#956;&#949; &#945;&#955;&#955;&#945;&#947;&#941;&#962; &#963;&#964;&#945; &#949;&#958;&#942;&#962; &#963;&#951;&#956;&#949;&#943;&#945;.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#931;&#964;&#959;&#957; ON-COMMIT trigger (form-level).
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#931;&#964;&#959;&#957; &#922;&#917;&#933;-COMMIT trigger (form-level)
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#931;&#964;&#959;&#957; KEY-EXIT trigger (form-level)
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#931;&#964;&#959;&#957; KEY-ENTQRY trigger (form-level)
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#927;&#960;&#969;&#963;&#948;&#942;&#960;&#959;&#964;&#949; &#945;&#957; &#965;&#960;&#940;&#961;&#967;&#959;&#965;&#957; &#945;&#957;&#964;&#943;&#963;&#964;&#959;&#953;&#967;&#959;&#953; triggers &#963;&#949; block-level, &#964;&#972;&#964;&#949; &#960;&#961;&#941;&#960;&#949;&#953; &#957;&#945; &#949;&#960;&#949;&#958;&#949;&#961;&#947;&#945;&#963;&#964;&#959;&#973;&#957; &#954;&#945;&#964;&#940;&#955;&#955;&#951;&#955;&#945;.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#931;&#964;&#951;&#957; &#959;&#965;&#963;&#943;&#945;, &#948;&#949;&#957; &#954;&#940;&#957;&#959;&#965;&#956;&#949; &#960;&#959;&#964;&#941; commit (&#945;&#955;&#955;&#940; POST;?&#963;&#964;&#941;&#955;&#957;&#949;&#953; &#964;&#945; records &#963;&#964;&#951; &#946;&#940;&#963;&#951;), &#960;&#945;&#961;&#940; &#956;&#972;&#957;&#959; &#960;&#945;&#964;&#974;&#957;&#964;&#945;&#962; &#964;&#959; &#954;&#959;&#965;&#956;&#960;&#943; REAL COMMIT.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#924;&#960;&#959;&#961;&#949;&#943;&#964;&#949; &#957;&#945; &#948;&#949;&#943;&#964;&#949; &#964;&#945; form1.fmb , form2.fmb &#960;&#959;&#965; &#965;&#960;&#940;&#961;&#967;&#959;&#965;&#957; &#963;&#964;&#959; Y:\MFHELLAS_10G\Exedir
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#942; &#954;&#945;&#953; &#957;&#945; &#964;&#949;&#963;&#964;&#940;&#961;&#949;&#964;&#949; &#964;&#959; &#949;&#958;&#942;&#962; &#963;&#949;&#957;&#940;&#961;&#953;&#959;(&lt;a href=&quot;http://dioskouros:7778/forms90/f90servlet?config=test_undo&quot;&gt;http://dioskouros:7778/forms90/f90servlet?config=test_undo&lt;/a&gt;)
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#963;&#964;&#951;&#957; &#960;&#961;&#940;&#958;&#951;:
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#919; form1 &#946;&#955;&#941;&#960;&#949;&#953; &#941;&#957;&#945; &#945;&#960;&#955;&#972; &#960;&#943;&#957;&#945;&#954;&#945; &#956;&#949; 2 &#963;&#964;&#942;&#955;&#949;&#962;. &#922;&#940;&#952;&#949; &#966;&#959;&#961;&#940; &#960;&#959;&#965; &#949;&#953;&#963;&#940;&#947;&#969; &#956;&#953;&#945; &#949;&#947;&#947;&#961;&#945;&#966;&#942; &#954;&#945;&#953; &#960;&#945;&#964;&#940;&#969; F10 &#946;&#955;&#941;&#960;&#969; &#956;&#942;&#957;&#965;&#956;&#945;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;quot;1 record applied&amp;quot; (&#951; &#948;&#953;&#945;&#966;&#959;&#961;&#940; &#966;&#945;&#943;&#957;&#949;&#964;&#945;&#953; &#954; &#949;&#948;&#974;, &#948;&#951;&#955;. &#948;&#949;&#957; &#955;&#941;&#949;&#953;: &amp;quot;1 record applied and saved&amp;quot;, &#955;&#949;&#943;&#960;&#949;&#953; &#964;&#959; &amp;quot;saved&amp;quot;=&#948;&#949;&#957; &#941;&#967;&#949;&#953; &#954;&#940;&#957;&#949;&#953; commit &#963;&#964;&#951; &#946;&#940;&#963;&#951; &#945;&#955;&#955;&#940; &#941;&#967;&#949;&#953; &#963;&#964;&#949;&#943;&#955;&#949;&#953; &#964;&#945; record &#963;&#964;&#951; &#946;&#940;&#963;&#951; &#947;&#953;&#945; &#957;&#945; &#956;&#960;&#959;&#961;&#959;&#973;&#957; &#940;&#955;&#955;&#949;&#962; &#959;&#952;&#972;&#957;&#949;&#962; &#957;&#945; &#964;&#945; &#954;&#940;&#957;&#959;&#965;&#957; query.)
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#913;&#957; &#954;&#945;&#955;&#941;&#963;&#959;&#965;&#956;&#949; &#964;&#951; &#948;&#949;&#973;&#964;&#949;&#961;&#951; &#959;&#952;&#972;&#957;&#951; form2, &#956;&#960;&#959;&#961;&#959;&#973;&#956;&#949; &#957;&#945; &#954;&#940;&#957;&#959;&#965;&#956;&#949; query &#964;&#953;&#962; &#945;&#955;&#955;&#945;&#947;&#941;&#962;(insert,delete,update + F10)  &#960;&#959;&#965; &#960;&#961;&#945;&#947;&#956;&#945;&#964;&#959;&#960;&#959;&#953;&#942;&#963;&#945;&#956;&#949; &#963;&#964;&#951;&#957; &#959;&#952;&#972;&#957;&#951; form1.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#913;&#957; &#963;&#964;&#951;&#957; &#943;&#948;&#953;&#945; &#959;&#952;&#972;&#957;&#951; (form1) &#954;&#940;&#957;&#959;&#965;&#956;&#949; F7 &#967;&#969;&#961;&#943;&#962; &#957;&#945; &#954;&#940;&#957;&#959;&#965;&#956;&#949; F10 (&#956;&#949;&#964;&#940; &#964;&#951;&#957; &#945;&#955;&#955;&#945;&#947;&#942;) &#951; &#959;&#952;&#972;&#957;&#951; &#967;&#940;&#957;&#949;&#953; &#964;&#953;&#962; &#945;&#955;&#955;&#945;&#947;&#941;&#962; (&#960;&#961;&#959;&#947;&#961;&#945;&#956;&#956;&#945;&#964;&#953;&#963;&#964;&#953;&#954;&#940; &#949;&#960;&#943;&#964;&#951;&#948;&#949;&#962;, &#960;&#961;&#959;&#962; &#945;&#960;&#959;&#966;&#965;&#947;&#942; &#964;&#951;&#962; &#949;&#961;&#974;&#964;&#951;&#963;&#951;&#962; save changes?)
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#914;&#947;&#945;&#943;&#957;&#959;&#957;&#964;&#945;&#962; &#945;&#960;&#972; &#964;&#953;&#962; &#948;&#973;&#959; &#959;&#952;&#972;&#957;&#949;&#962; &#967;&#969;&#961;&#943;&#962; &#957;&#945; &#960;&#945;&#964;&#942;&#963;&#959;&#965;&#956;&#949; &#964;&#959; button REAL COMMIT, &#972;&#955;&#949;&#962; &#959;&#953; &#945;&#955;&#955;&#945;&#947;&#941;&#962; &#960;&#959;&#965; &#954;&#940;&#957;&#945;&#956;&#949; &#963;&#964;&#951;&#957; form1 &#954;&#945;&#953; &#964;&#953;&#962; &#949;&#943;&#948;&#945;&#956;&#949; &#963;&#964;&#951; 2&#951; &#959;&#952;&#972;&#957;&#951; form2 &#948;&#949;&#957; &#941;&#967;&#959;&#965;&#957; &#963;&#969;&#952;&#949;&#943;.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#932;&#945; insert, update, delete &#956;&#960;&#959;&#961;&#959;&#973;&#957; &#957;&#945; &#947;&#943;&#957;&#959;&#965;&#957; &#954;&#945;&#953; &#960;&#961;&#959;&#947;&#961;&#945;&#956;&#956;&#945;&#964;&#953;&#963;&#964;&#953;&#954;&#940;. &#931;&#964;&#951;&#957; &#959;&#952;&#972;&#957;&#951; form1 &#963;&#964;&#959;&#957; ON-INSERT trigger &#964;&#959;&#965; block, &#965;&#960;&#940;&#961;&#967;&#949;&#953; &#947;&#953;&#945; &#955;&#972;&#947;&#959;&#965;&#962; &#964;&#949;&#963;&#964; &#941;&#957;&#945; insert, &#964;&#959; &#959;&#960;&#959;&#943;&#959; &#955;&#949;&#953;&#964;&#959;&#965;&#961;&#947;&#949;&#943; &#956;&#949; &#954;&#940;&#952;&#949; &#957;&#941;&#945; &#949;&#947;&#947;&#961;&#945;&#966;&#942;.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#928;&#945;&#961;&#945;&#954;&#945;&#955;&#974; &#947;&#953;&#945; &#964;&#945; &#963;&#967;&#972;&#955;&#953;&#945; &#963;&#945;&#962; &#954;&#945;&#953; &#953;&#948;&#953;&#945;&#943;&#964;&#949;&#961;&#945; &#947;&#953;&#945; &#964;&#959;&#965;&#962; &#949;&#957;&#948;&#949;&#967;&#972;&#956;&#949;&#957;&#959;&#965;&#962; &#954;&#953;&#957;&#948;&#973;&#957;&#959;&#965;&#962;, &#945;&#957; &#963;&#945;&#962; &#964;&#959; &#949;&#960;&#953;&#964;&#961;&#941;&#960;&#949;&#953; &#959; &#967;&#961;&#972;&#957;&#959;&#962; &#963;&#945;&#962;.
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&amp;nbsp;
+&lt;br/&gt;
+
+&lt;br/&gt;
+&#917;&#965;&#967;&#945;&#961;&#953;&#963;&#964;&#974; &#960;&#959;&#955;&#973;,
+&lt;br/&gt;
+
+&lt;br/&gt;
+</comment>
+                </comments>
+    
+    <attachments>
+        </attachments>
+
+    <subtasks>
+        </subtasks>
+
+            <customfields>
+                                    <customfield id=""customfield_10001"" key=""com.atlassian.jira.plugin.system.customfieldtypes:textfield"">
+                    <customfieldname>Screen Code</customfieldname>
+                    <customfieldvalues>
+                        <customfieldvalue>&#920;&#917;&#937;&#929;&#921;&#932;&#921;&#922; &#913; &#917;&#934;&#913;&#929;&#924;&#927;&#915;&#919; &#931;&#917; &#927;&#923;&#917;&#931; &#932;&#921;&#931; &#927;&#920;&#927;&#925;&#917;&#931;</customfieldvalue>
+
+                    </customfieldvalues>
+                </customfield>
+                                            </customfields>
+    
+</item>
+</channel>
+</rss>
diff --git a/maven-changes-plugin/src/test/unit/jira-plugin-config.xml b/maven-changes-plugin/src/test/unit/jira-plugin-config.xml
new file mode 100644
index 0000000000..faec73ef18
--- /dev/null
+++ b/maven-changes-plugin/src/test/unit/jira-plugin-config.xml
@@ -0,0 +1,36 @@
+<?xml version=""1.0"" encoding=""ISO-8859-1""?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+""License""); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <name>changes-plugin-test</name>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-changes-plugin</artifactId>
+        <configuration>
+	  <localRepository>${localRepository}</localRepository>
+          <project implementation=""org.apache.maven.plugin.jira.JiraUnicodeTestProjectStub""/>
+	  <outputDirectory>target/jira-test-output</outputDirectory>
+	  <columnNames>Key,Summary,Status,Resolution,Assignee,Description</columnNames>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>"
541aae12ef82767479bcd53afb3681b46dd890a5,spring-framework,SPR-5802 - NullPointerException when using- @CookieValue annotation--,c,https://github.com/spring-projects/spring-framework,"diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index f6b7c4204360..e8fa23d6ac5f 100644
--- a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -600,9 +600,12 @@ protected Object resolveCookieValue(String cookieName, Class paramType, NativeWe
 			if (Cookie.class.isAssignableFrom(paramType)) {
 				return cookieValue;
 			}
-			else {
+			else if (cookieValue != null) {
 				return cookieValue.getValue();
 			}
+			else {
+				return null;
+			}
 		}
 
 		@Override"
4f79b07e174ed1f57115a6b0a9f6a6e74e6733ee,hadoop,HADOOP-6932.  Namenode start (init) fails because- of invalid kerberos key,c,https://github.com/apache/hadoop,"diff --git a/CHANGES.txt b/CHANGES.txt
index f43935c87233a..72a1e3e6ffa26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -220,6 +220,9 @@ Trunk (unreleased changes)
     HADOOP-6833. IPC leaks call parameters when exceptions thrown.
     (Todd Lipcon via Eli Collins)
 
+    HADOOP-6932.  Namenode start (init) fails because of invalid kerberos 
+    key, even when security set to ""simple"" (boryas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/java/org/apache/hadoop/security/SecurityUtil.java b/src/java/org/apache/hadoop/security/SecurityUtil.java
index 00187bd6f2401..44ef31ef32989 100644
--- a/src/java/org/apache/hadoop/security/SecurityUtil.java
+++ b/src/java/org/apache/hadoop/security/SecurityUtil.java
@@ -174,7 +174,7 @@ static String getLocalHostName() throws UnknownHostException {
   }
 
   /**
-   * If a keytab has been provided, login as that user. Substitute $host in
+   * Login as a principal specified in config. Substitute $host in
    * user's Kerberos principal name with a dynamically looked-up fully-qualified
    * domain name of the current host.
    * 
@@ -192,8 +192,9 @@ public static void login(final Configuration conf,
   }
 
   /**
-   * If a keytab has been provided, login as that user. Substitute $host in
-   * user's Kerberos principal name with hostname.
+   * Login as a principal specified in config. Substitute $host in user's Kerberos principal 
+   * name with hostname. If non-secure mode - return. If no keytab available -
+   * bail out with an exception
    * 
    * @param conf
    *          conf to use
@@ -208,9 +209,14 @@ public static void login(final Configuration conf,
   public static void login(final Configuration conf,
       final String keytabFileKey, final String userNameKey, String hostname)
       throws IOException {
-    String keytabFilename = conf.get(keytabFileKey);
-    if (keytabFilename == null)
+    
+    if(! UserGroupInformation.isSecurityEnabled()) 
       return;
+    
+    String keytabFilename = conf.get(keytabFileKey);
+    if (keytabFilename == null || keytabFilename.length() == 0) {
+      throw new IOException(""Running in secure mode, but config doesn't have a keytab"");
+    }
 
     String principalConfig = conf.get(userNameKey, System
         .getProperty(""user.name""));
diff --git a/src/test/core/org/apache/hadoop/security/TestSecurityUtil.java b/src/test/core/org/apache/hadoop/security/TestSecurityUtil.java
index 14ec74372d091..d5a3a25f90972 100644
--- a/src/test/core/org/apache/hadoop/security/TestSecurityUtil.java
+++ b/src/test/core/org/apache/hadoop/security/TestSecurityUtil.java
@@ -16,12 +16,15 @@
  */
 package org.apache.hadoop.security;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestSecurityUtil {
@@ -70,4 +73,23 @@ public void testGetServerPrincipal() throws IOException {
     verify(shouldNotReplace, hostname, shouldNotReplace);
     verify(shouldNotReplace, shouldNotReplace, shouldNotReplace);
   }
+  
+  @Test
+  public void testStartsWithIncorrectSettings() throws IOException {
+    Configuration conf = new Configuration();
+    conf.set(
+        org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION,
+        ""kerberos"");
+    String keyTabKey=""key"";
+    conf.set(keyTabKey, """");
+    UserGroupInformation.setConfiguration(conf);
+    boolean gotException = false;
+    try {
+      SecurityUtil.login(conf, keyTabKey, """", """");
+    } catch (IOException e) {
+      // expected
+      gotException=true;
+    }
+    assertTrue(""Exception for empty keytabfile name was expected"", gotException);
+  }
 }"
70d5d2c168bd477e3b8330fd7802b280d1f72b8e,camel,Set the isCreateCamelContextPerClass on tests- that can pass with it to speed up the tests--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1152396 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/camel,"diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index 54b4ae4946afe..0e1c4525d2cfc 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -58,7 +58,6 @@ public static int getPort2() {
         return CXFTestSupport.getPort2();
     }
 
-
     protected abstract ClassPathXmlApplicationContext createApplicationContext();
     
     @Before
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 5c897860f286e..6bbf10faf28e6 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -50,6 +50,10 @@ public static int getPort2() {
         return CXFTestSupport.getPort2();
     }
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
     @Test
     public void testInvokingServiceFromCXFClient() throws Exception {
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
index b514ad825954d..ded24d8c76247 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
@@ -48,6 +48,11 @@ public class CXFWsdlOnlyPayloadModeMultiPartNoSpringTest extends CamelTestSuppor
         + ""/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest/PersonMultiPart"";
     protected Endpoint endpoint;
 
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Before
     public void startService() {
         endpoint = Endpoint.publish(SERVICE_ADDRESS, new PersonMultiPartImpl());
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
index d89d35da58aa0..c70f8b6cf0f00 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
@@ -25,7 +25,11 @@
 
 public class CXFWsdlOnlyPayloadModeNoSpringSoap12Test extends CXFWsdlOnlyPayloadModeNoSpringTest {
     
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Before
     public void startService() {
         endpoint = Endpoint.publish(""http://localhost:"" + port1 + ""/"" 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
index 0e785aa9f3d74..80cb403d02d21 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
@@ -52,6 +52,11 @@ public class CXFWsdlOnlyPayloadModeNoSpringTest extends CamelTestSupport {
     protected int port1 = CXFTestSupport.getPort1(); 
     protected int port2 = CXFTestSupport.getPort2(); 
 
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Before
     public void startService() {
         endpoint = Endpoint.publish(""http://localhost:"" + port1 + ""/"" + getClass().getSimpleName()
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
index 5f4730a2ffdb7..e1060f17c7daf 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
@@ -45,6 +45,9 @@ public class CXFWsdlOnlyTest extends CamelSpringTestSupport {
     private static int port3 = CXFTestSupport.getPort3(); 
     private static int port4 = CXFTestSupport.getPort4(); 
         
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     protected ClassPathXmlApplicationContext createApplicationContext() {
         System.setProperty(""CXFWsdlOnlyTest.port1"", Integer.toString(port1));
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
index b21895182a9f0..bf8a8012d4590 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
@@ -47,6 +47,10 @@ public class CxfConsumerMessageTest extends CamelTestSupport {
     protected final String simpleEndpointURI = ""cxf://"" + simpleEndpointAddress
         + ""?serviceClass=org.apache.camel.component.cxf.HelloService"";
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
index 8686abb06e8ac..b1fdb15996919 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
@@ -65,6 +65,10 @@ public class CxfConsumerPayloadFaultTest extends CamelTestSupport {
     protected final String fromURI = ""cxf://"" + serviceAddress + ""?"" 
         + PORT_NAME_PROP + ""&"" + SERVICE_NAME_PROP + ""&"" + WSDL_URL_PROP + ""&dataFormat="" + DataFormat.PAYLOAD;
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
     @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
index 76e6eaa11be83..64a932d1f28ea 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
@@ -49,6 +49,10 @@ public class CxfConsumerProviderTest extends CamelTestSupport {
         + ""?serviceClass=org.apache.camel.component.cxf.ServiceProvider"";
     
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
index 293957ccce39e..7b89881c07e20 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
@@ -53,6 +53,10 @@ public class CxfConsumerResponseTest extends CamelTestSupport {
         + ""&publishedEndpointUrl=http://www.simple.com/services/test"";
     
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
     // START SNIPPET: example
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
index d87323e65e403..e096593b142a5 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
@@ -51,7 +51,12 @@ public class CxfConsumerTest extends CamelTestSupport {
     private static final String ECHO_OPERATION = ""echo"";
     private static final String ECHO_BOOLEAN_OPERATION = ""echoBoolean"";
     private static final String TEST_MESSAGE = ""Hello World!"";
-
+    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+    
     // START SNIPPET: example
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
index 66986987d7dbd..25543fb4a9d3e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
@@ -32,7 +32,10 @@
 @org.junit.Ignore
 public class CxfCustomerStartStopTest extends Assert {
     static final int PORT1 = CXFTestSupport.getPort1();  
-    static final int PORT2 = CXFTestSupport.getPort1();  
+    static final int PORT2 = CXFTestSupport.getPort1();
+
+
+    
     @Test
     public void startAndStopService() throws Exception {
         CamelContext context = new DefaultCamelContext();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
index 3d32fc1c8d2a7..e67a734070d7f 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
@@ -69,6 +69,10 @@ public class CxfCustomizedExceptionTest extends CamelTestSupport {
 
     private Bus bus;
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @Override
     @Before
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
index cf85aa427887f..7812026967f45 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
@@ -52,6 +52,10 @@ public abstract class CxfDispatchTestSupport extends CamelSpringTestSupport {
 
     protected Endpoint endpoint;
     private int port = CXFTestSupport.getPort1();
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @Before
     public void startService() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
index 4b72cd6993c2b..b9e92eb47bf65 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
@@ -39,6 +39,10 @@ public class CxfJavaOnlyPayloadModeTest extends CamelTestSupport {
         + ""&portName={http://camel.apache.org/wsdl-first}soap""
         + ""&dataFormat=PAYLOAD""
         + ""&properties.exceptionMessageCauseEnabled=true&properties.faultStackTraceEnabled=true"";
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @Test
     public void testCxfJavaOnly() throws Exception {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
index 9dce087c756a9..906cc0f4de7fb 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
@@ -52,7 +52,11 @@ public class CxfMixedModeRouterTest extends CamelTestSupport {
 
     private String routerEndpointURI = ""cxf://"" + ROUTER_ADDRESS + ""?"" + SERVICE_CLASS + ""&dataFormat=PAYLOAD"";
     private String serviceEndpointURI = ""cxf://"" + SERVICE_ADDRESS + ""?"" + SERVICE_CLASS + ""&dataFormat=POJO"";
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @BeforeClass
     public static void startService() {       
         //start a service
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
index ef033e3a5616a..74c02d60e155a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
@@ -34,7 +34,11 @@
 
 public class CxfNonWrapperTest extends CamelSpringTestSupport {
     int port1 = CXFTestSupport.getPort1(); 
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext(""org/apache/camel/component/cxf/nonWrapperProcessor.xml"");
     }
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java
index 073deff09346b..c95d33741dbc8 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java
@@ -56,7 +56,11 @@ protected String getServiceEndpointURI() {
         return ""cxf:http://localhost:"" + port2 + ""/"" + getClass().getSimpleName()
             + ""/new_pizza_service/services/PizzaService?wsdlURL=classpath:pizza_service.wsdl&dataFormat=PAYLOAD"";
     }     
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
index c48127dc68af9..257ca29af2856 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
@@ -38,6 +38,11 @@ public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
         + ""<return xmlns=\""http://cxf.component.camel.apache.org/\"">echo Hello World!</return>""
         + ""</ns1:echoResponse></soap:Body></soap:Envelope>"";
 
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+    
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
index 10727974f50cc..f0db44c96dc09 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
@@ -51,6 +51,10 @@ public class CxfProducerRouterTest extends CamelTestSupport {
     private static final String ECHO_OPERATION = ""echo"";
     private static final String TEST_MESSAGE = ""Hello World!"";
     
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @BeforeClass
     public static void startServer() throws Exception {        
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
index 074b7dd967e7a..28633d96e1322 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
@@ -40,6 +40,10 @@ public class CxfProducerSynchronousFalseTest extends CamelTestSupport {
 
     private String url = ""cxf://"" + SIMPLE_SERVER_ADDRESS
                 + ""?serviceClass=org.apache.camel.component.cxf.HelloService&dataFormat=MESSAGE&synchronous=false"";
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @BeforeClass
     public static void startServer() throws Exception {        
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
index e15338b2966ab..6f9760d4b3285 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
@@ -39,6 +39,10 @@ public class CxfProducerSynchronousTest extends CamelTestSupport {
 
     private String url = ""cxf://"" + SIMPLE_SERVER_ADDRESS
                 + ""?serviceClass=org.apache.camel.component.cxf.HelloService&dataFormat=MESSAGE&synchronous=true"";
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @BeforeClass
     public static void startServer() throws Exception {        
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
index 7f5f0652ec96d..76da36e080567 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
@@ -67,7 +67,6 @@ protected String getWrongServerAddress() {
         return ""http://localhost:"" + CXFTestSupport.getPort3() + ""/"" + getClass().getSimpleName() + ""/test"";
     }
     
-
     @Before
     public void startService() throws Exception {
         // start a simple front service
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
index 40cb2d44f3443..9a21fa8c98de4 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
@@ -36,7 +36,11 @@ public void configure() {
             }
         };
     }
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Test
     public void testTheContentType() throws Exception {
         MockEndpoint result = getMockEndpoint(""mock:result"");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
index c9cad6c10711b..c8fae21f095fb 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
@@ -51,7 +51,11 @@ protected String getServiceAddress() {
     protected void configureFactory(ServerFactoryBean svrBean) {
         
     }
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Before
     public void startService() {       
         //start a service
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
index 4049f62f3ff1a..0b53668bea282 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
@@ -38,6 +38,10 @@ public class CxfSoapMessageProviderTest extends CamelSpringTestSupport {
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext(""org/apache/camel/component/cxf/SoapMessageProviderContext.xml"");
     }
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @Test
     public void testSOAPMessageModeDocLit() throws Exception {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
index a39274bfe0406..c6e57a5e41403 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
@@ -49,7 +49,11 @@ public class CxfSpringCustomizedExceptionTest extends CamelTestSupport  {
         // END SNIPPET: FaultDefine
     }    
    
-    
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @Before
     public void setUp() throws Exception {
         CXFTestSupport.getPort1();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
index 8971deca12021..f57ded3e6427b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
@@ -39,6 +39,11 @@ public class CxfTimeoutTest extends CamelSpringTestSupport {
     protected static final String JAXWS_SERVER_ADDRESS 
         = ""http://localhost:"" + CXFTestSupport.getPort1() + ""/CxfTimeoutTest/SoapContext/SoapPort"";
 
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
+
     @BeforeClass
     public static void startService() {
         Greeter implementor = new GreeterImplWithSleep();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
index 764040443f881..cb1ee7710a9d8 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
@@ -34,6 +34,10 @@
 
 public class CxfWsdlFirstPayloadModeTest extends AbstractCxfWsdlFirstTest {
 
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @BeforeClass
     public static void startService() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
index 0dcfc8e25cab8..64580aa5d5072 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
@@ -25,6 +25,10 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CxfWsdlFirstProcessorTest extends AbstractCxfWsdlFirstTest {
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext(""org/apache/camel/component/cxf/WsdlFirstProcessor.xml"");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
index 4fdf0390318c2..71237e359aaf5 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
@@ -41,6 +41,10 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CxfWsdlFirstTest extends AbstractCxfWsdlFirstTest {
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext(""org/apache/camel/component/cxf/WsdlFirstBeans.xml"");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
index adc093a53375c..e5e915ca4c6e1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
@@ -41,6 +41,10 @@ public class CxfPayloadConverterTest extends ExchangeTestSupport {
     private CxfPayload<String[]> payload;
     private CxfPayload<String[]> emptyPayload;
     private FileInputStream inputStream;
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     @Override
     @Before
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
index 00bb7c29633f0..e4fd5798a1f54 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
@@ -49,6 +49,10 @@ public void process(Exchange exchange) throws Exception {
             exchange.getOut().setBody(inMessage.getHeader(Exchange.HTTP_QUERY, String.class));
         }
     }
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        return true;
+    }
 
     public int getPort1() {
         return port1;
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
index 3506b2d6fa37e..7527d4784b45c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
@@ -21,6 +21,7 @@
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
@@ -154,6 +155,9 @@ public void testPostConsumer() throws Exception {
             assertEquals(200, response.getStatusLine().getStatusCode());
             assertEquals(""<?xml version=\""1.0\"" encoding=\""UTF-8\"" standalone=\""yes\""?><Customer><id>124</id><name>Jack</name></Customer>"",
                          EntityUtils.toString(response.getEntity()));
+            
+            HttpDelete del = new HttpDelete(""http://localhost:"" + PORT0 + ""/CxfRsRouterTest/route/customerservice/customers/124/"");
+            httpclient.execute(del);
         } finally {
             httpclient.getConnectionManager().shutdown();
         }
@@ -174,6 +178,9 @@ public void testPostConsumerUniqueResponseCode() throws Exception {
             assertEquals(201, response.getStatusLine().getStatusCode());
             assertEquals(""<?xml version=\""1.0\"" encoding=\""UTF-8\"" standalone=\""yes\""?><Customer><id>124</id><name>Jack</name></Customer>"",
                          EntityUtils.toString(response.getEntity()));
+
+            HttpDelete del = new HttpDelete(""http://localhost:"" + PORT0 + ""/CxfRsRouterTest/route/customerservice/customers/124/"");
+            httpclient.execute(del);
         } finally {
             httpclient.getConnectionManager().shutdown();
         }
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index 1dbdb72f4422e..c90b4bb1ed600 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -120,7 +120,9 @@ public Response deleteCustomer(@PathParam(""id"") String id) {
         } else {
             r = Response.notModified().build();
         }
-
+        if (idNumber == currentId) {
+            --currentId;
+        }
         return r;
     }
 
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
index 896977f5456ff..966b5a1631e32 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
@@ -24,11 +24,14 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
 
 /**
  * @version 
@@ -41,16 +44,29 @@ public class BrowsableQueueTest extends CamelTestSupport {
     protected int counter;
     protected Object[] expectedBodies = {""body1"", ""body2""};
 
+    @Before
+    public void setUp() throws Exception {
+        long start = System.currentTimeMillis();
+        super.setUp();
+        System.out.println(""Start: "" + (System.currentTimeMillis() - start));
+    }
+    @After
+    public void tearDown() throws Exception {
+        long start = System.currentTimeMillis();
+        super.tearDown();
+        System.out.println(""Stop: "" + (System.currentTimeMillis() - start));
+    }
+    
     @Test
     public void testSendMessagesThenBrowseQueue() throws Exception {
         // send some messages
         for (int i = 0; i < expectedBodies.length; i++) {
             Object expectedBody = expectedBodies[i];
-            template.sendBodyAndHeader(""activemq:test.b"", expectedBody, ""counter"", i);
+            template.sendBodyAndHeader(""activemq:BrowsableQueueTest.b"", expectedBody, ""counter"", i);
         }
 
         // now lets browse the queue
-        JmsQueueEndpoint endpoint = getMandatoryEndpoint(""activemq:test.b?maximumBrowseSize=6"", JmsQueueEndpoint.class);
+        JmsQueueEndpoint endpoint = getMandatoryEndpoint(""activemq:BrowsableQueueTest.b?maximumBrowseSize=6"", JmsQueueEndpoint.class);
         assertEquals(6, endpoint.getMaximumBrowseSize());
         List<Exchange> list = endpoint.getExchanges();
         LOG.debug(""Received: "" + list);
@@ -80,8 +96,8 @@ protected void sendExchange(final Object expectedBody) {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
-        camelContext.addComponent(componentName, jmsComponentAutoAcknowledge(connectionFactory));
+        JmsComponent comp = jmsComponent(CamelJmsTestHelper.getSharedConfig());
+        camelContext.addComponent(componentName, comp);
 
         return camelContext;
     }
@@ -89,7 +105,7 @@ protected CamelContext createCamelContext() throws Exception {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(""activemq:test.a"").to(""activemq:test.b"");
+                from(""activemq:BrowsableQueueTest.a"").to(""activemq:BrowsableQueueTest.b"");
             }
         };
     }
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
index 2e06ccb8942a2..ac4fd990b7dd6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
@@ -32,7 +32,7 @@
 import org.springframework.jms.support.converter.MessageConversionException;
 import org.springframework.jms.support.converter.MessageConverter;
 
-import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
 
 /**
  * @version 
@@ -49,8 +49,7 @@ protected JndiRegistry createRegistry() throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
-        camelContext.addComponent(""activemq"", jmsComponentAutoAcknowledge(connectionFactory));
+        camelContext.addComponent(""activemq"", jmsComponent(CamelJmsTestHelper.getSharedConfig()));
 
         return camelContext;
     }
@@ -61,7 +60,7 @@ public void testTextMessage() throws Exception {
         mock.expectedMessageCount(1);
         mock.message(0).body().isInstanceOf(TextMessage.class);
 
-        template.sendBody(""activemq:queue:hello"", ""Hello World"");
+        template.sendBody(""activemq:queue:ConsumeMessageConverterTest.hello"", ""Hello World"");
 
         assertMockEndpointsSatisfied();
     }
@@ -72,7 +71,7 @@ public void testBytesMessage() throws Exception {
         mock.expectedMessageCount(1);
         mock.message(0).body().isInstanceOf(BytesMessage.class);
 
-        template.sendBody(""activemq:queue:hello"", ""Hello World"".getBytes());
+        template.sendBody(""activemq:queue:ConsumeMessageConverterTest.hello"", ""Hello World"".getBytes());
 
         assertMockEndpointsSatisfied();
     }
@@ -80,7 +79,7 @@ public void testBytesMessage() throws Exception {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(""activemq:queue:hello?messageConverter=#myMessageConverter"").to(""mock:result"");
+                from(""activemq:queue:ConsumeMessageConverterTest.hello?messageConverter=#myMessageConverter"").to(""mock:result"");
             }
         };
     }
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
index c1b570225fa34..ca060781651f8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
@@ -27,7 +27,7 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
-import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
 
 /**
  * Unit test that we can do file over JMS to file.
@@ -39,7 +39,7 @@ public class FileRouteToJmsToFileTest extends CamelTestSupport {
     @Test
     public void testRouteFileToFile() throws Exception {
         deleteDirectory(""target/file2file"");
-        NotifyBuilder notify = new NotifyBuilder(context).from(""activemq:queue:hello"").whenDone(1).create();
+        NotifyBuilder notify = new NotifyBuilder(context).from(""activemq:queue:FileRouteToJmsToFileTest.hello"").whenDone(1).create();
 
         MockEndpoint mock = getMockEndpoint(""mock:result"");
         mock.expectedMessageCount(1);
@@ -58,8 +58,7 @@ public void testRouteFileToFile() throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
-        camelContext.addComponent(componentName, jmsComponentAutoAcknowledge(connectionFactory));
+        camelContext.addComponent(componentName, jmsComponent(CamelJmsTestHelper.getSharedConfig()));
 
         return camelContext;
     }
@@ -67,9 +66,9 @@ protected CamelContext createCamelContext() throws Exception {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(""file://target/file2file/in"").to(""activemq:queue:hello"");
+                from(""file://target/file2file/in"").to(""activemq:queue:FileRouteToJmsToFileTest.hello"");
 
-                from(""activemq:queue:hello"").to(""file://target/file2file/out"", ""mock:result"");
+                from(""activemq:queue:FileRouteToJmsToFileTest.hello"").to(""file://target/file2file/out"", ""mock:result"");
             }
         };
     }
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
index a62787c32009c..e643a301812d6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
@@ -44,7 +44,7 @@ public void testAutoStartup() throws Exception {
         // should be stopped by default
         mock.expectedMessageCount(0);
 
-        template.sendBody(""activemq:queue:foo"", ""Hello World"");
+        template.sendBody(""activemq:queue:JmsAutoStartupTest.foo"", ""Hello World"");
 
         Thread.sleep(2000);
 
@@ -64,7 +64,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                endpoint = context.getEndpoint(""activemq:queue:foo?autoStartup=false"", JmsEndpoint.class);
+                endpoint = context.getEndpoint(""activemq:queue:JmsAutoStartupTest.foo?autoStartup=false"", JmsEndpoint.class);
 
                 from(endpoint).to(""mock:result"");
             }
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
index a86c1e38dceb0..2460e0265bc51 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
@@ -40,14 +40,14 @@ public void testBatchResequencerJMSPriority() throws Exception {
         mock.expectedBodiesReceived(""G"", ""A"", ""B"", ""E"", ""H"", ""C"", ""D"", ""F"");
 
         // must use preserveMessageQos=true to be able to specify the JMSPriority to be used
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""A"", ""JMSPriority"", 6);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""B"", ""JMSPriority"", 6);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""C"", ""JMSPriority"", 4);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""D"", ""JMSPriority"", 4);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""E"", ""JMSPriority"", 6);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""F"", ""JMSPriority"", 4);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""G"", ""JMSPriority"", 8);
-        template.sendBodyAndHeader(""jms:queue:foo?preserveMessageQos=true"", ""H"", ""JMSPriority"", 6);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""A"", ""JMSPriority"", 6);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""B"", ""JMSPriority"", 6);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""C"", ""JMSPriority"", 4);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""D"", ""JMSPriority"", 4);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""E"", ""JMSPriority"", 6);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""F"", ""JMSPriority"", 4);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""G"", ""JMSPriority"", 8);
+        template.sendBodyAndHeader(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true"", ""H"", ""JMSPriority"", 6);
 
         assertMockEndpointsSatisfied();
     }
@@ -55,7 +55,7 @@ public void testBatchResequencerJMSPriority() throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
+        ConnectionFactory connectionFactory = CamelJmsTestHelper.getSharedConnectionFactory();
         camelContext.addComponent(""jms"", jmsComponentAutoAcknowledge(connectionFactory));
 
         return camelContext;
@@ -67,7 +67,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
             @Override
             public void configure() throws Exception {
                 // START SNIPPET: e1
-                from(""jms:queue:foo"")
+                from(""jms:queue:JmsBatchResequencerJMSPriorityTest.foo"")
                     // sort by JMSPriority by allowing duplicates (message can have same JMSPriority)
                     // and use reverse ordering so 9 is first output (most important), and 0 is last
                     // use batch mode and fire every 3th second
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
index 40d74a424df78..fb97686fda8d0 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
@@ -34,7 +34,7 @@ public class JmsComponentTest extends CamelTestSupport {
 
     @Test
     public void testComponentOptions() throws Exception {
-        String reply = template.requestBody(""activemq123:queue:hello?requestTimeout=5000"", ""Hello World"", String.class);
+        String reply = template.requestBody(""activemq123:queue:JmsComponentTest.hello?requestTimeout=5000"", ""Hello World"", String.class);
         assertEquals(""Bye World"", reply);
 
         assertEquals(true, endpoint.isAcceptMessagesWhileStopping());
@@ -60,7 +60,7 @@ public void testComponentOptions() throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
+        ConnectionFactory connectionFactory = CamelJmsTestHelper.getSharedConnectionFactory();
         JmsComponent comp = jmsComponentAutoAcknowledge(connectionFactory);
 
         comp.setAcceptMessagesWhileStopping(true);
@@ -84,7 +84,7 @@ protected CamelContext createCamelContext() throws Exception {
 
         camelContext.addComponent(componentName, comp);
 
-        endpoint = (JmsEndpoint) comp.createEndpoint(""queue:hello"");
+        endpoint = (JmsEndpoint) comp.createEndpoint(""queue:JmsComponentTest.hello"");
 
         return camelContext;
     }
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
index 8b5e8e1eb070e..f421e09088aa6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
@@ -33,7 +33,7 @@ public class JmsConsumerRestartPickupConfigurationChangesTest extends CamelTestS
 
     @Test
     public void testRestartJmsConsumerPickupChanges() throws Exception {
-        JmsEndpoint endpoint = context.getEndpoint(""activemq:queue:foo"", JmsEndpoint.class);
+        JmsEndpoint endpoint = context.getEndpoint(""activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.foo"", JmsEndpoint.class);
         JmsConsumer consumer = endpoint.createConsumer(new Processor() {
             public void process(Exchange exchange) throws Exception {
                 template.send(""mock:result"", exchange);
@@ -44,7 +44,7 @@ public void process(Exchange exchange) throws Exception {
 
         MockEndpoint result = getMockEndpoint(""mock:result"");
         result.expectedBodiesReceived(""Hello World"");
-        template.sendBody(""activemq:queue:foo"", ""Hello World"");
+        template.sendBody(""activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.foo"", ""Hello World"");
         assertMockEndpointsSatisfied();
 
         consumer.stop();
@@ -58,7 +58,7 @@ public void process(Exchange exchange) throws Exception {
 
         result.reset();
         result.expectedBodiesReceived(""Bye World"");
-        template.sendBody(""activemq:queue:bar"", ""Bye World"");
+        template.sendBody(""activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.bar"", ""Bye World"");
         assertMockEndpointsSatisfied();
 
         consumer.stop();
@@ -67,7 +67,7 @@ public void process(Exchange exchange) throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
+        ConnectionFactory connectionFactory = CamelJmsTestHelper.getSharedConnectionFactory();
         camelContext.addComponent(""activemq"", jmsComponentAutoAcknowledge(connectionFactory));
 
         return camelContext;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
index ba919e5addbf6..fd9dab74a9bb2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
@@ -64,7 +64,7 @@ public Object call() throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
+        ConnectionFactory connectionFactory = CamelJmsTestHelper.getSharedConnectionFactory();
         camelContext.addComponent(""jms"", jmsComponentAutoAcknowledge(connectionFactory));
 
         return camelContext;
@@ -75,9 +75,9 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(""direct:start"").to(""jms:queue:foo"");
+                from(""direct:start"").to(""jms:queue:foo-JmsProducerConcurrentTest"");
 
-                from(""jms:queue:foo"").to(""mock:result"");
+                from(""jms:queue:foo-JmsProducerConcurrentTest"").to(""mock:result"");
             }
         };
     }
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
index d7bf2dc9b6f50..15fcead7bf1e8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
@@ -73,7 +73,7 @@ public Object call() throws Exception {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
-        ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
+        ConnectionFactory connectionFactory = CamelJmsTestHelper.getSharedConnectionFactory();
         camelContext.addComponent(""jms"", jmsComponentAutoAcknowledge(connectionFactory));
 
         return camelContext;
@@ -84,9 +84,9 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(""direct:start"").to(""jms:queue:foo"");
+                from(""direct:start"").to(""jms:queue:foo-JmsProduerConcurrentWithReplyTest"");
 
-                from(""jms:queue:foo?concurrentConsumers=5"").transform(simple(""Bye ${in.body}"")).to(""mock:result"");
+                from(""jms:queue:foo-JmsProduerConcurrentWithReplyTest?concurrentConsumers=5"").transform(simple(""Bye ${in.body}"")).to(""mock:result"");
             }
         };
     }"
8c475876dda2507977fd7282c37462136400daf2,drools,-Added fixes for waltz to run waltz50--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@7071 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java
index d114ffd5441..b1ec6212171 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java
@@ -39,6 +39,10 @@ public class Edge {
 
     final public static String MINUS = ""-"";
 
+    public Edge() {
+        
+    }
+    
     public Edge(final int p1,
                 final int p2,
                 final boolean joined,
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java
index dc50219454d..ca1e1b51585 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java
@@ -39,7 +39,11 @@ public class Junction {
     private int          basePoint;
 
     private String       type;
-
+    
+    public Junction() {
+        
+    }
+    
     public Junction(final int p1,
                     final int p2,
                     final int p3,
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java
index 0c424db3448..158900158fd 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java
@@ -26,6 +26,10 @@ public class Line {
 
     private int p2;
 
+    public Line() {
+        
+    }
+    
     public Line(final int p1,
                 final int p2) {
         this.p1 = p1;
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
index 252ba075d3a..f5c0ba87174 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
@@ -51,6 +51,10 @@ public class Stage
 
     private int               value;
 
+    public Stage() {
+        
+    }
+    
     public Stage(final int value) {
         this.value = value;
     }
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
index 4cfe78e93dd..2bca544472d 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
@@ -56,10 +56,15 @@ public void testWaltz() {
             //            workingMemory.addEventListener( agendaListener );
 
             //go !     
-            //this.loadLines( workingMemory, ""waltz12.dat"" );
-
-            final Stage stage = new Stage( Stage.START );
-            workingMemory.assertObject( stage );
+            this.loadLines( workingMemory,
+                            ""waltz50.dat"" );
+
+            //final Stage stage = new Stage( Stage.START );
+            //workingMemory.assertObject( stage );
+            
+            Stage stage = new Stage(Stage.DUPLICATE);
+            workingMemory.assertObject( stage );            
+            
             workingMemory.fireAllRules();
         } catch ( final Throwable t ) {
             t.printStackTrace();
@@ -100,7 +105,7 @@ private void loadLines(final WorkingMemory wm,
             final Matcher m = pat.matcher( line );
             if ( m.matches() ) {
                 final Line l = new Line( Integer.parseInt( m.group( 1 ) ),
-                                   Integer.parseInt( m.group( 2 ) ) );
+                                         Integer.parseInt( m.group( 2 ) ) );
                 wm.assertObject( l );
             }
             line = reader.readLine();"
19152416a44473325a6c3605f9accc4fee379b63,elasticsearch,add an index level setting to disable/enable- purging of expired docs --,a,https://github.com/elastic/elasticsearch,"diff --git a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java
index ae4a010e95c40..f000ba6987225 100644
--- a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java
+++ b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java
@@ -31,6 +31,8 @@
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.ClusterService;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
@@ -65,8 +67,13 @@ public class IndicesTTLService extends AbstractLifecycleComponent<IndicesTTLServ
         MetaData.addDynamicSettings(
                 ""indices.ttl.interval""
         );
+
+        IndexMetaData.addDynamicSettings(
+                ""index.ttl.disable_purge""
+        );
     }
 
+    private final ClusterService clusterService;
     private final IndicesService indicesService;
     private final Client client;
 
@@ -75,8 +82,9 @@ public class IndicesTTLService extends AbstractLifecycleComponent<IndicesTTLServ
     private PurgerThread purgerThread;
 
     @Inject
-    public IndicesTTLService(Settings settings, IndicesService indicesService, NodeSettingsService nodeSettingsService, Client client) {
+    public IndicesTTLService(Settings settings, ClusterService clusterService, IndicesService indicesService, NodeSettingsService nodeSettingsService, Client client) {
         super(settings);
+        this.clusterService = clusterService;
         this.indicesService = indicesService;
         this.client = client;
         this.interval = componentSettings.getAsTime(""interval"", TimeValue.timeValueSeconds(60));
@@ -133,11 +141,18 @@ public void run() {
         }
 
         /**
-         * Returns the shards to purge, i.e. the local started primary shards that have ttl enabled
+         * Returns the shards to purge, i.e. the local started primary shards that have ttl enabled and disable_purge to false
          */
         private List<IndexShard> getShardsToPurge() {
             List<IndexShard> shardsToPurge = new ArrayList<IndexShard>();
             for (IndexService indexService : indicesService) {
+                // check the value of disable_purge for this index
+                IndexMetaData indexMetaData = clusterService.state().metaData().index(indexService.index().name());
+                boolean disablePurge = indexMetaData.settings().getAsBoolean(""index.ttl.disable_purge"", false);
+                if (disablePurge) {
+                    continue;
+                }
+
                 // should be optimized with the hasTTL flag
                 FieldMappers ttlFieldMappers = indexService.mapperService().name(TTLFieldMapper.NAME);
                 if (ttlFieldMappers == null) {"
ca849f196990eec942468efaef3719f829c265eb,orientdb,Improved management of distributed cluster nodes--,p,https://github.com/orientechnologies/orientdb,"diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java
index 6ad17e70a96..80b8a0fa780 100644
--- a/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java
+++ b/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java
@@ -117,7 +117,7 @@ public OServerAdmin deleteDatabase() throws IOException {
 	}
 
 	public OServerAdmin shareDatabase(final String iDatabaseName, final String iDatabaseUserName, final String iDatabaseUserPassword,
-			final String iRemoteName) throws IOException {
+			final String iRemoteName, final String iMode) throws IOException {
 
 		try {
 			storage.writeCommand(OChannelDistributedProtocol.REQUEST_DISTRIBUTED_DB_SHARE_SENDER);
@@ -125,11 +125,13 @@ public OServerAdmin shareDatabase(final String iDatabaseName, final String iData
 			storage.getNetwork().writeString(iDatabaseUserName);
 			storage.getNetwork().writeString(iDatabaseUserPassword);
 			storage.getNetwork().writeString(iRemoteName);
+			storage.getNetwork().writeString(iMode);
 			storage.getNetwork().flush();
 
 			storage.getNetwork().readStatus();
 
-			OLogManager.instance().debug(this, ""Database %s has been shared with the server %s."", iDatabaseName, iRemoteName);
+			OLogManager.instance().debug(this, ""Database '%s' has been shared in mode '%s' with the server '%s'"", iDatabaseName, iMode,
+					iRemoteName);
 
 		} catch (Exception e) {
 			OLogManager.instance().exception(""Can't share the database: "" + iDatabaseName, e, OStorageException.class);
diff --git a/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandler.java b/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandler.java
index 6a1603e0075..e3e174cf388 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandler.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandler.java
@@ -40,17 +40,20 @@ public interface OServerHandler extends OService {
 	/**
 	 * Callback invoked before a client request is processed.
 	 */
-	public void onBeforeClientRequest(OClientConnection iConnection, byte iRequestType);
+	public void onBeforeClientRequest(OClientConnection iConnection, Object iRequestType);
 
 	/**
 	 * Callback invoked after a client request is processed.
 	 */
-	public void onAfterClientRequest(OClientConnection iConnection, byte iRequestType);
+	public void onAfterClientRequest(OClientConnection iConnection, Object iRequestType);
 
 	/**
 	 * Callback invoked when a client connection has errors.
+	 * 
+	 * @param iThrowable
+	 *          Throwable instance received
 	 */
-	public void onClientError(OClientConnection iConnection);
+	public void onClientError(OClientConnection iConnection, Throwable iThrowable);
 
 	/**
 	 * Configures the handler. Called at startup.
diff --git a/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandlerAbstract.java b/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandlerAbstract.java
index 39a5c4d457d..a146ac509fa 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandlerAbstract.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/handler/OServerHandlerAbstract.java
@@ -25,12 +25,12 @@ public void onClientConnection(final OClientConnection iConnection) {
 	public void onClientDisconnection(final OClientConnection iConnection) {
 	}
 
-	public void onBeforeClientRequest(final OClientConnection iConnection, final byte iRequestType) {
+	public void onBeforeClientRequest(final OClientConnection iConnection, final Object iRequestType) {
 	}
 
-	public void onAfterClientRequest(final OClientConnection iConnection, final byte iRequestType) {
+	public void onAfterClientRequest(final OClientConnection iConnection, final Object iRequestType) {
 	}
 
-	public void onClientError(final OClientConnection iConnection) {
+	public void onClientError(final OClientConnection iConnection, final Throwable iThrowable) {
 	}
 }
diff --git a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerManager.java b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerManager.java
index 483c76c6359..8794e058c3f 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerManager.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerManager.java
@@ -19,6 +19,7 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import javax.crypto.SecretKey;
@@ -26,12 +27,15 @@
 import com.orientechnologies.common.concur.resource.OSharedResourceExternal;
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.Orient;
+import com.orientechnologies.orient.core.db.ODatabase;
+import com.orientechnologies.orient.core.db.ODatabaseComplex;
+import com.orientechnologies.orient.core.db.ODatabaseLifecycleListener;
 import com.orientechnologies.orient.core.exception.OConfigurationException;
 import com.orientechnologies.orient.core.record.ORecordInternal;
+import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.security.OSecurityManager;
 import com.orientechnologies.orient.core.serialization.OBase64Utils;
 import com.orientechnologies.orient.core.tx.OTransactionEntry;
-import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinaryProtocol;
 import com.orientechnologies.orient.server.OClientConnection;
 import com.orientechnologies.orient.server.OServer;
 import com.orientechnologies.orient.server.config.OServerHandlerConfiguration;
@@ -57,19 +61,20 @@
  * @see ODistributedServerDiscoveryListener, ODistributedServerDiscoverySignaler
  * 
  */
-public class ODistributedServerManager extends OServerHandlerAbstract {
+public class ODistributedServerManager extends OServerHandlerAbstract  {
 	protected OServer																			server;
 
 	protected String																			name;
+	protected String																			id;
 	protected SecretKey																		securityKey;
 	protected String																			securityAlgorithm;
 	protected InetAddress																	networkMulticastAddress;
 	protected int																					networkMulticastPort;
-	protected int																					networkMulticastHeartbeat;																					// IN MS
-	protected int																					networkTimeoutLeader;																							// IN MS
-	protected int																					networkTimeoutNode;																								// IN MS
-	private int																						networkHeartbeatDelay;																							// IN MS
-	protected int																					serverUpdateDelay;																									// IN MS
+	protected int																					networkMulticastHeartbeat;																								// IN
+	protected int																					networkTimeoutLeader;																										// IN
+	protected int																					networkTimeoutNode;																											// IN
+	private int																						networkHeartbeatDelay;																										// IN
+	protected int																					serverUpdateDelay;																												// IN
 	protected int																					serverOutSynchMaxBuffers;
 
 	private ODistributedServerDiscoverySignaler						discoverySignaler;
@@ -78,7 +83,7 @@ public class ODistributedServerManager extends OServerHandlerAbstract {
 	private ODistributedServerRecordHook									trigger;
 	private final OSharedResourceExternal									lock							= new OSharedResourceExternal();
 
-	private final HashMap<String, ODistributedServerNode>	nodes							= new HashMap<String, ODistributedServerNode>();	;
+	private final HashMap<String, ODistributedServerNode>	nodes							= new LinkedHashMap<String, ODistributedServerNode>();	;
 
 	static final String																		CHECKSUM					= ""ChEcKsUm1976"";
 
@@ -88,8 +93,11 @@ public class ODistributedServerManager extends OServerHandlerAbstract {
 	private OServerNetworkListener												distributedNetworkListener;
 	private ONetworkProtocolDistributed										leaderConnection;
 	public long																						lastHeartBeat;
+	private ODocument																			clusterConfiguration;
 
 	public void startup() {
+		trigger = new ODistributedServerRecordHook(this);
+
 		// LAUNCH THE SIGNAL AND WAIT FOR A CONNECTION
 		discoverySignaler = new ODistributedServerDiscoverySignaler(this, distributedNetworkListener);
 	}
@@ -195,6 +203,9 @@ else if (leaderConnection != null)
 				// STOP THE CHECK OF HEART-BEAT
 				leaderCheckerTask.cancel();
 
+			if (clusterConfiguration == null)
+				clusterConfiguration = createDatabaseConfiguration();
+
 			// NO NODE HAS JOINED: BECAME THE LEADER AND LISTEN FOR OTHER NODES
 			discoveryListener = new ODistributedServerDiscoveryListener(this, distributedNetworkListener);
 
@@ -203,21 +214,8 @@ else if (leaderConnection != null)
 		}
 	}
 
-	/**
-	 * Install the trigger to catch all the events on records
-	 */
-	@Override
-	public void onAfterClientRequest(final OClientConnection iConnection, final byte iRequestType) {
-		if (iRequestType == OChannelBinaryProtocol.REQUEST_DB_OPEN || iRequestType == OChannelBinaryProtocol.REQUEST_DB_CREATE) {
-			trigger = new ODistributedServerRecordHook(this, iConnection);
-			iConnection.database.registerHook(trigger);
-
-			// TODO: SEND THE CLUSTER CONFIG TO THE CLIENT
-		}
-	}
-
 	@Override
-	public void onClientError(final OClientConnection iConnection) {
+	public void onClientError(final OClientConnection iConnection, final Throwable iThrowable) {
 		// handleNodeFailure(node);
 	}
 
@@ -295,6 +293,8 @@ else if (""server.outsynch.maxbuffers"".equalsIgnoreCase(param.name))
 						""Can't find a configured network listener with 'distributed' protocol. Can't start distributed node"", null,
 						OConfigurationException.class);
 
+			id = distributedNetworkListener.getInboundAddr().getHostName() + "":"" + distributedNetworkListener.getInboundAddr().getPort();
+
 		} catch (Exception e) {
 			throw new OConfigurationException(""Can't configure OrientDB Server as Cluster Node"", e);
 		}
@@ -357,10 +357,8 @@ public String getName() {
 	/**
 	 * Distributed the request to all the configured nodes. Each node has the responsibility to bring the message early (synch-mode)
 	 * or using an asynchronous queue.
-	 * 
-	 * @param iConnection
 	 */
-	public void distributeRequest(final OClientConnection iConnection, final OTransactionEntry<ORecordInternal<?>> iTransactionEntry) {
+	public void distributeRequest(final OTransactionEntry<ORecordInternal<?>> iTransactionEntry) {
 		lock.acquireSharedLock();
 
 		try {
@@ -382,10 +380,6 @@ public int getNetworkHeartbeatDelay() {
 		return networkHeartbeatDelay;
 	}
 
-	private static String getNodeName(final String iServerAddress, final int iServerPort) {
-		return iServerAddress + "":"" + iServerPort;
-	}
-
 	public long getLastHeartBeat() {
 		return lastHeartBeat;
 	}
@@ -393,4 +387,25 @@ public long getLastHeartBeat() {
 	public void updateHeartBeatTime() {
 		this.lastHeartBeat = System.currentTimeMillis();
 	}
+
+	public ODocument getClusterConfiguration() {
+		return clusterConfiguration;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	private static String getNodeName(final String iServerAddress, final int iServerPort) {
+		return iServerAddress + "":"" + iServerPort;
+	}
+
+	private ODocument createDatabaseConfiguration() {
+		clusterConfiguration = new ODocument();
+
+		clusterConfiguration.field(""servers"", new ODocument(getId(), new ODocument(""update-delay"", getServerUpdateDelay())));
+		clusterConfiguration.field(""clusters"", new ODocument(""*"", new ODocument(""owner"", getId())));
+
+		return clusterConfiguration;
+	}
 }
diff --git a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNode.java b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNode.java
index 3d82d444c6b..9d608990124 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNode.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNode.java
@@ -22,12 +22,15 @@
 import java.util.Map;
 
 import com.orientechnologies.common.log.OLogManager;
+import com.orientechnologies.orient.core.command.OCommandOutputListener;
 import com.orientechnologies.orient.core.config.OContextConfiguration;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.db.record.ODatabaseRecord;
+import com.orientechnologies.orient.core.db.tool.ODatabaseExport;
 import com.orientechnologies.orient.core.record.ORecordInternal;
-import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.tx.OTransactionEntry;
 import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinaryClient;
+import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinaryOutputStream;
 import com.orientechnologies.orient.enterprise.channel.distributed.OChannelDistributedProtocol;
 
 /**
@@ -36,18 +39,19 @@
  * @author Luca Garulli (l.garulli--at--orientechnologies.com)
  * 
  */
-public class ODistributedServerNode {
+public class ODistributedServerNode implements OCommandOutputListener {
 	public enum STATUS {
 		DISCONNECTED, CONNECTING, CONNECTED, SYNCHRONIZING
 	}
 
+	private String																			id;
 	public String																				networkAddress;
 	public int																					networkPort;
 	public Date																					joinedOn;
 	private ODistributedServerManager										manager;
 	public OChannelBinaryClient													channel;
 	private OContextConfiguration												configuration;
-	private STATUS																			status					= STATUS.DISCONNECTED;
+	private volatile STATUS															status					= STATUS.DISCONNECTED;
 	private Map<String, Long>														storages				= new HashMap<String, Long>();
 	private List<OTransactionEntry<ORecordInternal<?>>>	bufferedChanges	= new ArrayList<OTransactionEntry<ORecordInternal<?>>>();
 
@@ -57,6 +61,7 @@ public ODistributedServerNode(final ODistributedServerManager iNode, final Strin
 		networkPort = iServerPort;
 		joinedOn = new Date();
 		configuration = new OContextConfiguration();
+		id = networkAddress + "":"" + networkPort;
 		status = STATUS.CONNECTING;
 	}
 
@@ -83,9 +88,13 @@ public void sendRequest(final OTransactionEntry<ORecordInternal<?>> iRequest) th
 					// BUFFER EXCEEDS THE CONFIGURED LIMIT: REMOVE MYSELF AS NODE
 					manager.removeNode(this);
 					bufferedChanges.clear();
-				} else
+				} else {
 					// BUFFERIZE THE REQUEST
 					bufferedChanges.add(iRequest);
+
+					OLogManager.instance().info(this, ""Server node '%s' is temporary disconnected, buffering change %d/%d for the record %s"",
+							id, bufferedChanges.size(), manager.serverOutSynchMaxBuffers, iRequest.getRecord().getIdentity());
+				}
 			}
 		} else {
 			final ORecordInternal<?> record = iRequest.getRecord();
@@ -93,42 +102,58 @@ public void sendRequest(final OTransactionEntry<ORecordInternal<?>> iRequest) th
 			try {
 				switch (iRequest.status) {
 				case OTransactionEntry.CREATED:
-					channel.writeByte(OChannelDistributedProtocol.REQUEST_RECORD_CREATE);
-					channel.writeInt(0);
-					channel.writeShort((short) record.getIdentity().getClusterId());
-					channel.writeBytes(record.toStream());
-					channel.writeByte(record.getRecordType());
-					channel.flush();
-
-					channel.readStatus();
+					channel.acquireExclusiveLock();
+					try {
+						channel.writeByte(OChannelDistributedProtocol.REQUEST_RECORD_CREATE);
+						channel.writeInt(0);
+						channel.writeShort((short) record.getIdentity().getClusterId());
+						channel.writeBytes(record.toStream());
+						channel.writeByte(record.getRecordType());
+						channel.flush();
+
+						channel.readStatus();
+
+					} finally {
+						channel.releaseExclusiveLock();
+					}
 					break;
 
 				case OTransactionEntry.UPDATED:
-					channel.writeByte(OChannelDistributedProtocol.REQUEST_RECORD_UPDATE);
-					channel.writeInt(0);
-					channel.writeShort((short) record.getIdentity().getClusterId());
-					channel.writeLong(record.getIdentity().getClusterPosition());
-					channel.writeBytes(record.toStream());
-					channel.writeInt(record.getVersion());
-					channel.writeByte(record.getRecordType());
-					channel.flush();
-
-					readStatus();
-
-					channel.readInt();
+					channel.acquireExclusiveLock();
+					try {
+						channel.writeByte(OChannelDistributedProtocol.REQUEST_RECORD_UPDATE);
+						channel.writeInt(0);
+						channel.writeShort((short) record.getIdentity().getClusterId());
+						channel.writeLong(record.getIdentity().getClusterPosition());
+						channel.writeBytes(record.toStream());
+						channel.writeInt(record.getVersion());
+						channel.writeByte(record.getRecordType());
+						channel.flush();
+
+						readStatus();
+
+						channel.readInt();
+					} finally {
+						channel.releaseExclusiveLock();
+					}
 					break;
 
 				case OTransactionEntry.DELETED:
-					channel.writeByte(OChannelDistributedProtocol.REQUEST_RECORD_DELETE);
-					channel.writeInt(0);
-					channel.writeShort((short) record.getIdentity().getClusterId());
-					channel.writeLong(record.getIdentity().getClusterPosition());
-					channel.writeInt(record.getVersion());
-					channel.flush();
-
-					readStatus();
-
-					channel.readLong();
+					channel.acquireExclusiveLock();
+					try {
+						channel.writeByte(OChannelDistributedProtocol.REQUEST_RECORD_DELETE);
+						channel.writeInt(0);
+						channel.writeShort((short) record.getIdentity().getClusterId());
+						channel.writeLong(record.getIdentity().getClusterPosition());
+						channel.writeInt(record.getVersion());
+						channel.flush();
+
+						readStatus();
+
+						channel.readLong();
+					} finally {
+						channel.releaseExclusiveLock();
+					}
 					break;
 				}
 			} catch (RuntimeException e) {
@@ -175,15 +200,13 @@ public void setAsTemporaryDisconnected(final int iServerOutSynchMaxBuffers) {
 	}
 
 	public void startSynchronization() {
-		final ODocument config = createDatabaseConfiguration();
-
 		// SEND THE LAST CONFIGURATION TO THE NODE
 		channel.acquireExclusiveLock();
 
 		try {
 			channel.out.writeByte(OChannelDistributedProtocol.REQUEST_DISTRIBUTED_DB_CONFIG);
 			channel.out.writeInt(0);
-			channel.writeBytes(config.toStream());
+			channel.writeBytes(manager.getClusterConfiguration().toStream());
 			channel.flush();
 
 			readStatus();
@@ -202,9 +225,51 @@ public void startSynchronization() {
 
 	@Override
 	public String toString() {
-		final StringBuilder builder = new StringBuilder();
-		builder.append(networkAddress).append("":"").append(networkPort);
-		return builder.toString();
+		return id;
+	}
+
+	public STATUS getStatus() {
+		return status;
+	}
+
+	public void shareDatabase(final ODatabaseRecord<?> iDatabase, final String iRemoteServerName, final String iEngineName,
+			final String iMode) throws IOException {
+		if (status == STATUS.DISCONNECTED)
+			throw new ODistributedSynchronizationException(""Can't share database '"" + iDatabase.getName() + ""' on remote server node '""
+					+ iRemoteServerName + ""' because is disconnected"");
+
+		channel.acquireExclusiveLock();
+
+		try {
+			status = STATUS.SYNCHRONIZING;
+
+			OLogManager.instance().info(this,
+					""Sharing database '"" + iDatabase.getName() + ""' to remote server "" + iRemoteServerName + ""..."");
+
+			// EXECUTE THE REQUEST ON REMOTE SERVER NODE
+			channel.writeByte(OChannelDistributedProtocol.REQUEST_DISTRIBUTED_DB_SHARE_RECEIVER);
+			channel.writeInt(0);
+			channel.writeString(iDatabase.getName());
+			channel.writeString(iEngineName);
+
+			OLogManager.instance().info(this, ""Exporting database '%s' via streaming to remote server node: %s..."", iDatabase.getName(),
+					iRemoteServerName);
+
+			// START THE EXPORT GIVING AS OUTPUTSTREAM THE CHANNEL TO STREAM THE EXPORT
+			new ODatabaseExport(iDatabase, new OChannelBinaryOutputStream(channel), this).exportDatabase();
+
+			OLogManager.instance().info(this, ""Database exported correctly"");
+
+			channel.readStatus();
+
+			status = STATUS.CONNECTED;
+
+		} finally {
+			channel.releaseExclusiveLock();
+		}
+	}
+
+	public void onMessage(String iText) {
 	}
 
 	private void synchronizeDelta() throws IOException {
@@ -212,8 +277,8 @@ private void synchronizeDelta() throws IOException {
 			if (bufferedChanges.isEmpty())
 				return;
 
-			OLogManager.instance().info(this, ""Started realignment of remote node %s:%d after a reconnection. Found %d updates"",
-					networkAddress, networkPort, bufferedChanges.size());
+			OLogManager.instance().info(this, ""Started realignment of remote node '%s' after a reconnection. Found %d updates"", id,
+					bufferedChanges.size());
 
 			status = STATUS.SYNCHRONIZING;
 
@@ -222,6 +287,8 @@ private void synchronizeDelta() throws IOException {
 			}
 			bufferedChanges.clear();
 
+			OLogManager.instance().info(this, ""Realignment of remote node '%s' done"", id);
+
 			status = STATUS.CONNECTED;
 		}
 
@@ -231,17 +298,4 @@ private void synchronizeDelta() throws IOException {
 	private int readStatus() throws IOException {
 		return channel.readStatus();
 	}
-
-	private ODocument createDatabaseConfiguration() {
-		final ODocument config = new ODocument();
-
-		config.field(""servers"", new ODocument(manager.getName(), new ODocument(""update-delay"", manager.getServerUpdateDelay())));
-		config.field(""clusters"", new ODocument(""*"", new ODocument(""owner"", manager.getName())));
-
-		return config;
-	}
-
-	public STATUS getStatus() {
-		return status;
-	}
 }
diff --git a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNodeChecker.java b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNodeChecker.java
index efdbf3cf902..c669a9f1338 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNodeChecker.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerNodeChecker.java
@@ -45,7 +45,7 @@ public void run() {
 
 			// CHECK EVERY SINGLE NODE
 			for (ODistributedServerNode node : nodeList) {
-				if (node.getStatus() != STATUS.DISCONNECTED)
+				if (node.getStatus() == STATUS.CONNECTED)
 					if (!node.sendHeartBeat(manager.networkTimeoutLeader)) {
 						manager.handleNodeFailure(node);
 					}
diff --git a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerRecordHook.java b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerRecordHook.java
index 37bc038dd3c..8ee04caf27a 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerRecordHook.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/handler/distributed/ODistributedServerRecordHook.java
@@ -15,52 +15,75 @@
  */
 package com.orientechnologies.orient.server.handler.distributed;
 
+import com.orientechnologies.common.log.OLogManager;
+import com.orientechnologies.orient.core.Orient;
+import com.orientechnologies.orient.core.db.ODatabase;
+import com.orientechnologies.orient.core.db.ODatabaseComplex;
+import com.orientechnologies.orient.core.db.ODatabaseLifecycleListener;
 import com.orientechnologies.orient.core.hook.ORecordHook;
 import com.orientechnologies.orient.core.record.ORecord;
 import com.orientechnologies.orient.core.record.ORecordInternal;
 import com.orientechnologies.orient.core.tx.OTransactionEntry;
-import com.orientechnologies.orient.server.OClientConnection;
 
 /**
  * Record hook implementation. Catches all the relevant events and propagates to the cluster's slave nodes.
  * 
  * @author Luca Garulli (l.garulli--at--orientechnologies.com)
  */
-public class ODistributedServerRecordHook implements ORecordHook {
+public class ODistributedServerRecordHook implements ORecordHook, ODatabaseLifecycleListener {
 
 	private ODistributedServerManager	manager;
-	private OClientConnection					connection;
 
-	public ODistributedServerRecordHook(final ODistributedServerManager iDistributedServerManager, final OClientConnection iConnection) {
+	/**
+	 * Auto install itself as lifecycle listener for databases.
+	 */
+	public ODistributedServerRecordHook(final ODistributedServerManager iDistributedServerManager) {
 		manager = iDistributedServerManager;
-		connection = iConnection;
+		Orient.instance().addDbLifecycleListener(this);
 	}
 
 	public void onTrigger(final TYPE iType, final ORecord<?> iRecord) {
 		if (!manager.isDistributedConfiguration())
 			return;
 
+		OLogManager.instance().info(
+				this,
+				""Caught change "" + iType + "" in database '"" + iRecord.getDatabase().getName() + ""', record: "" + iRecord.getIdentity()
+						+ "". Distribute the change in all the cluster nodes"");
+
 		switch (iType) {
 		case AFTER_CREATE:
-			manager.distributeRequest(connection, new OTransactionEntry<ORecordInternal<?>>((ORecordInternal<?>) iRecord,
-					OTransactionEntry.CREATED, null));
+			manager.distributeRequest(new OTransactionEntry<ORecordInternal<?>>((ORecordInternal<?>) iRecord, OTransactionEntry.CREATED,
+					null));
 			break;
 
 		case AFTER_UPDATE:
-			manager.distributeRequest(connection, new OTransactionEntry<ORecordInternal<?>>((ORecordInternal<?>) iRecord,
-					OTransactionEntry.UPDATED, null));
+			manager.distributeRequest(new OTransactionEntry<ORecordInternal<?>>((ORecordInternal<?>) iRecord, OTransactionEntry.UPDATED,
+					null));
 			break;
 
 		case AFTER_DELETE:
-			manager.distributeRequest(connection, new OTransactionEntry<ORecordInternal<?>>((ORecordInternal<?>) iRecord,
-					OTransactionEntry.DELETED, null));
+			manager.distributeRequest(new OTransactionEntry<ORecordInternal<?>>((ORecordInternal<?>) iRecord, OTransactionEntry.DELETED,
+					null));
 			break;
 
 		default:
 			// NOT DISTRIBUTED REQUEST, JUST RETURN
 			return;
 		}
+	}
+
+	/**
+	 * Install the itself as trigger to catch all the events against records
+	 */
+	public void onOpen(final ODatabase iDatabase) {
+		((ODatabaseComplex<?>) iDatabase).registerHook(this);
+	}
 
-		System.out.println(""\nCatched update to database: "" + iType + "" record: "" + iRecord);
+	/**
+	 * Remove itself as trigger to catch all the events against records
+	 */
+	public void onClose(final ODatabase iDatabase) {
+		((ODatabaseComplex<?>) iDatabase).unregisterHook(this);
 	}
 }
diff --git a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/ONetworkProtocolBinary.java b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/ONetworkProtocolBinary.java
index fe7f6dbedaa..33fb84a9357 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/ONetworkProtocolBinary.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/ONetworkProtocolBinary.java
@@ -21,7 +21,6 @@
 import java.net.SocketException;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -70,7 +69,7 @@
 import com.orientechnologies.orient.server.OServer;
 import com.orientechnologies.orient.server.OServerMain;
 import com.orientechnologies.orient.server.config.OServerUserConfiguration;
-import com.orientechnologies.orient.server.handler.OServerHandler;
+import com.orientechnologies.orient.server.handler.OServerHandlerHelper;
 import com.orientechnologies.orient.server.network.protocol.ONetworkProtocol;
 import com.orientechnologies.orient.server.tx.OTransactionOptimisticProxy;
 import com.orientechnologies.orient.server.tx.OTransactionRecordProxy;
@@ -120,20 +119,24 @@ protected void execute() throws Exception {
 
 			data.lastCommandReceived = System.currentTimeMillis();
 
-			invokeHandlerCallbackOnBeforeClientRequest((byte) requestType);
+			OServerHandlerHelper.invokeHandlerCallbackOnBeforeClientRequest(connection, (byte) requestType);
 
 			parseCommand();
 
-			invokeHandlerCallbackOnAfterClientRequest((byte) requestType);
+			OServerHandlerHelper.invokeHandlerCallbackOnAfterClientRequest(connection, (byte) requestType);
 
 		} catch (EOFException eof) {
+			OServerHandlerHelper.invokeHandlerCallbackOnClientError(connection, eof);
 			sendShutdown();
 		} catch (SocketException e) {
+			OServerHandlerHelper.invokeHandlerCallbackOnClientError(connection, e);
 			sendShutdown();
 		} catch (OException e) {
+			OServerHandlerHelper.invokeHandlerCallbackOnClientError(connection, e);
 			channel.clearInput();
 			sendError(clientTxId, e);
 		} catch (Throwable t) {
+			OServerHandlerHelper.invokeHandlerCallbackOnClientError(connection, t);
 			OLogManager.instance().error(this, ""Error on executing request"", t);
 			channel.clearInput();
 			sendError(clientTxId, t);
@@ -679,7 +682,7 @@ else if (iLinked instanceof Map<?, ?>)
 
 	@Override
 	public void startup() {
-		invokeHandlerCallbackOnClientDisconnection();
+		OServerHandlerHelper.invokeHandlerCallbackOnClientConnection(connection);
 	}
 
 	@Override
@@ -687,7 +690,7 @@ public void shutdown() {
 		sendShutdown();
 		channel.close();
 
-		invokeHandlerCallbackOnClientDisconnection();
+		OServerHandlerHelper.invokeHandlerCallbackOnClientDisconnection(connection);
 
 		OClientConnectionManager.instance().onClientDisconnection(connection.id);
 	}
@@ -780,46 +783,6 @@ private void writeRecord(final ORecordInternal<?> iRecord) throws IOException {
 		}
 	}
 
-	private void invokeHandlerCallbackOnClientConnection() {
-		final List<OServerHandler> handlers = OServerMain.server().getHandlers();
-		if (handlers != null)
-			for (OServerHandler handler : handlers) {
-				handler.onClientConnection(connection);
-			}
-	}
-
-	private void invokeHandlerCallbackOnClientDisconnection() {
-		final List<OServerHandler> handlers = OServerMain.server().getHandlers();
-		if (handlers != null)
-			for (OServerHandler handler : handlers) {
-				handler.onClientDisconnection(connection);
-			}
-	}
-
-	private void invokeHandlerCallbackOnBeforeClientRequest(final byte iRequestType) {
-		final List<OServerHandler> handlers = OServerMain.server().getHandlers();
-		if (handlers != null)
-			for (OServerHandler handler : handlers) {
-				handler.onBeforeClientRequest(connection, iRequestType);
-			}
-	}
-
-	private void invokeHandlerCallbackOnAfterClientRequest(final byte iRequestType) {
-		final List<OServerHandler> handlers = OServerMain.server().getHandlers();
-		if (handlers != null)
-			for (OServerHandler handler : handlers) {
-				handler.onAfterClientRequest(connection, iRequestType);
-			}
-	}
-
-	private void invokeHandlerCallbackOnClientError() {
-		final List<OServerHandler> handlers = OServerMain.server().getHandlers();
-		if (handlers != null)
-			for (OServerHandler handler : handlers) {
-				handler.onClientError(connection);
-			}
-	}
-
 	protected ODatabaseDocumentTx openDatabase(final String dbName, final String iUser, final String iPassword) {
 		// SEARCH THE DB IN MEMORY FIRST
 		ODatabaseDocumentTx db = (ODatabaseDocumentTx) OServerMain.server().getMemoryDatabases().get(dbName);
@@ -853,8 +816,6 @@ protected void createDatabase(final ODatabaseDocumentTx iDatabase) {
 		}
 
 		underlyingDatabase = ((ODatabaseRaw) ((ODatabaseComplex<?>) iDatabase.getUnderlying()).getUnderlying());
-
-		invokeHandlerCallbackOnClientConnection();
 	}
 
 	protected ODatabaseDocumentTx getDatabaseInstance(final String iDbName, final String iStorageMode) {
diff --git a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/distributed/ONetworkProtocolDistributed.java b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/distributed/ONetworkProtocolDistributed.java
index bf8cd470dd1..6bbaa7bfd48 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/distributed/ONetworkProtocolDistributed.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/distributed/ONetworkProtocolDistributed.java
@@ -20,20 +20,16 @@
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.command.OCommandOutputListener;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-import com.orientechnologies.orient.core.db.tool.ODatabaseExport;
 import com.orientechnologies.orient.core.db.tool.ODatabaseImport;
 import com.orientechnologies.orient.core.exception.OConfigurationException;
 import com.orientechnologies.orient.core.metadata.security.OUser;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.storage.impl.local.OStorageLocal;
 import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinaryInputStream;
-import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinaryOutputStream;
 import com.orientechnologies.orient.enterprise.channel.distributed.OChannelDistributedProtocol;
 import com.orientechnologies.orient.server.OServerMain;
 import com.orientechnologies.orient.server.handler.distributed.ODistributedServerManager;
 import com.orientechnologies.orient.server.handler.distributed.ODistributedServerNode;
-import com.orientechnologies.orient.server.handler.distributed.ODistributedServerNode.STATUS;
-import com.orientechnologies.orient.server.handler.distributed.ODistributedSynchronizationException;
 import com.orientechnologies.orient.server.network.protocol.binary.ONetworkProtocolBinary;
 
 /**
@@ -88,6 +84,7 @@ protected void parseCommand() throws IOException {
 				final String dbUser = channel.readString();
 				final String dbPassword = channel.readString();
 				final String remoteServerName = channel.readString();
+				final String mode = channel.readString();
 
 				checkServerAccess(""database.share"");
 
@@ -96,34 +93,8 @@ protected void parseCommand() throws IOException {
 				final String engineName = db.getStorage() instanceof OStorageLocal ? ""local"" : ""memory"";
 
 				final ODistributedServerNode remoteServerNode = manager.getNode(remoteServerName);
-				if (remoteServerNode.getStatus() == STATUS.DISCONNECTED)
-					throw new ODistributedSynchronizationException(""Can't share database '"" + dbName + ""' on remote server node '""
-							+ remoteServerName + ""' because is disconnected"");
 
-				try {
-					remoteServerNode.channel.acquireExclusiveLock();
-
-					OLogManager.instance().info(this, ""Sharing database '"" + dbName + ""' to remote server "" + remoteServerName + ""..."");
-
-					// EXECUTE THE REQUEST ON REMOTE SERVER NODE
-					remoteServerNode.channel.writeByte(OChannelDistributedProtocol.REQUEST_DISTRIBUTED_DB_SHARE_RECEIVER);
-					remoteServerNode.channel.writeInt(0);
-					remoteServerNode.channel.writeString(dbName);
-					remoteServerNode.channel.writeString(engineName);
-
-					OLogManager.instance().info(this, ""Exporting database '%s' via streaming to remote server node: %s..."", dbName,
-							remoteServerName);
-
-					// START THE EXPORT GIVING AS OUTPUTSTREAM THE CHANNEL TO STREAM THE EXPORT
-					new ODatabaseExport(db, new OChannelBinaryOutputStream(remoteServerNode.channel), this).exportDatabase();
-
-					OLogManager.instance().info(this, ""Database exported correctly"");
-
-					remoteServerNode.channel.readStatus();
-
-				} finally {
-					remoteServerNode.channel.releaseExclusiveLock();
-				}
+				remoteServerNode.shareDatabase(db, remoteServerName, engineName, mode);
 
 				sendOk(0);
 
diff --git a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/ONetworkProtocolHttpAbstract.java b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/ONetworkProtocolHttpAbstract.java
index 2eb8225aaba..f2d4a6a2e9c 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/ONetworkProtocolHttpAbstract.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/ONetworkProtocolHttpAbstract.java
@@ -44,6 +44,7 @@
 import com.orientechnologies.orient.server.OClientConnectionManager;
 import com.orientechnologies.orient.server.OServer;
 import com.orientechnologies.orient.server.config.OServerConfiguration;
+import com.orientechnologies.orient.server.handler.OServerHandlerHelper;
 import com.orientechnologies.orient.server.network.protocol.ONetworkProtocol;
 import com.orientechnologies.orient.server.network.protocol.http.command.OServerCommand;
 
@@ -120,10 +121,15 @@ public void service() throws ONetworkProtocolException, IOException {
 
 		if (cmd != null)
 			try {
+				OServerHandlerHelper.invokeHandlerCallbackOnBeforeClientRequest(connection, cmd);
+
 				if (cmd.beforeExecute(request)) {
 					// EXECUTE THE COMMAND
 					cmd.execute(request);
 				}
+
+				OServerHandlerHelper.invokeHandlerCallbackOnAfterClientRequest(connection, cmd);
+				
 			} catch (Exception e) {
 				handleError(e);
 			}"
4f4829ba44ea261c80e6d7971be664c157b48e9b,Valadoc,"Embedded: Search images relative to the file
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/content/blockcontent.vala b/src/libvaladoc/content/blockcontent.vala
index e466177978..d3d8a984ab 100755
--- a/src/libvaladoc/content/blockcontent.vala
+++ b/src/libvaladoc/content/blockcontent.vala
@@ -1,6 +1,7 @@
 /* blockcontent.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,9 +35,9 @@ public abstract class Valadoc.Content.BlockContent : ContentElement {
 	public override void configure (Settings settings, ResourceLocator locator) {
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		foreach (Block element in _content) {
-			element.check (api_root, container, reporter, settings);
+			element.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/comment.vala b/src/libvaladoc/content/comment.vala
index 6978b8f117..0c6f4496fe 100755
--- a/src/libvaladoc/content/comment.vala
+++ b/src/libvaladoc/content/comment.vala
@@ -1,6 +1,7 @@
 /* comment.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,11 +37,11 @@ public class Valadoc.Content.Comment : BlockContent {
 	public override void configure (Settings settings, ResourceLocator locator) {
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
-		base.check (api_root, container, reporter, settings);
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+		base.check (api_root, container, file_path, reporter, settings);
 
 		foreach (Taglet element in _taglets) {
-			element.check (api_root, container, reporter, settings);
+			element.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/contentelement.vala b/src/libvaladoc/content/contentelement.vala
index 427cf66071..be15e5bbdd 100755
--- a/src/libvaladoc/content/contentelement.vala
+++ b/src/libvaladoc/content/contentelement.vala
@@ -1,6 +1,7 @@
 /* contentelement.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,7 +29,7 @@ public abstract class Valadoc.Content.ContentElement : Object {
 	public virtual void configure (Settings settings, ResourceLocator locator) {
 	}
 
-	public abstract void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings);
+	public abstract void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings);
 
 	public abstract void accept (ContentVisitor visitor);
 
diff --git a/src/libvaladoc/content/contentfactory.vala b/src/libvaladoc/content/contentfactory.vala
index 19cf41be21..dda8a87636 100755
--- a/src/libvaladoc/content/contentfactory.vala
+++ b/src/libvaladoc/content/contentfactory.vala
@@ -1,6 +1,7 @@
 /* contentfactory.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libvaladoc/content/contentvisitor.vala b/src/libvaladoc/content/contentvisitor.vala
index 3eb3a4b3d4..d1b14c4538 100755
--- a/src/libvaladoc/content/contentvisitor.vala
+++ b/src/libvaladoc/content/contentvisitor.vala
@@ -1,6 +1,7 @@
 /* contentvisitor.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libvaladoc/content/embedded.vala b/src/libvaladoc/content/embedded.vala
index f158800aae..b8f4222589 100755
--- a/src/libvaladoc/content/embedded.vala
+++ b/src/libvaladoc/content/embedded.vala
@@ -1,6 +1,7 @@
 /* embedded.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -42,7 +43,18 @@ public class Valadoc.Content.Embedded : ContentElement, Inline, StyleAttributes
 		_locator = locator;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+		// search relative to our file
+		if (!Path.is_absolute (url)) {
+			string relative_to_file = Path.build_path (Path.DIR_SEPARATOR_S, Path.get_dirname (file_path), url);
+			if (FileUtils.test (relative_to_file, FileTest.EXISTS | FileTest.IS_REGULAR)) {
+				url = (owned) relative_to_file;
+				package = container.package;
+				return ;
+			}
+		}
+
+		// search relative to the current directory / absoulte path
 		if (!FileUtils.test (url, FileTest.EXISTS | FileTest.IS_REGULAR)) {
 			reporter.simple_error (""%s does not exist"", url);
 		} else {
diff --git a/src/libvaladoc/content/headline.vala b/src/libvaladoc/content/headline.vala
index c7fcb29ce9..36b19c23b0 100755
--- a/src/libvaladoc/content/headline.vala
+++ b/src/libvaladoc/content/headline.vala
@@ -1,6 +1,7 @@
 /* headline.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,12 +32,12 @@ public class Valadoc.Content.Headline : Block, InlineContent {
 		_level = 0;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// TODO report error if level == 0 ?
 		// TODO: content.size == 0?
 
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/inlinecontent.vala b/src/libvaladoc/content/inlinecontent.vala
index 389c66b96b..119f0569d8 100755
--- a/src/libvaladoc/content/inlinecontent.vala
+++ b/src/libvaladoc/content/inlinecontent.vala
@@ -1,6 +1,7 @@
 /* inlinecontent.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,9 +36,9 @@ public abstract class Valadoc.Content.InlineContent : ContentElement {
 	internal InlineContent () {
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		foreach (Inline element in _content) {
-			element.check (api_root, container, reporter, settings);
+			element.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala
index 813bcf3390..151395095f 100755
--- a/src/libvaladoc/content/inlinetaglet.vala
+++ b/src/libvaladoc/content/inlinetaglet.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -48,9 +49,9 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl
 		this.locator = locator;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		ContentElement element = get_content ();
-		element.check (api_root, container, reporter, settings);
+		element.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/link.vala b/src/libvaladoc/content/link.vala
index e114e96947..e2648981ad 100755
--- a/src/libvaladoc/content/link.vala
+++ b/src/libvaladoc/content/link.vala
@@ -1,6 +1,7 @@
 /* link.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,7 +34,7 @@ public class Valadoc.Content.Link : InlineContent, Inline {
 	public override void configure (Settings settings, ResourceLocator locator) {
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		//TODO: check url
 	}
 
diff --git a/src/libvaladoc/content/list.vala b/src/libvaladoc/content/list.vala
index c7bae59a85..e55489fe1e 100755
--- a/src/libvaladoc/content/list.vala
+++ b/src/libvaladoc/content/list.vala
@@ -1,6 +1,7 @@
 /* list.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -108,10 +109,10 @@ public class Valadoc.Content.List : ContentElement, Block {
 		_items = new ArrayList<ListItem> ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check individual list items
 		foreach (ListItem element in _items) {
-			element.check (api_root, container, reporter, settings);
+			element.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/listitem.vala b/src/libvaladoc/content/listitem.vala
index f6907964e8..ef5f589f7c 100755
--- a/src/libvaladoc/content/listitem.vala
+++ b/src/libvaladoc/content/listitem.vala
@@ -1,6 +1,7 @@
 /* listitem.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,12 +31,12 @@ public class Valadoc.Content.ListItem : InlineContent {
 		base ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 
 		if (sub_list != null) {
-			sub_list.check (api_root, container, reporter, settings);
+			sub_list.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/note.vala b/src/libvaladoc/content/note.vala
index d2b16c557c..40bb930198 100755
--- a/src/libvaladoc/content/note.vala
+++ b/src/libvaladoc/content/note.vala
@@ -1,6 +1,7 @@
 /* note.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,9 +29,9 @@ public class Valadoc.Content.Note : BlockContent, Block {
 		base ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/paragraph.vala b/src/libvaladoc/content/paragraph.vala
index 8f89b48b37..4998952d40 100755
--- a/src/libvaladoc/content/paragraph.vala
+++ b/src/libvaladoc/content/paragraph.vala
@@ -1,6 +1,7 @@
 /* paragraph.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,9 +33,9 @@ public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes {
 		base ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/run.vala b/src/libvaladoc/content/run.vala
index 519b424fe2..146d9c29e2 100755
--- a/src/libvaladoc/content/run.vala
+++ b/src/libvaladoc/content/run.vala
@@ -1,6 +1,7 @@
 /* run.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -117,9 +118,9 @@ public class Valadoc.Content.Run : InlineContent, Inline {
 		_style = style;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/sourcecode.vala b/src/libvaladoc/content/sourcecode.vala
index fb2bd625e9..338d23b24f 100755
--- a/src/libvaladoc/content/sourcecode.vala
+++ b/src/libvaladoc/content/sourcecode.vala
@@ -1,6 +1,7 @@
 /* sourcecode.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -64,7 +65,7 @@ public class Valadoc.Content.SourceCode : ContentElement, Inline{
 		_language = Language.VALA;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/symbollink.vala b/src/libvaladoc/content/symbollink.vala
index ef52b30101..aff9476e26 100755
--- a/src/libvaladoc/content/symbollink.vala
+++ b/src/libvaladoc/content/symbollink.vala
@@ -1,6 +1,7 @@
 /* symbollink.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +37,7 @@ public class Valadoc.Content.SymbolLink : ContentElement, Inline {
 	public override void configure (Settings settings, ResourceLocator locator) {
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/table.vala b/src/libvaladoc/content/table.vala
index dc232ae208..17fa589e8b 100755
--- a/src/libvaladoc/content/table.vala
+++ b/src/libvaladoc/content/table.vala
@@ -1,6 +1,7 @@
 /* table.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,12 +34,12 @@ public class Valadoc.Content.Table : ContentElement, Block {
 		_rows = new ArrayList<TableRow> ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check the table consistency in term of row/column number
 
 		// Check individual rows
 		foreach (var row in _rows) {
-			row.check (api_root, container, reporter, settings);
+			row.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/tablecell.vala b/src/libvaladoc/content/tablecell.vala
index 01e732f090..733aad1ca6 100755
--- a/src/libvaladoc/content/tablecell.vala
+++ b/src/libvaladoc/content/tablecell.vala
@@ -1,6 +1,7 @@
 /* tablecell.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,9 +37,9 @@ public class Valadoc.Content.TableCell : InlineContent, StyleAttributes {
 		_rowspan = 1;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/tablerow.vala b/src/libvaladoc/content/tablerow.vala
index 943c95f646..5cd59fd4bb 100755
--- a/src/libvaladoc/content/tablerow.vala
+++ b/src/libvaladoc/content/tablerow.vala
@@ -1,6 +1,7 @@
 /* tablerow.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,10 +34,10 @@ public class Valadoc.Content.TableRow : ContentElement {
 		_cells = new ArrayList<TableCell> ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check individual cells
 		foreach (var cell in _cells) {
-			cell.check (api_root, container, reporter, settings);
+			cell.check (api_root, container, file_path, reporter, settings);
 		}
 	}
 
diff --git a/src/libvaladoc/content/text.vala b/src/libvaladoc/content/text.vala
index 2b147235d5..6d3877e87e 100755
--- a/src/libvaladoc/content/text.vala
+++ b/src/libvaladoc/content/text.vala
@@ -1,6 +1,7 @@
 /* text.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +37,7 @@ public class Valadoc.Content.Text : ContentElement, Inline {
 		}
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/warning.vala b/src/libvaladoc/content/warning.vala
index e848c43f30..3ab9b3c736 100755
--- a/src/libvaladoc/content/warning.vala
+++ b/src/libvaladoc/content/warning.vala
@@ -1,6 +1,7 @@
 /* warning.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,9 +29,9 @@ public class Valadoc.Content.Warning : BlockContent, Block {
 		base ();
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check inline content
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/wikilink.vala b/src/libvaladoc/content/wikilink.vala
index e88bc18f71..e08719f6ab 100755
--- a/src/libvaladoc/content/wikilink.vala
+++ b/src/libvaladoc/content/wikilink.vala
@@ -1,6 +1,7 @@
 /* link.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,7 +35,7 @@ public class Valadoc.Content.WikiLink : InlineContent, Inline {
 	public override void configure (Settings settings, ResourceLocator locator) {
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		page = api_root.wikitree.search (name);
 		if (page == null) {
 			reporter.simple_warning (""%s does not exist"".printf (name));
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index f4a9667cd1..5fa736a5a6 100755
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -1,6 +1,7 @@
 /* documentationparser.vala
  *
- * Copyright (C) 2008-2011 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -76,7 +77,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 	public Comment? parse_comment_str (Api.Node element, string content, string filename, int first_line, int first_column) {
 		try {
 			Comment doc_comment = parse_comment (content, filename, first_line, first_column);
-			doc_comment.check (_tree, element, _reporter, _settings);
+			doc_comment.check (_tree, element, filename, _reporter, _settings);
 			return doc_comment;
 		} catch (ParserError error) {
 			return null;
@@ -94,7 +95,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 
 		try {
 			Page documentation = parse_wiki (page.documentation_str, page.get_filename ());
-			documentation.check (_tree, pkg, _reporter, _settings);
+			documentation.check (_tree, pkg, page.path, _reporter, _settings);
 			return documentation;
 		} catch (ParserError error) {
 			return null;
diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index 574e65fabb..b1486069d4 100644
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -1,6 +1,6 @@
 /* gtkcommentparser.vala
  *
- * Copyright (C) 2011  Florian Brosch
+ * Copyright (C) 2011-2012  Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -260,7 +260,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 			first = false;
 		}
 
-		comment.check (tree, element, reporter, settings);
+		comment.check (tree, element, gir_comment.file.relative_path, reporter, settings);
 		return comment;
 	}
 
diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala
index f51adc174f..468f6ec55f 100755
--- a/src/libvaladoc/taglets/tagletdeprecated.vala
+++ b/src/libvaladoc/taglets/tagletdeprecated.vala
@@ -1,6 +1,7 @@
 /* tagletdeprecated.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,8 +29,8 @@ public class Valadoc.Taglets.Deprecated : InlineContent, Taglet, Block {
 		return run_rule;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
-		base.check (api_root, container, reporter, settings);
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala
index 329db68696..653a448a10 100755
--- a/src/libvaladoc/taglets/tagletinheritdoc.vala
+++ b/src/libvaladoc/taglets/tagletinheritdoc.vala
@@ -1,6 +1,7 @@
 /* tagletinheritdoc.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,7 +31,7 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet {
 		return null;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// TODO Check that the container is an override of an abstract symbol
 		// Also retrieve that abstract symbol _inherited
 
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 3ebb6de3eb..cbe8dc499e 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -50,7 +51,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 		});
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		if (symbol_name.has_prefix (""c::"")) {
 			_symbol_name = _symbol_name.substring (3);
 			_symbol = api_root.search_symbol_cstr (container, symbol_name);
@@ -75,7 +76,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 			reporter.simple_warning (""%s: %s does not exist"", container.get_full_name (), symbol_name);
 		}
 
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override ContentElement produce_content () {
diff --git a/src/libvaladoc/taglets/tagletparam.vala b/src/libvaladoc/taglets/tagletparam.vala
index 6dfb235ef2..bbff4030b5 100755
--- a/src/libvaladoc/taglets/tagletparam.vala
+++ b/src/libvaladoc/taglets/tagletparam.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -40,7 +41,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
 	}
 
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// Check for the existence of such a parameter
 		this.parameter = null;
 
@@ -72,7 +73,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
 			reporter.simple_warning (""%s: Unknown parameter `%s'"", container.get_full_name (), parameter_name);
 		}
 
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala
index a4beee0c6a..5a2797737c 100755
--- a/src/libvaladoc/taglets/tagletreturn.vala
+++ b/src/libvaladoc/taglets/tagletreturn.vala
@@ -1,6 +1,7 @@
 /* taglet.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,10 +30,10 @@ public class Valadoc.Taglets.Return : InlineContent, Taglet, Block {
 		return run_rule;
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		// TODO check for the existence of a return type
 
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index 68ed636ed6..895e3c2a22 100755
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -1,6 +1,7 @@
 /* tagletsee.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,7 +39,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
 		});
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		if (symbol_name.has_prefix (""c::"")) {
 			symbol_name = symbol_name.substring (3);
 			symbol = api_root.search_symbol_cstr (container, symbol_name);
diff --git a/src/libvaladoc/taglets/tagletsince.vala b/src/libvaladoc/taglets/tagletsince.vala
index 5b68ecfe82..49acafbc0d 100755
--- a/src/libvaladoc/taglets/tagletsince.vala
+++ b/src/libvaladoc/taglets/tagletsince.vala
@@ -1,6 +1,7 @@
 /* tagletsince.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -37,7 +38,7 @@ public class Valadoc.Taglets.Since : ContentElement, Taglet, Block {
 		});
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 	}
 
 	public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index b592f6ca1e..547fbc7ca6 100755
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -1,6 +1,7 @@
 /* tagletthrows.vala
  *
- * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ * Copyright (C) 2008-2009 Didier Villevalois
+ * Copyright (C) 2008-2012 Florian Brosch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,14 +36,14 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
 		});
 	}
 
-	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
 		error_domain = api_root.search_symbol_str (container, error_domain_name);
 		if (error_domain == null) {
 			// TODO use ContentElement's source reference
 			reporter.simple_error (""%s does not exist"", error_domain_name);
 		}
 
-		base.check (api_root, container, reporter, settings);
+		base.check (api_root, container, file_path, reporter, settings);
 	}
 
 	public override void accept (ContentVisitor visitor) {"
1ec7b1afab5fd7c98cda53520c46eeec884fb672,Vala,"gdk-2.0: update to 2.18.6

Fixes bug 609293.
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index efe8e7e811..332b11eb01 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -90,7 +90,12 @@ namespace Gdk {
 		public weak Gdk.Device core_pointer;
 		public uint double_click_distance;
 		public uint double_click_time;
+		public uint ignore_core_events;
+		public weak Gdk.KeyboardGrabInfo keyboard_grab;
+		public uint32 last_event_time;
+		public weak GLib.List pointer_grabs;
 		public weak Gdk.DisplayPointerHooks pointer_hooks;
+		public weak Gdk.PointerWindowInfo pointer_info;
 		public weak GLib.List queued_events;
 		public weak GLib.List queued_tail;
 		public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func);
@@ -170,6 +175,8 @@ namespace Gdk {
 	public class Drawable : GLib.Object {
 		public unowned Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 		[NoWrapper]
+		public virtual unowned Cairo.Surface create_cairo_surface (int width, int height);
+		[NoWrapper]
 		public virtual unowned Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
 		[CCode (cname = ""gdk_draw_arc"")]
 		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
@@ -208,10 +215,14 @@ namespace Gdk {
 		public virtual unowned Gdk.Image get_image (int x, int y, int width, int height);
 		public virtual unowned Gdk.Screen get_screen ();
 		public virtual void get_size (out int width, out int height);
+		[NoWrapper]
+		public virtual unowned Gdk.Drawable get_source_drawable ();
 		public virtual unowned Gdk.Region get_visible_region ();
 		public virtual unowned Gdk.Visual get_visual ();
 		[NoWrapper]
 		public virtual unowned Cairo.Surface ref_cairo_surface ();
+		[NoWrapper]
+		public virtual void set_cairo_clip (Cairo.Context cr);
 		public virtual void set_colormap (Gdk.Colormap colormap);
 	}
 	[Compact]
@@ -244,7 +255,6 @@ namespace Gdk {
 		public static unowned Gdk.Event @get ();
 		public bool get_axis (Gdk.AxisUse axis_use, out double value);
 		public bool get_coords (out double x_win, out double y_win);
-		public static unowned Gdk.Event get_graphics_expose (Gdk.Window window);
 		public bool get_root_coords (out double x_root, out double y_root);
 		public unowned Gdk.Screen get_screen ();
 		public bool get_state (out Gdk.ModifierType state);
@@ -326,6 +336,16 @@ namespace Gdk {
 		public void put_pixel (int x, int y, uint32 pixel);
 		public void set_colormap (Gdk.Colormap colormap);
 	}
+	[Compact]
+	[CCode (cheader_filename = ""gdk/gdk.h"")]
+	public class KeyboardGrabInfo {
+		public weak Gdk.Window native_window;
+		public bool owner_events;
+		public ulong serial;
+		public uint32 time;
+		public weak Gdk.Window window;
+		public static bool libgtk_only (Gdk.Display display, out unowned Gdk.Window grab_window, bool owner_events);
+	}
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public class Keymap : GLib.Object {
 		public weak Gdk.Display display;
@@ -376,6 +396,17 @@ namespace Gdk {
 		public weak GLib.Callback window_at_pointer;
 	}
 	[Compact]
+	[CCode (cheader_filename = ""gdk/gdk.h"")]
+	public class PointerWindowInfo {
+		public uint32 button;
+		public ulong motion_hint_serial;
+		public uint32 state;
+		public weak Gdk.Window toplevel_under_pointer;
+		public double toplevel_x;
+		public double toplevel_y;
+		public weak Gdk.Window window_under_pointer;
+	}
+	[Compact]
 	[CCode (copy_function = ""gdk_region_copy"", free_function = ""gdk_region_destroy"", cheader_filename = ""gdk/gdk.h"")]
 	public class Region {
 		[CCode (has_construct_function = false)]
@@ -389,6 +420,7 @@ namespace Gdk {
 		public void offset (int dx, int dy);
 		public bool point_in (int x, int y);
 		public static Gdk.Region polygon (Gdk.Point[] points, Gdk.FillRule fill_rule);
+		public bool rect_equal (Gdk.Rectangle rectangle);
 		public Gdk.OverlapType rect_in (Gdk.Rectangle rectangle);
 		public static Gdk.Region rectangle (Gdk.Rectangle rectangle);
 		public void shrink (int dx, int dy);
@@ -405,6 +437,8 @@ namespace Gdk {
 		public weak Gdk.GC[] exposure_gcs;
 		[CCode (array_length = false)]
 		public weak Gdk.GC[] normal_gcs;
+		[CCode (array_length = false)]
+		public weak Gdk.GC[] subwindow_gcs;
 		public void broadcast_client_message (Gdk.Event event);
 		public unowned Gdk.Window get_active_window ();
 		public static unowned Gdk.Screen get_default ();
@@ -493,17 +527,21 @@ namespace Gdk {
 		public static void constrain_size (Gdk.Geometry geometry, uint flags, int width, int height, out int new_width, out int new_height);
 		public void deiconify ();
 		public void destroy ();
-		public void destroy_notify ();
 		public void enable_synchronized_configure ();
 		public void end_paint ();
+		public bool ensure_native ();
+		public void flush ();
 		public void focus (uint32 timestamp);
 		public static unowned Gdk.Window foreign_new (Gdk.NativeWindow anid);
 		public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		public void freeze_toplevel_updates_libgtk_only ();
 		public void freeze_updates ();
 		public void fullscreen ();
+		public void geometry_changed ();
 		public unowned GLib.List get_children ();
+		public unowned Gdk.Cursor? get_cursor ();
 		public bool get_decorations (out Gdk.WMDecoration decorations);
+		public bool get_deskrelative_origin (out int x, out int y);
 		public Gdk.EventMask get_events ();
 		public void get_frame_extents (out Gdk.Rectangle rect);
 		public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
@@ -513,6 +551,7 @@ namespace Gdk {
 		public unowned Gdk.Window get_parent ();
 		public unowned Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
 		public void get_position (out int x, out int y);
+		public void get_root_coords (int x, int y, int root_x, int root_y);
 		public void get_root_origin (out int x, out int y);
 		public Gdk.WindowState get_state ();
 		public unowned Gdk.Window get_toplevel ();
@@ -527,6 +566,7 @@ namespace Gdk {
 		public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func);
 		public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children);
 		public void invalidate_region (Gdk.Region region, bool invalidate_children);
+		public bool is_destroyed ();
 		public bool is_viewable ();
 		public bool is_visible ();
 		public static unowned Gdk.Window lookup (Gdk.NativeWindow anid);
@@ -547,6 +587,7 @@ namespace Gdk {
 		public void remove_redirection ();
 		public void reparent (Gdk.Window new_parent, int x, int y);
 		public void resize (int width, int height);
+		public void restack (Gdk.Window sibling, bool above);
 		public void scroll (int dx, int dy);
 		public void set_accept_focus (bool accept_focus);
 		public void set_back_pixmap (Gdk.Pixmap? pixmap, bool parent_relative);
@@ -591,6 +632,10 @@ namespace Gdk {
 		public void unmaximize ();
 		public void unstick ();
 		public void withdraw ();
+		public Gdk.Cursor cursor { get; set; }
+		public virtual signal void from_embedder (double p0, double p1, void* p2, void* p3);
+		public virtual signal unowned Gdk.Window pick_embedded_child (double p0, double p1);
+		public virtual signal void to_embedder (double p0, double p1, void* p2, void* p3);
 	}
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	[SimpleType]
@@ -1172,7 +1217,8 @@ namespace Gdk {
 		SETTING,
 		OWNER_CHANGE,
 		GRAB_BROKEN,
-		DAMAGE
+		DAMAGE,
+		EVENT_LAST
 	}
 	[CCode (cprefix = ""GDK_EXTENSION_EVENTS_"", cheader_filename = ""gdk/gdk.h"")]
 	public enum ExtensionMode {
@@ -1485,7 +1531,8 @@ namespace Gdk {
 		CHILD,
 		DIALOG,
 		TEMP,
-		FOREIGN
+		FOREIGN,
+		OFFSCREEN
 	}
 	[CCode (cprefix = ""GDK_WINDOW_TYPE_HINT_"", cheader_filename = ""gdk/gdk.h"")]
 	public enum WindowTypeHint {
@@ -1539,6 +1586,8 @@ namespace Gdk {
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void cairo_region (Cairo.Context cr, Gdk.Region region);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
+	public static void cairo_reset_clip (Cairo.Context cr, Gdk.Drawable drawable);
+	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void cairo_set_source_color (Cairo.Context cr, Gdk.Color color);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
@@ -1661,8 +1710,6 @@ namespace Gdk {
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint32 time_);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
-	public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out unowned Gdk.Window grab_window, bool owner_events);
-	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void keyboard_ungrab (uint32 time_);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void keyval_convert_case (uint symbol, uint lower, uint upper);
@@ -1687,6 +1734,12 @@ namespace Gdk {
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void notify_startup_complete_with_id (string startup_id);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
+	public static unowned Gdk.Window? offscreen_window_get_embedder (Gdk.Window window);
+	[CCode (cheader_filename = ""gdk/gdk.h"")]
+	public static unowned Gdk.Pixmap? offscreen_window_get_pixmap (Gdk.Window window);
+	[CCode (cheader_filename = ""gdk/gdk.h"")]
+	public static void offscreen_window_set_embedder (Gdk.Window window, Gdk.Window embedder);
+	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static unowned Pango.Context pango_context_get ();
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static unowned Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
@@ -1753,7 +1806,7 @@ namespace Gdk {
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
-	public static bool selection_property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
+	public static int selection_property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void selection_send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
@@ -1783,8 +1836,6 @@ namespace Gdk {
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static int string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
-	public static void synthesize_window_state (Gdk.Window window, Gdk.WindowState unset_flags, Gdk.WindowState set_flags);
-	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static void test_render_sync (Gdk.Window window);
 	[CCode (cheader_filename = ""gdk/gdk.h"")]
 	public static bool test_simulate_button (Gdk.Window window, int x, int y, uint button, Gdk.ModifierType modifiers, Gdk.EventType button_pressrelease);
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.excludes b/vapi/packages/gdk-2.0/gdk-2.0.excludes
index e44260e8fc..9ca941ac4a 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.excludes
+++ b/vapi/packages/gdk-2.0/gdk-2.0.excludes
@@ -1,3 +1,6 @@
 gdkalias.h
 gdkkeysyms.h
 gdkx.h
+gdkdirectfb.h
+gdkprivate.h
+gdkprivate-directfb.h
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi
index e2f5c77807..ed82bd46b4 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.gi
+++ b/vapi/packages/gdk-2.0/gdk-2.0.gi
@@ -38,6 +38,13 @@
 				<parameter name=""region"" type=""GdkRegion*""/>
 			</parameters>
 		</function>
+		<function name=""cairo_reset_clip"" symbol=""gdk_cairo_reset_clip"">
+			<return-type type=""void""/>
+			<parameters>
+				<parameter name=""cr"" type=""cairo_t*""/>
+				<parameter name=""drawable"" type=""GdkDrawable*""/>
+			</parameters>
+		</function>
 		<function name=""cairo_set_source_color"" symbol=""gdk_cairo_set_source_color"">
 			<return-type type=""void""/>
 			<parameters>
@@ -587,14 +594,6 @@
 				<parameter name=""time_"" type=""guint32""/>
 			</parameters>
 		</function>
-		<function name=""keyboard_grab_info_libgtk_only"" symbol=""gdk_keyboard_grab_info_libgtk_only"">
-			<return-type type=""gboolean""/>
-			<parameters>
-				<parameter name=""display"" type=""GdkDisplay*""/>
-				<parameter name=""grab_window"" type=""GdkWindow**""/>
-				<parameter name=""owner_events"" type=""gboolean*""/>
-			</parameters>
-		</function>
 		<function name=""keyboard_ungrab"" symbol=""gdk_keyboard_ungrab"">
 			<return-type type=""void""/>
 			<parameters>
@@ -663,6 +662,25 @@
 				<parameter name=""startup_id"" type=""gchar*""/>
 			</parameters>
 		</function>
+		<function name=""offscreen_window_get_embedder"" symbol=""gdk_offscreen_window_get_embedder"">
+			<return-type type=""GdkWindow*""/>
+			<parameters>
+				<parameter name=""window"" type=""GdkWindow*""/>
+			</parameters>
+		</function>
+		<function name=""offscreen_window_get_pixmap"" symbol=""gdk_offscreen_window_get_pixmap"">
+			<return-type type=""GdkPixmap*""/>
+			<parameters>
+				<parameter name=""window"" type=""GdkWindow*""/>
+			</parameters>
+		</function>
+		<function name=""offscreen_window_set_embedder"" symbol=""gdk_offscreen_window_set_embedder"">
+			<return-type type=""void""/>
+			<parameters>
+				<parameter name=""window"" type=""GdkWindow*""/>
+				<parameter name=""embedder"" type=""GdkWindow*""/>
+			</parameters>
+		</function>
 		<function name=""pango_context_get"" symbol=""gdk_pango_context_get"">
 			<return-type type=""PangoContext*""/>
 		</function>
@@ -921,7 +939,7 @@
 			</parameters>
 		</function>
 		<function name=""selection_property_get"" symbol=""gdk_selection_property_get"">
-			<return-type type=""gboolean""/>
+			<return-type type=""gint""/>
 			<parameters>
 				<parameter name=""requestor"" type=""GdkWindow*""/>
 				<parameter name=""data"" type=""guchar**""/>
@@ -1050,14 +1068,6 @@
 				<parameter name=""length"" type=""gint*""/>
 			</parameters>
 		</function>
-		<function name=""synthesize_window_state"" symbol=""gdk_synthesize_window_state"">
-			<return-type type=""void""/>
-			<parameters>
-				<parameter name=""window"" type=""GdkWindow*""/>
-				<parameter name=""unset_flags"" type=""GdkWindowState""/>
-				<parameter name=""set_flags"" type=""GdkWindowState""/>
-			</parameters>
-		</function>
 		<function name=""test_render_sync"" symbol=""gdk_test_render_sync"">
 			<return-type type=""void""/>
 			<parameters>
@@ -1523,6 +1533,21 @@
 			<field name=""max_aspect"" type=""gdouble""/>
 			<field name=""win_gravity"" type=""GdkGravity""/>
 		</struct>
+		<struct name=""GdkKeyboardGrabInfo"">
+			<method name=""libgtk_only"" symbol=""gdk_keyboard_grab_info_libgtk_only"">
+				<return-type type=""gboolean""/>
+				<parameters>
+					<parameter name=""display"" type=""GdkDisplay*""/>
+					<parameter name=""grab_window"" type=""GdkWindow**""/>
+					<parameter name=""owner_events"" type=""gboolean*""/>
+				</parameters>
+			</method>
+			<field name=""window"" type=""GdkWindow*""/>
+			<field name=""native_window"" type=""GdkWindow*""/>
+			<field name=""serial"" type=""gulong""/>
+			<field name=""owner_events"" type=""gboolean""/>
+			<field name=""time"" type=""guint32""/>
+		</struct>
 		<struct name=""GdkKeymapKey"">
 			<field name=""keycode"" type=""guint""/>
 			<field name=""group"" type=""gint""/>
@@ -1576,6 +1601,15 @@
 			<field name=""get_pointer"" type=""GCallback""/>
 			<field name=""window_at_pointer"" type=""GCallback""/>
 		</struct>
+		<struct name=""GdkPointerWindowInfo"">
+			<field name=""toplevel_under_pointer"" type=""GdkWindow*""/>
+			<field name=""window_under_pointer"" type=""GdkWindow*""/>
+			<field name=""toplevel_x"" type=""gdouble""/>
+			<field name=""toplevel_y"" type=""gdouble""/>
+			<field name=""state"" type=""guint32""/>
+			<field name=""button"" type=""guint32""/>
+			<field name=""motion_hint_serial"" type=""gulong""/>
+		</struct>
 		<struct name=""GdkRegion"">
 			<method name=""copy"" symbol=""gdk_region_copy"">
 				<return-type type=""GdkRegion*""/>
@@ -1651,6 +1685,13 @@
 					<parameter name=""fill_rule"" type=""GdkFillRule""/>
 				</parameters>
 			</method>
+			<method name=""rect_equal"" symbol=""gdk_region_rect_equal"">
+				<return-type type=""gboolean""/>
+				<parameters>
+					<parameter name=""region"" type=""GdkRegion*""/>
+					<parameter name=""rectangle"" type=""GdkRectangle*""/>
+				</parameters>
+			</method>
 			<method name=""rect_in"" symbol=""gdk_region_rect_in"">
 				<return-type type=""GdkOverlapType""/>
 				<parameters>
@@ -1775,35 +1816,6 @@
 			<field name=""type_hint"" type=""GdkWindowTypeHint""/>
 		</struct>
 		<struct name=""GdkWindowObject"">
-			<field name=""parent_instance"" type=""GdkDrawable""/>
-			<field name=""impl"" type=""GdkDrawable*""/>
-			<field name=""parent"" type=""GdkWindowObject*""/>
-			<field name=""user_data"" type=""gpointer""/>
-			<field name=""x"" type=""gint""/>
-			<field name=""y"" type=""gint""/>
-			<field name=""extension_events"" type=""gint""/>
-			<field name=""filters"" type=""GList*""/>
-			<field name=""children"" type=""GList*""/>
-			<field name=""bg_color"" type=""GdkColor""/>
-			<field name=""bg_pixmap"" type=""GdkPixmap*""/>
-			<field name=""paint_stack"" type=""GSList*""/>
-			<field name=""update_area"" type=""GdkRegion*""/>
-			<field name=""update_freeze_count"" type=""guint""/>
-			<field name=""window_type"" type=""guint8""/>
-			<field name=""depth"" type=""guint8""/>
-			<field name=""resize_count"" type=""guint8""/>
-			<field name=""state"" type=""GdkWindowState""/>
-			<field name=""guffaw_gravity"" type=""guint""/>
-			<field name=""input_only"" type=""guint""/>
-			<field name=""modal_hint"" type=""guint""/>
-			<field name=""composited"" type=""guint""/>
-			<field name=""destroyed"" type=""guint""/>
-			<field name=""accept_focus"" type=""guint""/>
-			<field name=""focus_on_map"" type=""guint""/>
-			<field name=""shaped"" type=""guint""/>
-			<field name=""event_mask"" type=""GdkEventMask""/>
-			<field name=""update_and_descendants_freeze_count"" type=""guint""/>
-			<field name=""redirect"" type=""GdkWindowRedirect*""/>
 		</struct>
 		<struct name=""GdkWindowObjectClass"">
 			<field name=""parent_class"" type=""GdkDrawableClass""/>
@@ -1969,12 +1981,6 @@
 					<parameter name=""y_win"" type=""gdouble*""/>
 				</parameters>
 			</method>
-			<method name=""get_graphics_expose"" symbol=""gdk_event_get_graphics_expose"">
-				<return-type type=""GdkEvent*""/>
-				<parameters>
-					<parameter name=""window"" type=""GdkWindow*""/>
-				</parameters>
-			</method>
 			<method name=""get_root_coords"" symbol=""gdk_event_get_root_coords"">
 				<return-type type=""gboolean""/>
 				<parameters>
@@ -2305,6 +2311,7 @@
 			<member name=""GDK_OWNER_CHANGE"" value=""34""/>
 			<member name=""GDK_GRAB_BROKEN"" value=""35""/>
 			<member name=""GDK_DAMAGE"" value=""36""/>
+			<member name=""GDK_EVENT_LAST"" value=""37""/>
 		</enum>
 		<enum name=""GdkExtensionMode"" type-name=""GdkExtensionMode"" get-type=""gdk_extension_mode_get_type"">
 			<member name=""GDK_EXTENSION_EVENTS_NONE"" value=""0""/>
@@ -2481,6 +2488,7 @@
 			<member name=""GDK_WINDOW_DIALOG"" value=""3""/>
 			<member name=""GDK_WINDOW_TEMP"" value=""4""/>
 			<member name=""GDK_WINDOW_FOREIGN"" value=""5""/>
+			<member name=""GDK_WINDOW_OFFSCREEN"" value=""6""/>
 		</enum>
 		<enum name=""GdkWindowTypeHint"" type-name=""GdkWindowTypeHint"" get-type=""gdk_window_type_hint_get_type"">
 			<member name=""GDK_WINDOW_TYPE_HINT_NORMAL"" value=""0""/>
@@ -3111,9 +3119,14 @@
 			<field name=""core_pointer"" type=""GdkDevice*""/>
 			<field name=""pointer_hooks"" type=""GdkDisplayPointerHooks*""/>
 			<field name=""closed"" type=""guint""/>
+			<field name=""ignore_core_events"" type=""guint""/>
 			<field name=""double_click_distance"" type=""guint""/>
 			<field name=""button_x"" type=""gint[]""/>
 			<field name=""button_y"" type=""gint[]""/>
+			<field name=""pointer_grabs"" type=""GList*""/>
+			<field name=""keyboard_grab"" type=""GdkKeyboardGrabInfo""/>
+			<field name=""pointer_info"" type=""GdkPointerWindowInfo""/>
+			<field name=""last_event_time"" type=""guint32""/>
 		</object>
 		<object name=""GdkDisplayManager"" parent=""GObject"" type-name=""GdkDisplayManager"" get-type=""gdk_display_manager_get_type"">
 			<method name=""get"" symbol=""gdk_display_manager_get"">
@@ -3243,6 +3256,14 @@
 					<parameter name=""colormap"" type=""GdkColormap*""/>
 				</parameters>
 			</method>
+			<vfunc name=""create_cairo_surface"">
+				<return-type type=""cairo_surface_t*""/>
+				<parameters>
+					<parameter name=""drawable"" type=""GdkDrawable*""/>
+					<parameter name=""width"" type=""int""/>
+					<parameter name=""height"" type=""int""/>
+				</parameters>
+			</vfunc>
 			<vfunc name=""create_gc"">
 				<return-type type=""GdkGC*""/>
 				<parameters>
@@ -3279,6 +3300,21 @@
 					<parameter name=""height"" type=""gint""/>
 				</parameters>
 			</vfunc>
+			<vfunc name=""draw_drawable_with_src"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""drawable"" type=""GdkDrawable*""/>
+					<parameter name=""gc"" type=""GdkGC*""/>
+					<parameter name=""src"" type=""GdkDrawable*""/>
+					<parameter name=""xsrc"" type=""gint""/>
+					<parameter name=""ysrc"" type=""gint""/>
+					<parameter name=""xdest"" type=""gint""/>
+					<parameter name=""ydest"" type=""gint""/>
+					<parameter name=""width"" type=""gint""/>
+					<parameter name=""height"" type=""gint""/>
+					<parameter name=""original_src"" type=""GdkDrawable*""/>
+				</parameters>
+			</vfunc>
 			<vfunc name=""draw_glyphs"">
 				<return-type type=""void""/>
 				<parameters>
@@ -3469,6 +3505,12 @@
 					<parameter name=""height"" type=""gint*""/>
 				</parameters>
 			</vfunc>
+			<vfunc name=""get_source_drawable"">
+				<return-type type=""GdkDrawable*""/>
+				<parameters>
+					<parameter name=""drawable"" type=""GdkDrawable*""/>
+				</parameters>
+			</vfunc>
 			<vfunc name=""get_visible_region"">
 				<return-type type=""GdkRegion*""/>
 				<parameters>
@@ -3487,6 +3529,13 @@
 					<parameter name=""drawable"" type=""GdkDrawable*""/>
 				</parameters>
 			</vfunc>
+			<vfunc name=""set_cairo_clip"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""drawable"" type=""GdkDrawable*""/>
+					<parameter name=""cr"" type=""cairo_t*""/>
+				</parameters>
+			</vfunc>
 			<vfunc name=""set_colormap"">
 				<return-type type=""void""/>
 				<parameters>
@@ -4254,6 +4303,7 @@
 			<field name=""closed"" type=""guint""/>
 			<field name=""normal_gcs"" type=""GdkGC*[]""/>
 			<field name=""exposure_gcs"" type=""GdkGC*[]""/>
+			<field name=""subwindow_gcs"" type=""GdkGC*[]""/>
 			<field name=""font_options"" type=""cairo_font_options_t*""/>
 			<field name=""resolution"" type=""double""/>
 		</object>
@@ -4422,19 +4472,25 @@
 					<parameter name=""window"" type=""GdkWindow*""/>
 				</parameters>
 			</method>
-			<method name=""destroy_notify"" symbol=""gdk_window_destroy_notify"">
+			<method name=""enable_synchronized_configure"" symbol=""gdk_window_enable_synchronized_configure"">
 				<return-type type=""void""/>
 				<parameters>
 					<parameter name=""window"" type=""GdkWindow*""/>
 				</parameters>
 			</method>
-			<method name=""enable_synchronized_configure"" symbol=""gdk_window_enable_synchronized_configure"">
+			<method name=""end_paint"" symbol=""gdk_window_end_paint"">
 				<return-type type=""void""/>
 				<parameters>
 					<parameter name=""window"" type=""GdkWindow*""/>
 				</parameters>
 			</method>
-			<method name=""end_paint"" symbol=""gdk_window_end_paint"">
+			<method name=""ensure_native"" symbol=""gdk_window_ensure_native"">
+				<return-type type=""gboolean""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+				</parameters>
+			</method>
+			<method name=""flush"" symbol=""gdk_window_flush"">
 				<return-type type=""void""/>
 				<parameters>
 					<parameter name=""window"" type=""GdkWindow*""/>
@@ -4478,12 +4534,24 @@
 					<parameter name=""window"" type=""GdkWindow*""/>
 				</parameters>
 			</method>
+			<method name=""geometry_changed"" symbol=""gdk_window_geometry_changed"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+				</parameters>
+			</method>
 			<method name=""get_children"" symbol=""gdk_window_get_children"">
 				<return-type type=""GList*""/>
 				<parameters>
 					<parameter name=""window"" type=""GdkWindow*""/>
 				</parameters>
 			</method>
+			<method name=""get_cursor"" symbol=""gdk_window_get_cursor"">
+				<return-type type=""GdkCursor*""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+				</parameters>
+			</method>
 			<method name=""get_decorations"" symbol=""gdk_window_get_decorations"">
 				<return-type type=""gboolean""/>
 				<parameters>
@@ -4491,6 +4559,14 @@
 					<parameter name=""decorations"" type=""GdkWMDecoration*""/>
 				</parameters>
 			</method>
+			<method name=""get_deskrelative_origin"" symbol=""gdk_window_get_deskrelative_origin"">
+				<return-type type=""gboolean""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+					<parameter name=""x"" type=""gint*""/>
+					<parameter name=""y"" type=""gint*""/>
+				</parameters>
+			</method>
 			<method name=""get_events"" symbol=""gdk_window_get_events"">
 				<return-type type=""GdkEventMask""/>
 				<parameters>
@@ -4561,6 +4637,16 @@
 					<parameter name=""y"" type=""gint*""/>
 				</parameters>
 			</method>
+			<method name=""get_root_coords"" symbol=""gdk_window_get_root_coords"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+					<parameter name=""x"" type=""gint""/>
+					<parameter name=""y"" type=""gint""/>
+					<parameter name=""root_x"" type=""gint*""/>
+					<parameter name=""root_y"" type=""gint*""/>
+				</parameters>
+			</method>
 			<method name=""get_root_origin"" symbol=""gdk_window_get_root_origin"">
 				<return-type type=""void""/>
 				<parameters>
@@ -4661,6 +4747,12 @@
 					<parameter name=""invalidate_children"" type=""gboolean""/>
 				</parameters>
 			</method>
+			<method name=""is_destroyed"" symbol=""gdk_window_is_destroyed"">
+				<return-type type=""gboolean""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+				</parameters>
+			</method>
 			<method name=""is_viewable"" symbol=""gdk_window_is_viewable"">
 				<return-type type=""gboolean""/>
 				<parameters>
@@ -4804,6 +4896,14 @@
 					<parameter name=""height"" type=""gint""/>
 				</parameters>
 			</method>
+			<method name=""restack"" symbol=""gdk_window_restack"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""window"" type=""GdkWindow*""/>
+					<parameter name=""sibling"" type=""GdkWindow*""/>
+					<parameter name=""above"" type=""gboolean""/>
+				</parameters>
+			</method>
 			<method name=""scroll"" symbol=""gdk_window_scroll"">
 				<return-type type=""void""/>
 				<parameters>
@@ -5109,6 +5209,35 @@
 					<parameter name=""window"" type=""GdkWindow*""/>
 				</parameters>
 			</method>
+			<property name=""cursor"" type=""GdkCursor*"" readable=""1"" writable=""1"" construct=""0"" construct-only=""0""/>
+			<signal name=""from-embedder"" when=""LAST"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""object"" type=""GdkWindow*""/>
+					<parameter name=""p0"" type=""gdouble""/>
+					<parameter name=""p1"" type=""gdouble""/>
+					<parameter name=""p2"" type=""gpointer""/>
+					<parameter name=""p3"" type=""gpointer""/>
+				</parameters>
+			</signal>
+			<signal name=""pick-embedded-child"" when=""LAST"">
+				<return-type type=""GdkWindow*""/>
+				<parameters>
+					<parameter name=""object"" type=""GdkWindow*""/>
+					<parameter name=""p0"" type=""gdouble""/>
+					<parameter name=""p1"" type=""gdouble""/>
+				</parameters>
+			</signal>
+			<signal name=""to-embedder"" when=""LAST"">
+				<return-type type=""void""/>
+				<parameters>
+					<parameter name=""object"" type=""GdkWindow*""/>
+					<parameter name=""p0"" type=""gdouble""/>
+					<parameter name=""p1"" type=""gdouble""/>
+					<parameter name=""p2"" type=""gpointer""/>
+					<parameter name=""p3"" type=""gpointer""/>
+				</parameters>
+			</signal>
 		</object>
 		<constant name=""GDK_CURRENT_TIME"" type=""int"" value=""0""/>
 		<constant name=""GDK_MAX_TIMECOORD_AXES"" type=""int"" value=""128""/>
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index 261ea0e141..68669dd3ba 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -63,6 +63,8 @@ gdk_keymap_get_entries_for_keycode.keyvals is_array=""1"" is_out=""1""
 gdk_keymap_get_entries_for_keyval.keys is_array=""1"" is_out=""1""
 GdkKeymapKey is_value_type=""1""
 GdkNativeWindow is_value_type=""1"" simple_type=""1""
+gdk_offscreen_window_get_embedder nullable=""1""
+gdk_offscreen_window_get_pixmap nullable=""1""
 GdkPangoAttr* is_value_type=""1""
 gdk_pixbuf_get_from_drawable.dest nullable=""1""
 gdk_pixbuf_get_from_drawable.cmap nullable=""1""
@@ -126,6 +128,7 @@ GdkWindowClass common_prefix=""GDK_""
 GdkWindowObject hidden=""1""
 GdkWindowObjectClass hidden=""1""
 GdkWindowRedirect is_value_type=""1""
+gdk_window_get_cursor nullable=""1""
 gdk_window_get_geometry.x is_out=""1""
 gdk_window_get_geometry.y is_out=""1""
 gdk_window_get_geometry.width is_out=""1"""
494289e5b21e6f48c2ef108f61f1626a3ef9c59e,csemike$oneswarm,"refactor out the abstract class OverlayEndpoint and use it to share functionality between overlaytransport and service connection
",p,https://github.com/csemike/oneswarm,"diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FAzSwtUi.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FAzSwtUi.java
index 1539bbf8..07584769 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FAzSwtUi.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FAzSwtUi.java
@@ -31,8 +31,9 @@
 import org.gudy.azureus2.ui.swt.plugins.UISWTViewEventListener;
 
 import edu.washington.cs.oneswarm.f2f.network.FriendConnection;
-import edu.washington.cs.oneswarm.f2f.network.OverlayTransport;
 import edu.washington.cs.oneswarm.f2f.network.FriendConnection.OverlayForward;
+import edu.washington.cs.oneswarm.f2f.network.OverlayEndpoint;
+import edu.washington.cs.oneswarm.f2f.network.OverlayTransport;
 
 public class OSF2FAzSwtUi {
 	public static final String KEY_OVERLAY_TRANSPORT = ""key_peer_transport"";
@@ -220,7 +221,7 @@ public void refresh(TableCell cell) {
 					cell.setText("""");
 					return;
 				}
-				OverlayTransport tr = (OverlayTransport) peer.getPEPeer().getData(KEY_OVERLAY_TRANSPORT);
+				OverlayEndpoint tr = (OverlayEndpoint) peer.getPEPeer().getData(KEY_OVERLAY_TRANSPORT);
 				if (tr == null) {
 					cell.setText("""");
 					return;
@@ -550,9 +551,9 @@ private void addOverlays(FriendConnection sel) {
 				item.setText(new String[] { ""forward"", f.getChannelId() + """", sel.getRemoteFriend().getNick(), sel.getRemoteIp().getHostAddress() + "":"" + sel.getRemotePort(), f.getRemoteFriend().getNick(), f.getRemoteIpPort(), formatter.formatTimeFromSeconds(f.getAge() / 1000), formatter.formatTimeFromSeconds(f.getLastMsgTime() / 1000), formatter.formatByteCountToKiBEtc(f.getBytesForwarded()), formatter.formatByteCountToKiBEtc(f.getBytesForwarded()), f.getSourceMessage().getDescription() });
 			}
 
-			Map<Integer, OverlayTransport> transports = sel.getOverlayTransports();
+			Map<Integer, OverlayEndpoint> transports = sel.getOverlayTransports();
 			for (Integer id : transports.keySet()) {
-				OverlayTransport f = transports.get(id);
+			    OverlayEndpoint f = transports.get(id);
 				TableItem item = new TableItem(overlayConnectionTable, SWT.NONE);
 				item.setText(new String[] { ""transport"", f.getPathID() + """", ""Me"", ""N/A"", sel.getRemoteFriend().getNick(), sel.getRemoteIp().getHostAddress() + "":"" + sel.getRemotePort(), formatter.formatTimeFromSeconds(f.getAge() / 1000), formatter.formatTimeFromSeconds(f.getLastMsgTime() / 1000), formatter.formatByteCountToKiBEtc(f.getBytesIn()), formatter.formatByteCountToKiBEtc(f.getBytesOut()) });
 			}
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FPlugin.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FPlugin.java
index d712973e..ea8eb383 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FPlugin.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/OSF2FPlugin.java
@@ -42,9 +42,10 @@
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FSearch;
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FTextSearch;
 import edu.washington.cs.oneswarm.f2f.network.FriendConnection;
+import edu.washington.cs.oneswarm.f2f.network.FriendConnection.OverlayForward;
+import edu.washington.cs.oneswarm.f2f.network.OverlayEndpoint;
 import edu.washington.cs.oneswarm.f2f.network.OverlayManager;
 import edu.washington.cs.oneswarm.f2f.network.OverlayTransport;
-import edu.washington.cs.oneswarm.f2f.network.FriendConnection.OverlayForward;
 import edu.washington.cs.oneswarm.f2f.permissions.PermissionsDAO;
 import edu.washington.cs.oneswarm.plugins.PluginCallback;
 import edu.washington.cs.publickey.PublicKeyFriend;
@@ -605,11 +606,11 @@ public String getDebugInfo() {
 			for (OverlayForward of : overlayForwards.values()) {
 				b.append(""      channel="" + Integer.toHexString(of.getChannelId()) + "" "" + of.getRemoteFriend().getNick() + "" lastSent="" + of.getLastMsgTime() + "" src="" + of.getSourceMessage().getDescription() + ""\n"");
 			}
-			Collection<OverlayTransport> transports = f.getOverlayTransports().values();
+			Collection<OverlayEndpoint> transports = f.getOverlayTransports().values();
 			if (transports.size() > 0) {
 				b.append(""   Transports: \n"");
 			}
-			for (OverlayTransport ot : transports) {
+			for (OverlayEndpoint ot : transports) {
 				b.append(""      channel="" + Integer.toHexString(ot.getChannelId()) + "" path="" + Integer.toHexString(ot.getPathID()) + "" lastSent="" + ot.getLastMsgTime() + ""\n"");
 			}
 		}
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/FriendConnection.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/FriendConnection.java
index 2e8e8eaa..7b5b5c4a 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/FriendConnection.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/FriendConnection.java
@@ -154,7 +154,7 @@ public class FriendConnection {
 
     private final ConcurrentHashMap<Integer, Boolean> overlayTransportPathsId = new ConcurrentHashMap<Integer, Boolean>();
 
-    private final ConcurrentHashMap<Integer, OverlayTransport> overlayTransports = new ConcurrentHashMap<Integer, OverlayTransport>();
+    private final ConcurrentHashMap<Integer, OverlayEndpoint> overlayTransports = new ConcurrentHashMap<Integer, OverlayEndpoint>();
 
     /*
      * map to keep track of received searches to avoid sending the search back
@@ -447,9 +447,9 @@ public void close() {
         }
 
         // we need to terminate all overlay transports
-        List<OverlayTransport> transports = new LinkedList<OverlayTransport>(
+        List<OverlayEndpoint> transports = new LinkedList<OverlayEndpoint>(
                 overlayTransports.values());
-        for (OverlayTransport overlayTransport : transports) {
+        for (OverlayEndpoint overlayTransport : transports) {
             overlayTransport.closeConnectionClosed(""friend closed connection"");
         }
 
@@ -539,12 +539,12 @@ private void deregisterOverlayForward(int channelId, boolean sendReset) {
 
     }
 
-    void deregisterOverlayTransport(OverlayTransport transport) {
+    void deregisterOverlayTransport(OverlayEndpoint transport) {
         lock.lock();
         try {
             int channelId = transport.getChannelId();
 
-            OverlayTransport exists = overlayTransports.remove(channelId);
+            OverlayEndpoint exists = overlayTransports.remove(channelId);
             recentlyClosedChannels.put(channelId, System.currentTimeMillis());
             int pathID = transport.getPathID();
             overlayTransportPathsId.remove(pathID);
@@ -643,7 +643,7 @@ public Map<Integer, OverlayForward> getOverlayForwards() {
         return overlayForwards;
     }
 
-    public Map<Integer, OverlayTransport> getOverlayTransports() {
+    public Map<Integer, OverlayEndpoint> getOverlayTransports() {
         return overlayTransports;
     }
 
@@ -685,7 +685,7 @@ private void handleChannelMsg(Message message) {
 
             if (overlayTransports.containsKey(channelId)) {
                 // ok, this is a msg to us
-                OverlayTransport t = overlayTransports.get(channelId);
+                OverlayEndpoint t = overlayTransports.get(channelId);
                 msg.setForward(false);
                 // this might we the first message we get in this channel
                 // means that the other side responded to our channel setup
@@ -1235,7 +1235,7 @@ void registerOverlayForward(OSF2FSearchResp currentSetupMsg, FriendConnection co
         }
     }
 
-    void registerOverlayTransport(OverlayTransport transport) throws OverlayRegistrationError {
+    void registerOverlayTransport(OverlayEndpoint transport) throws OverlayRegistrationError {
         lock.lock();
         try {
             int channelId = transport.getChannelId();
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayEndpoint.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayEndpoint.java
new file mode 100644
index 00000000..d186b29e
--- /dev/null
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayEndpoint.java
@@ -0,0 +1,222 @@
+package edu.washington.cs.oneswarm.f2f.network;
+
+import java.util.TimerTask;
+import java.util.logging.Logger;
+
+import org.gudy.azureus2.core3.util.Average;
+import org.gudy.azureus2.core3.util.DirectByteBuffer;
+
+import com.aelitis.azureus.core.networkmanager.NetworkManager;
+
+import edu.washington.cs.oneswarm.f2f.Friend;
+import edu.washington.cs.oneswarm.f2f.messaging.OSF2FChannelDataMsg;
+import edu.washington.cs.oneswarm.f2f.messaging.OSF2FChannelReset;
+import edu.washington.cs.oneswarm.f2f.messaging.OSF2FMessage;
+import edu.washington.cs.oneswarm.f2f.network.DelayedExecutorService.DelayedExecutor;
+
+public abstract class OverlayEndpoint {
+    private final static Logger logger = Logger.getLogger(OverlayEndpoint.class.getName());
+    /*
+     * max number of ms that a message can be delivered earlier than
+     * overlayDelayMs if that avoids a call to Thread.sleep()
+     */
+    private final static int INCOMING_MESSAGE_DELAY_SLACK = 10;
+
+    protected long bytesIn = 0;
+
+    protected long bytesOut = 0;
+    protected boolean started = false;
+
+    protected final int channelId;
+
+    protected boolean closed = false;
+    protected String closeReason = """";
+
+    private String desc = null;
+    private final DelayedExecutor delayedOverlayMessageTimer;
+
+    protected Average downloadRateAverage = Average.getInstance(1000, 10);
+
+    protected final FriendConnection friendConnection;
+    protected long lastMsgTime;
+    private final long overlayDelayMs;
+    protected final int pathID;
+    private boolean sentReset = false;
+
+    private final long startTime;
+    private final int TIMEOUT = 2 * 60 * 1000;
+
+    protected Average uploadRateAverage = Average.getInstance(1000, 10);
+
+    public OverlayEndpoint(FriendConnection friendConnection, int channelId, int pathID,
+            long overlayDelayMs) {
+        this.friendConnection = friendConnection;
+        this.channelId = channelId;
+        this.pathID = pathID;
+        this.overlayDelayMs = overlayDelayMs;
+        this.lastMsgTime = System.currentTimeMillis();
+        this.startTime = System.currentTimeMillis();
+        delayedOverlayMessageTimer = DelayedExecutorService.getInstance().getFixedDelayExecutor(
+                overlayDelayMs);
+    }
+
+    protected abstract void cleanup();
+
+    private void deregister() {
+        // remove it from the friend connection
+        friendConnection.deregisterOverlayTransport(this);
+        cleanup();
+    }
+
+    /**
+     * This method is called ""from above"", when the peer connection is
+     * terminated, send a reset to other side
+     */
+    public void close(String reason) {
+        if (!closed) {
+            closeReason = ""peer - "" + reason;
+            logger.fine(getDescription() + "": OverlayTransport closed, reason:"" + closeReason);
+
+            closed = true;
+            this.sendReset();
+        }
+        // we don't expect anyone to read whatever we have left in the buffer
+        this.destroyBufferedMessages();
+
+        deregister();
+    }
+
+    /**
+     * this method is called from below when a reset is received
+     * 
+     * @param reason
+     */
+    public void closeChannelReset() {
+        if (sentReset) {
+            // ok, this is the response to our previous close
+            deregister();
+        } else {
+            if (!closed) {
+                closeReason = ""remote host closed overlay channel"";
+                logger.fine(getDescription() + "": OverlayTransport closed, reason:"" + closeReason);
+                // this is the remote side saying that the connection is closed
+                // send a reset back to confirm
+                closed = true;
+                sendReset();
+            }
+        }
+    }
+
+    /**
+     * this method is called from below if the friend connection dies
+     * 
+     * @param reason
+     */
+    public void closeConnectionClosed(String reason) {
+        closeReason = reason;
+        logger.fine(getDescription() + "": OverlayTransport closed, reason:"" + closeReason);
+
+        closed = true;
+        deregister();
+    }
+
+    protected abstract void destroyBufferedMessages();
+
+    public long getAge() {
+        return System.currentTimeMillis() - startTime;
+    }
+
+    public long getArtificialDelay() {
+        return overlayDelayMs;
+    }
+
+    public long getBytesIn() {
+        return bytesIn;
+    }
+
+    public long getBytesOut() {
+        return bytesOut;
+    }
+
+    public int getChannelId() {
+        return channelId;
+    }
+
+    public String getDescription() {
+        if (desc == null) {
+            desc = NetworkManager.OSF2F_TRANSPORT_PREFIX + "": ""
+                    + friendConnection.getRemoteFriend().getNick() + "":""
+                    + Integer.toHexString(channelId);
+        }
+        return desc;
+    }
+
+    public int getDownloadRate() {
+        return (int) downloadRateAverage.getAverage();
+    }
+
+    public long getLastMsgTime() {
+        return System.currentTimeMillis() - lastMsgTime;
+    }
+
+    public int getPathID() {
+        return pathID;
+    }
+
+    public Friend getRemoteFriend() {
+        return friendConnection.getRemoteFriend();
+    }
+
+    public String getRemoteIP() {
+        return friendConnection.getRemoteIp().getHostAddress();
+    }
+
+    public int getUploadRate() {
+        return (int) uploadRateAverage.getAverage();
+    }
+
+    protected abstract void handleDelayedOverlayMessage(final OSF2FChannelDataMsg msg);
+
+    public void incomingOverlayMsg(final OSF2FChannelDataMsg msg) {
+        lastMsgTime = System.currentTimeMillis();
+        if (closed) {
+            return;
+        }
+        delayedOverlayMessageTimer.queue(overlayDelayMs, INCOMING_MESSAGE_DELAY_SLACK,
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        handleDelayedOverlayMessage(msg);
+                    }
+                });
+    }
+
+    public boolean isLANLocal() {
+        return friendConnection.getNetworkConnection().isLANLocal();
+    }
+
+    public boolean isStarted() {
+        return started;
+    }
+
+    public boolean isTimedOut() {
+        return System.currentTimeMillis() - lastMsgTime > TIMEOUT;
+    }
+
+    private void sendReset() {
+        sentReset = true;
+        friendConnection.sendChannelRst(new OSF2FChannelReset(OSF2FChannelReset.CURRENT_VERSION,
+                channelId));
+    }
+
+    abstract void start();
+
+    protected long writeMessageToFriendConnection(DirectByteBuffer msgBuffer) {
+        OSF2FChannelDataMsg msg = new OSF2FChannelDataMsg(OSF2FMessage.CURRENT_VERSION, channelId,
+                msgBuffer);
+        long totalWritten = msgBuffer.remaining(DirectByteBuffer.SS_MSG);
+        msg.setForward(false);
+        friendConnection.sendChannelMsg(msg, true);
+        return totalWritten;
+    }
+}
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayManager.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayManager.java
index f933377c..c6505ad3 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayManager.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayManager.java
@@ -56,837 +56,902 @@
 
 public class OverlayManager {
 
-	/**
-	 * make sure to not call any az functions when holding this lock
-	 */
-	public static BigFatLock lock = BigFatLock.getInstance(false);
-
-	// private Friend me;
-	public static boolean logToStdOut = false;
-
-	private int mMIN_DELAY_LINK_LATENCY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_min"") * COConfigurationManager.getIntParameter(""f2f_overlay_emulate_link_latency_max"");
-	private int mMAX_DELAY_LINK_LATENCY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_max"") * COConfigurationManager.getIntParameter(""f2f_overlay_emulate_link_latency_max"");
-	private int mMIN_RESPONSE_DELAY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_min"") * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-	private int mMAX_RESPONSE_DELAY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_max"") * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-
-	private double mForwardSearchProbability = COConfigurationManager.getFloatParameter(""f2f_forward_search_probability"");
-
-	// this is just a way to treat requests for the local file list a bit
-	// differently
-	public final static int OWN_CONNECTION_ID_MAGIC_NUMBER = 0;
-
-	private final static String RESPONSE_DELAY_SEED_SETTING_KEY = ""response_delay_seed"";
-
-	private static final int TIMEOUT_CHECK_PERIOD = 5 * 1000;
-	private final ConcurrentHashMap<Integer, FriendConnection> connections;
-	private final FileListManager filelistManager;
-	private final LinkedList<FriendConnectListener> friendConnectListeners = new LinkedList<FriendConnectListener>();
-
-	private final FriendManager friendManager;
-	private long lastConnectionCheckRun = System.currentTimeMillis();
-
-	private final AZInstance myInstance;
-	private final PublicKey ownPublicKey;
-	private final QueueManager queueManager = new QueueManager();
-	private final RandomnessManager randomnessManager;
-	private final RandomnessManager responseDelayRandomnesManager;
-	private final SearchManager searchManager;
-
-	public RotatingLogger searchTimingsLogger = new RotatingLogger(""search_timing"");
-
-	private final GlobalManagerStats stats;
-
-	private boolean stopped = false;
-	private final Timer t = new Timer(""FriendConnectionInitialChecker"", true);
-
-	public OverlayManager(FriendManager _friendManager, PublicKey _ownPublicKey, FileListManager _fileListManager, GlobalManagerStats _stats) {
-		stats = _stats;
-		myInstance = AzureusCoreImpl.getSingleton().getInstanceManager().getMyInstance();
-
-		this.randomnessManager = new RandomnessManager();
-		this.friendManager = _friendManager;
-		this.filelistManager = _fileListManager;
-		this.ownPublicKey = _ownPublicKey;
-		this.connections = new ConcurrentHashMap<Integer, FriendConnection>();
-		this.searchManager = new SearchManager(this, filelistManager, randomnessManager, stats);
-
-		byte[] seedBytes = COConfigurationManager.getByteParameter(RESPONSE_DELAY_SEED_SETTING_KEY);
-		if (seedBytes != null) {
-			responseDelayRandomnesManager = new RandomnessManager(seedBytes);
-		} else {
-			responseDelayRandomnesManager = new RandomnessManager();
-			COConfigurationManager.setParameter(RESPONSE_DELAY_SEED_SETTING_KEY, randomnessManager.getSecretBytes());
-		}
-
-		COConfigurationManager.addAndFireParameterListeners(new String[] { ""f2f_overlay_emulate_link_latency_max"",
-				""f2f_search_emulate_hops_min"", ""f2f_search_emulate_hops_max"", ""f2f_search_forward_delay"",
-				""f2f_forward_search_probability"" }, new ParameterListener() {
-			public void parameterChanged(String parameterName) {
-				 mMIN_DELAY_LINK_LATENCY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_min"") * COConfigurationManager.getIntParameter(""f2f_overlay_emulate_link_latency_max"");
-				 mMAX_DELAY_LINK_LATENCY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_max"") * COConfigurationManager.getIntParameter(""f2f_overlay_emulate_link_latency_max"");
-				 mMIN_RESPONSE_DELAY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_min"") * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-				 mMAX_RESPONSE_DELAY = COConfigurationManager.getIntParameter(""f2f_search_emulate_hops_max"") * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-				 mForwardSearchProbability = COConfigurationManager.getFloatParameter(""f2f_forward_search_probability"");
-
-				 if( mForwardSearchProbability <= 0 ) {
-					 COConfigurationManager.setParameter(""f2f_forward_search_probability"", 0.5f);
-					 mForwardSearchProbability = 0.5;
-				 }
-				 System.err.println(""f2f_search_fwd_p: "" + mForwardSearchProbability);
-			}
-		});
-
-		OSF2FMessageFactory.init();
-
-		Timer timeoutTimer = new Timer(""OS Overlay Timeout checker"", true);
-		timeoutTimer.schedule(new ConnectionChecker(), 0, TIMEOUT_CHECK_PERIOD);
-
-	}
-
-	public void closeAllConnections() {
-		for (FriendConnection c : connections.values()) {
-			c.close();
-		}
-
-		stopped = true;
-	}
-
-	public boolean createIncomingConnection(byte[] publicKey, NetworkConnection netConn) {
-
-		if (isConnectionAllowed(netConn.getEndpoint().getNotionalAddress().getAddress(), publicKey)) {
-			Friend friend = friendManager.getFriend(publicKey);
-			new FriendConnection(stats, queueManager, netConn, friend, filelistManager, new FriendConnectionListener());
-
-			return true;
-		}
-		return false;
-	}
-
-	public boolean createOutgoingConnection(ConnectionEndpoint remoteFriendAddr, Friend friend) {
-		if (isConnectionAllowed(remoteFriendAddr.getNotionalAddress().getAddress(), friend.getPublicKey())) {
-			final FriendConnection fc = new FriendConnection(stats, queueManager, remoteFriendAddr, friend, filelistManager, new FriendConnectionListener());
-			/*
-			 * create a check for this connection to verify that we actually get
-			 * connected within a reasonable time frame
-			 */
-			t.schedule(new TimerTask() {
-				@Override
-				public void run() {
-					if (fc.isTimedOut()) {
-						fc.close();
-					}
-				}
-			}, FriendConnection.INITIAL_HANDSHAKE_TIMEOUT + 10 * 1000);
-
-			return true;
-		}
-		return false;
-	}
-
-	private boolean deregisterConnection(FriendConnection connection) {
-		lock.lock();
-		try {
-			Log.log(""deregistered connection: "" + connection.toString() + "" "" + connections.containsKey(connection.hashCode()) + "" "", logToStdOut);
-			boolean res = null != connections.remove(connection.hashCode());
-			Friend remoteFriend = connection.getRemoteFriend();
-
-			/*
-			 * check if there are any active connections to the friend, if not,
-			 * mark as disconnected
-			 *
-			 * this check is needed if there are 2 concurrent connections to the
-			 * same friend , and one is denied to register because of the other
-			 * one already connected
-			 */
-
-			FriendConnection connectedConn = null;
-			for (FriendConnection c : connections.values()) {
-				if (c.getRemoteFriend().equals(remoteFriend)) {
-					connectedConn = c;
-				}
-			}
-			/*
-			 * if the connection id != null, verify that the friend actually
-			 * think it is connected to the right connection id
-			 */
-			if (connectedConn != null && connectedConn.isHandshakeReceived()) {
-				int friendConnId = remoteFriend.getConnectionId();
-				if (connectedConn.hashCode() != friendConnId) {
-					// fix it...
-					boolean fileListReceived = connectedConn.isFileListReceived();
-					if (!fileListReceived) {
-						Log.log(""connection closed, existing connection found, set to handshaking: "" + remoteFriend.getNick(), logToStdOut);
-						remoteFriend.setStatus(Friend.STATUS_HANDSHAKING);
-						remoteFriend.setConnectionId(Friend.NOT_CONNECTED_CONNECTION_ID);
-					} else {
-						Log.log(""connection closed, existing connection found, set to connected: "" + remoteFriend.getNick(), logToStdOut);
-						remoteFriend.setConnectionId(connectedConn.hashCode());
-						remoteFriend.setStatus(Friend.STATUS_ONLINE);
-					}
-				}
-			} else {
-				// ok, no existing connections, mark as disconnected.
-				remoteFriend.disconnected(connection.hashCode());
-			}
-
-			return res;
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public void disconnectFriend(Friend f) {
-		for (FriendConnection conn : connections.values()) {
-			if (conn.getRemoteFriend().equals(f)) {
-				conn.close();
-			}
-		}
-	}
-
-	void forwardSearchOrCancel(FriendConnection ignoreConn, OSF2FSearch msg) {
-		for (FriendConnection conn : connections.values()) {
-			if (ignoreConn.hashCode() == conn.hashCode()) {
-				Log.log(""not forwarding search/cancel to: "" + conn + "" (source friend)"", logToStdOut);
-				continue;
-			}
-			Log.log(""forwarding search/cancel to: "" + conn, logToStdOut);
-			if (shouldForwardSearch(msg, ignoreConn)) {
-				conn.sendSearch(msg.clone(), false);
-			}
-		}
-	}
-
-	public int getConnectCount() {
-		return connections.size();
-	}
-
-	public Map<Integer, Friend> getConnectedFriends() {
-		// sanity checks
-		for (int connectionId : connections.keySet()) {
-			FriendConnection c = connections.get(connectionId);
-			// check status just to make sure
-			final Friend remoteFriend = c.getRemoteFriend();
-			int status = remoteFriend.getStatus();
-			if (status == Friend.STATUS_OFFLINE && c.isHandshakeReceived()) {
-				// fix it...
-				boolean handshakeCompletedFully = c.isFileListReceived();
-				if (!handshakeCompletedFully) {
-					Debug.out(""getConnectedFriends, existing connection found, settings to handshaking: "" + remoteFriend.getNick());
-					remoteFriend.setStatus(Friend.STATUS_HANDSHAKING);
-				} else {
-					Debug.out(""getConnectedFriends, existing connection found, settings to connected: "" + remoteFriend.getNick());
-					remoteFriend.setConnectionId(c.hashCode());
-					remoteFriend.setStatus(Friend.STATUS_ONLINE);
-				}
-			}
-		}
-
-		Map<Integer, Friend> l = new HashMap<Integer, Friend>(connections.size());
-		/*
-		 * we don't show me in friends list anymore
-		 */
-		// l.put(me.getConnectionIds().get(0), me);
-		Friend[] friends = friendManager.getFriends();
-		for (Friend friend : friends) {
-			if (friend.getStatus() == Friend.STATUS_ONLINE) {
-				// System.out.println(""online: "" + friend.getNick());
-				l.put(friend.getConnectionId(), friend);
-			}
-		}
-
-		return l;
-	}
-
-	public int getSearchDelayForInfohash(Friend destination, byte[] infohash) {
-		if (destination.isCanSeeFileList()) {
-			return 0;
-		} else {
-			int searchDelay = responseDelayRandomnesManager.getDeterministicNextInt(infohash, mMIN_RESPONSE_DELAY, mMAX_RESPONSE_DELAY);
-			int latencyDelay = getLatencyDelayForInfohash(destination, infohash);
-			return searchDelay + latencyDelay;
-		}
-	}
-
-	public int getLatencyDelayForInfohash(Friend destination, byte[] infohash) {
-		if (destination.isCanSeeFileList()) {
-			return 0;
-		} else {
-			return responseDelayRandomnesManager.getDeterministicNextInt(infohash, mMIN_DELAY_LINK_LATENCY, mMAX_DELAY_LINK_LATENCY);
-		}
-	}
-
-
-	public List<Friend> getDisconnectedFriends() {
-		List<Friend> l = new ArrayList<Friend>();
-		Friend[] friends = friendManager.getFriends();
-		for (Friend friend : friends) {
-			if (friend.getStatus() != Friend.STATUS_ONLINE) {
-				l.add(friend);
-			}
-		}
-		return l;
-	}
-
-	public FileListManager getFilelistManager() {
-		return filelistManager;
-	}
-
-	public List<FriendConnection> getFriendConnections() {
-		return new ArrayList<FriendConnection>(connections.values());
-	}
-
-	// private int parallelConnectCount(InetAddress remoteIP, byte[]
-	// remotePubKey) {
-	// int count = 0;
-	// for (FriendConnection overlayConnection : connections.values()) {
-	// if (overlayConnection.getRemoteIp().equals(remoteIP)
-	// && Arrays.equals(overlayConnection.getRemotePublicKey(),
-	// remotePubKey)) {
-	// count++;
-	// }
-	// }
-	//
-	// return count;
-	// }
-
-	public long getLastConnectionCheckRun() {
-		return lastConnectionCheckRun;
-	}
-
-	public PublicKey getOwnPublicKey() {
-		return ownPublicKey;
-	}
-
-	public QueueManager getQueueManager() {
-		return queueManager;
-	}
-
-	public SearchManager getSearchManager() {
-		return searchManager;
-	}
-
-	public double getTransportDownloadKBps() {
-		long totalDownloadSpeed = 0;
-
-		LinkedList<FriendConnection> conns = new LinkedList<FriendConnection>();
-		conns.addAll(connections.values());
-
-		for (FriendConnection fc : conns) {
-			final Map<Integer, OverlayTransport> ot = fc.getOverlayTransports();
-
-			for (OverlayTransport o : ot.values()) {
-				totalDownloadSpeed += o.getDownloadRate();
-			}
-		}
-
-		return totalDownloadSpeed / 1024.0;
-	}
-
-	public long getTransportSendRate(boolean includeLan) {
-		long totalUploadSpeed = 0;
-
-		LinkedList<FriendConnection> conns = new LinkedList<FriendConnection>();
-		conns.addAll(connections.values());
-
-		for (FriendConnection fc : conns) {
-			final Map<Integer, OverlayTransport> ot = fc.getOverlayTransports();
-
-			for (OverlayTransport o : ot.values()) {
-				if (!includeLan && o.isLANLocal()) {
-					// not including lan local peers
-				} else {
-					totalUploadSpeed += o.getUploadRate();
-				}
-			}
-		}
-
-		return totalUploadSpeed;
-	}
-
-	public boolean isConnectionAllowed(InetAddress remoteIP, byte[] remotePubKey) {
-		Friend friend = friendManager.getFriend(remotePubKey);
-		if (stopped) {
-			Log.log(""connection denied: (f2f transfers disabled)"", logToStdOut);
-			return false;
-		}
-		// check if we should allow this public key to connect
-		if (Arrays.equals(remotePubKey, ownPublicKey.getEncoded()) && remoteIP.equals(myInstance.getExternalAddress())) {
-			Log.log(LogEvent.LT_INFORMATION, ""connection from self not allowed (if same ip)"", logToStdOut);
-			return false;
-		} else if (friend == null) {
-			Log.log(LogEvent.LT_WARNING, "" access denied (not friend): "" + remoteIP, logToStdOut);
-			return false;
-		} else if (friend.isBlocked()) {
-			Log.log(LogEvent.LT_WARNING, "" access denied (friend blocked): "" + remoteIP, logToStdOut);
-			return false;
-		} else if (friend.getFriendBannedUntil() > System.currentTimeMillis()) {
-			double minutesLeft = friend.getFriendBannedUntil() - System.currentTimeMillis() / (60 * 1000.0);
-			friend.updateConnectionLog(true, ""incoming connection denied, friend blocked for "" + minutesLeft + "" more minutes because of: "" + friend.getBannedReason());
-			Log.log(LogEvent.LT_WARNING, "" access denied (friend blocked for "" + minutesLeft + "" more minutes): "" + remoteIP, logToStdOut);
-			return false;
-		}
-
-		for (FriendConnection c : connections.values()) {
-			if (c.getRemoteFriend().equals(friend)) {
-				Log.log(LogEvent.LT_WARNING, "" access denied (friend already connected): "" + remoteIP, logToStdOut);
-				return false;
-			}
-		}
-		Log.log(LogEvent.LT_INFORMATION, ""friend connection ok: "" + remoteIP + "" :: "" + friend, logToStdOut);
-		return true;
-	}
-
-	/**
-	 * make sure to synchronize before calling this function
-	 */
-	private void notifyConnectionListeners(Friend f, boolean connected) {
-		lock.lock();
-		try {
-			for (FriendConnectListener cb : friendConnectListeners) {
-				if (connected) {
-					cb.friendConnected(f);
-				} else {
-					cb.friendDisconnected(f);
-				}
-			}
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	private boolean registerConnection(FriendConnection connection) {
-		lock.lock();
-		try {
-			if (isConnectionAllowed(connection.getRemoteIp(), connection.getRemotePublicKey())) {
-				connections.put(connection.hashCode(), connection);
-				/*
-				 * don't mark remote friend as connected until after the
-				 * oneswarm handshake message is received
-				 */
-				// connection.getRemoteFriend().connected(connection.hashCode());
-				Log.log(""registered connection: "" + connection, logToStdOut);
-				return true;
-			} else {
-				return false;
-			}
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public void registerForConnectNotifications(FriendConnectListener callback) {
-		lock.lock();
-		try {
-			friendConnectListeners.add(callback);
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public void restartAllConnections() {
-		stopped = false;
-	}
-
-	public void sendChatMessage(int connectionId, String inPlaintextMessage) {
-		FriendConnection conn = connections.get(connectionId);
-		conn.sendChat(inPlaintextMessage);
-	}
-
-	void sendDirectedSearch(FriendConnection target, OSF2FHashSearch search) {
-		Log.log(""sending search to "" + target, logToStdOut);
-		target.sendSearch(search, true);
-	}
-
-	public boolean sendFileListRequest(int connectionId, long maxCacheAge, PluginCallback<FileList> callback) {
-
-		// just check if the request is for the local list
-		if (connectionId == OWN_CONNECTION_ID_MAGIC_NUMBER) {
-			callback.requestCompleted(filelistManager.getOwnFileList());
-		}
-
-		FriendConnection conn = connections.get(connectionId);
-
-		if (conn != null) {
-
-			FileList oldList = filelistManager.getFriendsList(conn.getRemoteFriend());
-			if (oldList != null && (System.currentTimeMillis() - oldList.getCreated()) < maxCacheAge) {
-				callback.requestCompleted(oldList);
-			}
-
-			Log.log(""sending filelist request to "" + conn);
-			conn.sendFileListRequest(OSF2FMessage.FILE_LIST_TYPE_COMPLETE, callback);
-			return true;
-		} else {
-			System.err.println(""tried to get filelist for unknown connection id (friend just went offline?)!, stack trace is:"");
-			new RuntimeException().printStackTrace();
-		}
-		return false;
-	}
-
-	// public void startDownload(byte type, byte[] metainfo,
-	// boolean createIfNotExist) {
-	// if (type == OSF2FMessage.METAINFO_TYPE_BITTORRENT) {
-	//
-
-	public boolean sendMetaInfoRequest(int connectionId, int channelId, byte[] infohash, int lengthHint, PluginCallback<byte[]> callback) {
-		FriendConnection conn = connections.get(connectionId);
-		Log.log(""sending metainfo request to "" + conn);
-		if (conn != null) {
-			conn.sendMetaInfoRequest(OSF2FMessage.METAINFO_TYPE_BITTORRENT, channelId, infohash, lengthHint, callback);
-			return true;
-		}
-		return false;
-
-	}
-
-	void sendSearchOrCancel(OSF2FSearch search, boolean skipQueue, boolean forceSend) {
-		Log.log(""sending search/cancel to "" + connections.size(), logToStdOut);
-		int numSent = 0;
-		for (FriendConnection conn : connections.values()) {
-
-			boolean shouldSend = true;
-			if (!forceSend) {
-				shouldSend = shouldForwardSearch(search, conn);
-			}
-			if (shouldSend) {
-				conn.sendSearch(search.clone(), skipQueue);
-				numSent++;
-			}
-			if (search instanceof OSF2FHashSearch) {
-				OSF2FHashSearch hs = (OSF2FHashSearch) search;
-				searchTimingsLogger.log(System.currentTimeMillis() + "", send_search, "" + conn.getRemoteFriend().getNick() + "", "" + hs.getSearchID() + "", "" + hs.getInfohashhash());
-			}
-		}
-		/*
-		 * for searches sent by us, if we didn't send it to anyone try again but
-		 * without the randomness linitng who we are sending to
-		 */
-		if (numSent == 0 && !forceSend) {
-			sendSearchOrCancel(search, skipQueue, true);
-		}
-	}
-
-	/**
-	 * to protect against colluding friends we are only forwarding searches with
-	 * 95% probability
-	 *
-	 * if forcesend = true the search will be forwarded anyway even if the
-	 * randomness says that friend shouldn't be forwarded
-	 */
-	private boolean shouldForwardSearch(OSF2FSearch search, FriendConnection conn) {
-		boolean shouldSend = true;
-		if (search instanceof OSF2FHashSearch) {
-			shouldSend = shouldForwardSearch(((OSF2FHashSearch) search).getInfohashhash(), conn);
-		} else if (search instanceof OSF2FSearchCancel) {
-			long infohash = searchManager.getInfoHashHashFromSearchId(search.getSearchID());
-			if (infohash != -1) {
-				shouldSend = shouldForwardSearch(infohash, conn);
-			} else {
-				shouldSend = false;
-			}
-		}
-		return shouldSend;
-	}
-
-	private boolean shouldForwardSearch(long infohashhash, FriendConnection conn) {
-		if (conn.getRemoteFriend().isCanSeeFileList()) {
-			return true;
-		}
-		byte[] infohashbytes = RandomnessManager.getBytes(infohashhash);
-		byte[] friendHash = RandomnessManager.getBytes(conn.getRemotePublicKeyHash());
-		byte[] all = new byte[infohashbytes.length + friendHash.length];
-		System.arraycopy(infohashbytes, 0, all, 0, infohashbytes.length);
-		System.arraycopy(friendHash, 0, all, infohashbytes.length, friendHash.length);
-
-		int randomVal = randomnessManager.getDeterministicRandomInt(all);
-		if (randomVal < 0) {
-			randomVal = -randomVal;
-		}
-		if (randomVal < Integer.MAX_VALUE * mForwardSearchProbability) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public void triggerFileListUpdates() {
-		List<FriendConnection> conns = new LinkedList<FriendConnection>();
-		lock.lock();
-		try {
-			conns.addAll(connections.values());
-		} finally {
-			lock.unlock();
-		}
-		for (FriendConnection conn : connections.values()) {
-			conn.triggerFileListSend();
-		}
-	}
-
-	private class ConnectionChecker extends TimerTask {
-
-		@Override
-		public void run() {
-
-			try {
-				// first, check if we have any overlays that are timed out
-				for (FriendConnection connection : connections.values()) {
-					connection.clearTimedOutForwards();
-					connection.clearTimedOutTransports();
-					connection.clearTimedOutSearchRecords();
-					connection.clearOldMetainfoRequests();
-				}
-			} catch (Throwable t) {
-				Debug.out(""F2F Connection Checker: got error when clearing transports/forwards"", t);
-			}
-			try {
-				// then, check if we need to send any keepalives
-				for (FriendConnection connection : connections.values()) {
-					connection.doKeepAliveCheck();
-				}
-			} catch (Throwable t) {
-				Debug.out(""F2F Connection Checker: got error when sending keep alives"", t);
-			}
-
-			try {
-				// check if we have any timed out connections
-				List<FriendConnection> timedOut = new ArrayList<FriendConnection>();
-				for (FriendConnection connection : connections.values()) {
-					if (connection.isTimedOut()) {
-						timedOut.add(connection);
-					}
-				}
-				// and close them
-				for (FriendConnection friendConnection : timedOut) {
-					friendConnection.close();
-				}
-			} catch (Throwable t) {
-				Debug.out(""F2F Connection Checker: got error when clearing friend connections"", t);
-			}
-
-			try {
-				// then, recycle the search IDs
-				searchManager.clearTimedOutSearches();
-			} catch (Throwable t) {
-				Debug.out(""F2F Connection Checker: got error when clearing timed out searches"", t);
-			}
-			lastConnectionCheckRun = System.currentTimeMillis();
-		}
-	}
-
-	class FriendConnectionListener {
-		public boolean connectSuccess(FriendConnection friendConnection) {
-			if (!registerConnection(friendConnection)) {
-				Log.log(""Unable to register connection, "" + ""connect count to high, closing connection"", logToStdOut);
-				friendConnection.close();
-				return false;
-			}
-			return true;
-		}
-
-		public void disconnected(FriendConnection friendConnection) {
-			if (friendConnection.isFileListReceived()) {
-				notifyConnectionListeners(friendConnection.getRemoteFriend(), false);
-			}
-			deregisterConnection(friendConnection);
-		}
-
-		public void gotSearchCancel(FriendConnection friendConnection, OSF2FSearchCancel msg) {
-			searchManager.handleIncomingSearchCancel(friendConnection, msg);
-		}
-
-		public void gotSearchMessage(FriendConnection friendConnection, OSF2FSearch msg) {
-			if (msg instanceof OSF2FHashSearch) {
-				OSF2FHashSearch hs = (OSF2FHashSearch) msg;
-				searchTimingsLogger.log(System.currentTimeMillis() + "", search, "" + friendConnection.getRemoteFriend().getNick() + "", "" + hs.getSearchID() + "", "" + hs.getInfohashhash() + "", "" + friendConnection.getRemoteIp().getHostAddress());
-			}
-			searchManager.handleIncomingSearch(friendConnection, msg);
-		}
-
-		public void gotSearchResponse(FriendConnection friendConnection, OSF2FSearchResp msg) {
-			if (msg instanceof OSF2FHashSearchResp) {
-				OSF2FHashSearchResp hsr = (OSF2FHashSearchResp) msg;
-				searchTimingsLogger.log(System.currentTimeMillis() + "", response, "" + friendConnection.getRemoteFriend().getNick() + "", "" + hsr.getSearchID() + "", "" + hsr.getChannelID() + "", "" + friendConnection.getRemoteIp().getHostAddress() + "", "" + hsr.getPathID());
-			}
-			searchManager.handleIncomingSearchResponse(friendConnection, msg);
-		}
-
-		@SuppressWarnings(""unchecked"")
-		public void handshakeCompletedFully(final FriendConnection friendConnection) {
-
-			notifyConnectionListeners(friendConnection.getRemoteFriend(), true);
-
-			/*
-			 * check if we have any running downloads that this friend has
-			 */
-			Log.log(""New friend connected, checking if friend has anything we want"", logToStdOut);
-			List<byte[]> runningDownloadHashes = new LinkedList<byte[]>();
-			List<DownloadManager> dms = AzureusCoreImpl.getSingleton().getGlobalManager().getDownloadManagers();
-			for (DownloadManager dm : dms) {
-				if (dm.getState() == DownloadManager.STATE_DOWNLOADING) {
-					try {
-						TOTorrent torrent = dm.getTorrent();
-						if (torrent != null) {
-							runningDownloadHashes.add(torrent.getHash());
-						}
-					} catch (TOTorrentException e) {
-						e.printStackTrace();
-					}
-				}
-			}
-			Log.log(""found "" + runningDownloadHashes.size() + "" running downloads"", logToStdOut);
-			FileList remoteFileList = filelistManager.getFriendsList(friendConnection.getRemoteFriend());
-			for (byte[] hash : runningDownloadHashes) {
-				if (remoteFileList.contains(hash)) {
-					Log.log(""sending search for '"" + Base32.encode(hash) + ""' to "" + friendConnection.getRemoteFriend(), logToStdOut);
-					searchManager.sendDirectedHashSearch(friendConnection, hash);
-				}
-			}
-
-			/**
-			 * Check if we need to send any pending chat messages to this user. (5/sec)
-			 */
-			Thread queryThread = new Thread(""Queued chat SQL query for: "" + friendConnection.getRemoteFriend().getNick()) {
-				@Override
-				public void run() {
-
-					try {
-						Thread.sleep(3*1000);
-					} catch( InterruptedException e ) {}
-
-					String base64Key = new String(Base64.encode(friendConnection.getRemotePublicKey()));
-					ChatDAO dao = ChatDAO.get();
-					List<Chat> out = dao.getQueuedMessagesForUser(base64Key);
-					for( Chat c : out ) {
-						if( friendConnection.isTimedOut() || friendConnection.isClosing() ) {
-							return;
-						}
-
-						friendConnection.sendChat(c.getMessage() + "" (sent "" + StringTools.formatDateAppleLike(new Date(c.getTimestamp()), true) + "")"");
-						dao.markSent(c.getUID());
-
-						try {
-							Thread.sleep(200);
-						} catch( InterruptedException e ) {}
-					}
-				}
-			};
-			queryThread.setDaemon(true);
-			queryThread.start();
-		}
-	}
+    /**
+     * make sure to not call any az functions when holding this lock
+     */
+    public static BigFatLock lock = BigFatLock.getInstance(false);
+
+    // private Friend me;
+    public static boolean logToStdOut = false;
+
+    private int mMIN_DELAY_LINK_LATENCY = COConfigurationManager
+            .getIntParameter(""f2f_search_emulate_hops_min"")
+            * COConfigurationManager.getIntParameter(""f2f_overlay_emulate_link_latency_max"");
+    private int mMAX_DELAY_LINK_LATENCY = COConfigurationManager
+            .getIntParameter(""f2f_search_emulate_hops_max"")
+            * COConfigurationManager.getIntParameter(""f2f_overlay_emulate_link_latency_max"");
+    private int mMIN_RESPONSE_DELAY = COConfigurationManager
+            .getIntParameter(""f2f_search_emulate_hops_min"")
+            * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+    private int mMAX_RESPONSE_DELAY = COConfigurationManager
+            .getIntParameter(""f2f_search_emulate_hops_max"")
+            * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+
+    private double mForwardSearchProbability = COConfigurationManager
+            .getFloatParameter(""f2f_forward_search_probability"");
+
+    // this is just a way to treat requests for the local file list a bit
+    // differently
+    public final static int OWN_CONNECTION_ID_MAGIC_NUMBER = 0;
+
+    private final static String RESPONSE_DELAY_SEED_SETTING_KEY = ""response_delay_seed"";
+
+    private static final int TIMEOUT_CHECK_PERIOD = 5 * 1000;
+    private final ConcurrentHashMap<Integer, FriendConnection> connections;
+    private final FileListManager filelistManager;
+    private final LinkedList<FriendConnectListener> friendConnectListeners = new LinkedList<FriendConnectListener>();
+
+    private final FriendManager friendManager;
+    private long lastConnectionCheckRun = System.currentTimeMillis();
+
+    private final AZInstance myInstance;
+    private final PublicKey ownPublicKey;
+    private final QueueManager queueManager = new QueueManager();
+    private final RandomnessManager randomnessManager;
+    private final RandomnessManager responseDelayRandomnesManager;
+    private final SearchManager searchManager;
+
+    public RotatingLogger searchTimingsLogger = new RotatingLogger(""search_timing"");
+
+    private final GlobalManagerStats stats;
+
+    private boolean stopped = false;
+    private final Timer t = new Timer(""FriendConnectionInitialChecker"", true);
+
+    public OverlayManager(FriendManager _friendManager, PublicKey _ownPublicKey,
+            FileListManager _fileListManager, GlobalManagerStats _stats) {
+        stats = _stats;
+        myInstance = AzureusCoreImpl.getSingleton().getInstanceManager().getMyInstance();
+
+        this.randomnessManager = new RandomnessManager();
+        this.friendManager = _friendManager;
+        this.filelistManager = _fileListManager;
+        this.ownPublicKey = _ownPublicKey;
+        this.connections = new ConcurrentHashMap<Integer, FriendConnection>();
+        this.searchManager = new SearchManager(this, filelistManager, randomnessManager, stats);
+
+        byte[] seedBytes = COConfigurationManager.getByteParameter(RESPONSE_DELAY_SEED_SETTING_KEY);
+        if (seedBytes != null) {
+            responseDelayRandomnesManager = new RandomnessManager(seedBytes);
+        } else {
+            responseDelayRandomnesManager = new RandomnessManager();
+            COConfigurationManager.setParameter(RESPONSE_DELAY_SEED_SETTING_KEY,
+                    randomnessManager.getSecretBytes());
+        }
+
+        COConfigurationManager.addAndFireParameterListeners(new String[] {
+                ""f2f_overlay_emulate_link_latency_max"", ""f2f_search_emulate_hops_min"",
+                ""f2f_search_emulate_hops_max"", ""f2f_search_forward_delay"",
+                ""f2f_forward_search_probability"" }, new ParameterListener() {
+            public void parameterChanged(String parameterName) {
+                mMIN_DELAY_LINK_LATENCY = COConfigurationManager
+                        .getIntParameter(""f2f_search_emulate_hops_min"")
+                        * COConfigurationManager
+                                .getIntParameter(""f2f_overlay_emulate_link_latency_max"");
+                mMAX_DELAY_LINK_LATENCY = COConfigurationManager
+                        .getIntParameter(""f2f_search_emulate_hops_max"")
+                        * COConfigurationManager
+                                .getIntParameter(""f2f_overlay_emulate_link_latency_max"");
+                mMIN_RESPONSE_DELAY = COConfigurationManager
+                        .getIntParameter(""f2f_search_emulate_hops_min"")
+                        * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+                mMAX_RESPONSE_DELAY = COConfigurationManager
+                        .getIntParameter(""f2f_search_emulate_hops_max"")
+                        * COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+                mForwardSearchProbability = COConfigurationManager
+                        .getFloatParameter(""f2f_forward_search_probability"");
+
+                if (mForwardSearchProbability <= 0) {
+                    COConfigurationManager.setParameter(""f2f_forward_search_probability"", 0.5f);
+                    mForwardSearchProbability = 0.5;
+                }
+                System.err.println(""f2f_search_fwd_p: "" + mForwardSearchProbability);
+            }
+        });
+
+        OSF2FMessageFactory.init();
+
+        Timer timeoutTimer = new Timer(""OS Overlay Timeout checker"", true);
+        timeoutTimer.schedule(new ConnectionChecker(), 0, TIMEOUT_CHECK_PERIOD);
+
+    }
+
+    public void closeAllConnections() {
+        for (FriendConnection c : connections.values()) {
+            c.close();
+        }
+
+        stopped = true;
+    }
+
+    public boolean createIncomingConnection(byte[] publicKey, NetworkConnection netConn) {
+
+        if (isConnectionAllowed(netConn.getEndpoint().getNotionalAddress().getAddress(), publicKey)) {
+            Friend friend = friendManager.getFriend(publicKey);
+            new FriendConnection(stats, queueManager, netConn, friend, filelistManager,
+                    new FriendConnectionListener());
+
+            return true;
+        }
+        return false;
+    }
+
+    public boolean createOutgoingConnection(ConnectionEndpoint remoteFriendAddr, Friend friend) {
+        if (isConnectionAllowed(remoteFriendAddr.getNotionalAddress().getAddress(),
+                friend.getPublicKey())) {
+            final FriendConnection fc = new FriendConnection(stats, queueManager, remoteFriendAddr,
+                    friend, filelistManager, new FriendConnectionListener());
+            /*
+             * create a check for this connection to verify that we actually get
+             * connected within a reasonable time frame
+             */
+            t.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    if (fc.isTimedOut()) {
+                        fc.close();
+                    }
+                }
+            }, FriendConnection.INITIAL_HANDSHAKE_TIMEOUT + 10 * 1000);
+
+            return true;
+        }
+        return false;
+    }
+
+    private boolean deregisterConnection(FriendConnection connection) {
+        lock.lock();
+        try {
+            Log.log(""deregistered connection: "" + connection.toString() + "" ""
+                    + connections.containsKey(connection.hashCode()) + "" "", logToStdOut);
+            boolean res = null != connections.remove(connection.hashCode());
+            Friend remoteFriend = connection.getRemoteFriend();
+
+            /*
+             * check if there are any active connections to the friend, if not,
+             * mark as disconnected
+             * 
+             * this check is needed if there are 2 concurrent connections to the
+             * same friend , and one is denied to register because of the other
+             * one already connected
+             */
+
+            FriendConnection connectedConn = null;
+            for (FriendConnection c : connections.values()) {
+                if (c.getRemoteFriend().equals(remoteFriend)) {
+                    connectedConn = c;
+                }
+            }
+            /*
+             * if the connection id != null, verify that the friend actually
+             * think it is connected to the right connection id
+             */
+            if (connectedConn != null && connectedConn.isHandshakeReceived()) {
+                int friendConnId = remoteFriend.getConnectionId();
+                if (connectedConn.hashCode() != friendConnId) {
+                    // fix it...
+                    boolean fileListReceived = connectedConn.isFileListReceived();
+                    if (!fileListReceived) {
+                        Log.log(""connection closed, existing connection found, set to handshaking: ""
+                                + remoteFriend.getNick(), logToStdOut);
+                        remoteFriend.setStatus(Friend.STATUS_HANDSHAKING);
+                        remoteFriend.setConnectionId(Friend.NOT_CONNECTED_CONNECTION_ID);
+                    } else {
+                        Log.log(""connection closed, existing connection found, set to connected: ""
+                                + remoteFriend.getNick(), logToStdOut);
+                        remoteFriend.setConnectionId(connectedConn.hashCode());
+                        remoteFriend.setStatus(Friend.STATUS_ONLINE);
+                    }
+                }
+            } else {
+                // ok, no existing connections, mark as disconnected.
+                remoteFriend.disconnected(connection.hashCode());
+            }
+
+            return res;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public void disconnectFriend(Friend f) {
+        for (FriendConnection conn : connections.values()) {
+            if (conn.getRemoteFriend().equals(f)) {
+                conn.close();
+            }
+        }
+    }
+
+    void forwardSearchOrCancel(FriendConnection ignoreConn, OSF2FSearch msg) {
+        for (FriendConnection conn : connections.values()) {
+            if (ignoreConn.hashCode() == conn.hashCode()) {
+                Log.log(""not forwarding search/cancel to: "" + conn + "" (source friend)"",
+                        logToStdOut);
+                continue;
+            }
+            Log.log(""forwarding search/cancel to: "" + conn, logToStdOut);
+            if (shouldForwardSearch(msg, ignoreConn)) {
+                conn.sendSearch(msg.clone(), false);
+            }
+        }
+    }
+
+    public int getConnectCount() {
+        return connections.size();
+    }
+
+    public Map<Integer, Friend> getConnectedFriends() {
+        // sanity checks
+        for (int connectionId : connections.keySet()) {
+            FriendConnection c = connections.get(connectionId);
+            // check status just to make sure
+            final Friend remoteFriend = c.getRemoteFriend();
+            int status = remoteFriend.getStatus();
+            if (status == Friend.STATUS_OFFLINE && c.isHandshakeReceived()) {
+                // fix it...
+                boolean handshakeCompletedFully = c.isFileListReceived();
+                if (!handshakeCompletedFully) {
+                    Debug.out(""getConnectedFriends, existing connection found, settings to handshaking: ""
+                            + remoteFriend.getNick());
+                    remoteFriend.setStatus(Friend.STATUS_HANDSHAKING);
+                } else {
+                    Debug.out(""getConnectedFriends, existing connection found, settings to connected: ""
+                            + remoteFriend.getNick());
+                    remoteFriend.setConnectionId(c.hashCode());
+                    remoteFriend.setStatus(Friend.STATUS_ONLINE);
+                }
+            }
+        }
+
+        Map<Integer, Friend> l = new HashMap<Integer, Friend>(connections.size());
+        /*
+         * we don't show me in friends list anymore
+         */
+        // l.put(me.getConnectionIds().get(0), me);
+        Friend[] friends = friendManager.getFriends();
+        for (Friend friend : friends) {
+            if (friend.getStatus() == Friend.STATUS_ONLINE) {
+                // System.out.println(""online: "" + friend.getNick());
+                l.put(friend.getConnectionId(), friend);
+            }
+        }
+
+        return l;
+    }
+
+    public int getSearchDelayForInfohash(Friend destination, byte[] infohash) {
+        if (destination.isCanSeeFileList()) {
+            return 0;
+        } else {
+            int searchDelay = responseDelayRandomnesManager.getDeterministicNextInt(infohash,
+                    mMIN_RESPONSE_DELAY, mMAX_RESPONSE_DELAY);
+            int latencyDelay = getLatencyDelayForInfohash(destination, infohash);
+            return searchDelay + latencyDelay;
+        }
+    }
+
+    public int getLatencyDelayForInfohash(Friend destination, byte[] infohash) {
+        if (destination.isCanSeeFileList()) {
+            return 0;
+        } else {
+            return responseDelayRandomnesManager.getDeterministicNextInt(infohash,
+                    mMIN_DELAY_LINK_LATENCY, mMAX_DELAY_LINK_LATENCY);
+        }
+    }
+
+    public List<Friend> getDisconnectedFriends() {
+        List<Friend> l = new ArrayList<Friend>();
+        Friend[] friends = friendManager.getFriends();
+        for (Friend friend : friends) {
+            if (friend.getStatus() != Friend.STATUS_ONLINE) {
+                l.add(friend);
+            }
+        }
+        return l;
+    }
+
+    public FileListManager getFilelistManager() {
+        return filelistManager;
+    }
+
+    public List<FriendConnection> getFriendConnections() {
+        return new ArrayList<FriendConnection>(connections.values());
+    }
+
+    // private int parallelConnectCount(InetAddress remoteIP, byte[]
+    // remotePubKey) {
+    // int count = 0;
+    // for (FriendConnection overlayConnection : connections.values()) {
+    // if (overlayConnection.getRemoteIp().equals(remoteIP)
+    // && Arrays.equals(overlayConnection.getRemotePublicKey(),
+    // remotePubKey)) {
+    // count++;
+    // }
+    // }
+    //
+    // return count;
+    // }
+
+    public long getLastConnectionCheckRun() {
+        return lastConnectionCheckRun;
+    }
+
+    public PublicKey getOwnPublicKey() {
+        return ownPublicKey;
+    }
+
+    public QueueManager getQueueManager() {
+        return queueManager;
+    }
+
+    public SearchManager getSearchManager() {
+        return searchManager;
+    }
+
+    public double getTransportDownloadKBps() {
+        long totalDownloadSpeed = 0;
+
+        LinkedList<FriendConnection> conns = new LinkedList<FriendConnection>();
+        conns.addAll(connections.values());
+
+        for (FriendConnection fc : conns) {
+            final Map<Integer, OverlayEndpoint> ot = fc.getOverlayTransports();
+
+            for (OverlayEndpoint o : ot.values()) {
+                totalDownloadSpeed += o.getDownloadRate();
+            }
+        }
+
+        return totalDownloadSpeed / 1024.0;
+    }
+
+    public long getTransportSendRate(boolean includeLan) {
+        long totalUploadSpeed = 0;
+
+        LinkedList<FriendConnection> conns = new LinkedList<FriendConnection>();
+        conns.addAll(connections.values());
+
+        for (FriendConnection fc : conns) {
+            final Map<Integer, OverlayEndpoint> ot = fc.getOverlayTransports();
+
+            for (OverlayEndpoint o : ot.values()) {
+                if (!includeLan && o.isLANLocal()) {
+                    // not including lan local peers
+                } else {
+                    totalUploadSpeed += o.getUploadRate();
+                }
+            }
+        }
+
+        return totalUploadSpeed;
+    }
+
+    public boolean isConnectionAllowed(InetAddress remoteIP, byte[] remotePubKey) {
+        Friend friend = friendManager.getFriend(remotePubKey);
+        if (stopped) {
+            Log.log(""connection denied: (f2f transfers disabled)"", logToStdOut);
+            return false;
+        }
+        // check if we should allow this public key to connect
+        if (Arrays.equals(remotePubKey, ownPublicKey.getEncoded())
+                && remoteIP.equals(myInstance.getExternalAddress())) {
+            Log.log(LogEvent.LT_INFORMATION, ""connection from self not allowed (if same ip)"",
+                    logToStdOut);
+            return false;
+        } else if (friend == null) {
+            Log.log(LogEvent.LT_WARNING, "" access denied (not friend): "" + remoteIP, logToStdOut);
+            return false;
+        } else if (friend.isBlocked()) {
+            Log.log(LogEvent.LT_WARNING, "" access denied (friend blocked): "" + remoteIP,
+                    logToStdOut);
+            return false;
+        } else if (friend.getFriendBannedUntil() > System.currentTimeMillis()) {
+            double minutesLeft = friend.getFriendBannedUntil() - System.currentTimeMillis()
+                    / (60 * 1000.0);
+            friend.updateConnectionLog(true, ""incoming connection denied, friend blocked for ""
+                    + minutesLeft + "" more minutes because of: "" + friend.getBannedReason());
+            Log.log(LogEvent.LT_WARNING, "" access denied (friend blocked for "" + minutesLeft
+                    + "" more minutes): "" + remoteIP, logToStdOut);
+            return false;
+        }
+
+        for (FriendConnection c : connections.values()) {
+            if (c.getRemoteFriend().equals(friend)) {
+                Log.log(LogEvent.LT_WARNING, "" access denied (friend already connected): ""
+                        + remoteIP, logToStdOut);
+                return false;
+            }
+        }
+        Log.log(LogEvent.LT_INFORMATION, ""friend connection ok: "" + remoteIP + "" :: "" + friend,
+                logToStdOut);
+        return true;
+    }
+
+    /**
+     * make sure to synchronize before calling this function
+     */
+    private void notifyConnectionListeners(Friend f, boolean connected) {
+        lock.lock();
+        try {
+            for (FriendConnectListener cb : friendConnectListeners) {
+                if (connected) {
+                    cb.friendConnected(f);
+                } else {
+                    cb.friendDisconnected(f);
+                }
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private boolean registerConnection(FriendConnection connection) {
+        lock.lock();
+        try {
+            if (isConnectionAllowed(connection.getRemoteIp(), connection.getRemotePublicKey())) {
+                connections.put(connection.hashCode(), connection);
+                /*
+                 * don't mark remote friend as connected until after the
+                 * oneswarm handshake message is received
+                 */
+                // connection.getRemoteFriend().connected(connection.hashCode());
+                Log.log(""registered connection: "" + connection, logToStdOut);
+                return true;
+            } else {
+                return false;
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public void registerForConnectNotifications(FriendConnectListener callback) {
+        lock.lock();
+        try {
+            friendConnectListeners.add(callback);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public void restartAllConnections() {
+        stopped = false;
+    }
+
+    public void sendChatMessage(int connectionId, String inPlaintextMessage) {
+        FriendConnection conn = connections.get(connectionId);
+        conn.sendChat(inPlaintextMessage);
+    }
+
+    void sendDirectedSearch(FriendConnection target, OSF2FHashSearch search) {
+        Log.log(""sending search to "" + target, logToStdOut);
+        target.sendSearch(search, true);
+    }
+
+    public boolean sendFileListRequest(int connectionId, long maxCacheAge,
+            PluginCallback<FileList> callback) {
+
+        // just check if the request is for the local list
+        if (connectionId == OWN_CONNECTION_ID_MAGIC_NUMBER) {
+            callback.requestCompleted(filelistManager.getOwnFileList());
+        }
+
+        FriendConnection conn = connections.get(connectionId);
+
+        if (conn != null) {
+
+            FileList oldList = filelistManager.getFriendsList(conn.getRemoteFriend());
+            if (oldList != null
+                    && (System.currentTimeMillis() - oldList.getCreated()) < maxCacheAge) {
+                callback.requestCompleted(oldList);
+            }
+
+            Log.log(""sending filelist request to "" + conn);
+            conn.sendFileListRequest(OSF2FMessage.FILE_LIST_TYPE_COMPLETE, callback);
+            return true;
+        } else {
+            System.err
+                    .println(""tried to get filelist for unknown connection id (friend just went offline?)!, stack trace is:"");
+            new RuntimeException().printStackTrace();
+        }
+        return false;
+    }
+
+    // public void startDownload(byte type, byte[] metainfo,
+    // boolean createIfNotExist) {
+    // if (type == OSF2FMessage.METAINFO_TYPE_BITTORRENT) {
+    //
+
+    public boolean sendMetaInfoRequest(int connectionId, int channelId, byte[] infohash,
+            int lengthHint, PluginCallback<byte[]> callback) {
+        FriendConnection conn = connections.get(connectionId);
+        Log.log(""sending metainfo request to "" + conn);
+        if (conn != null) {
+            conn.sendMetaInfoRequest(OSF2FMessage.METAINFO_TYPE_BITTORRENT, channelId, infohash,
+                    lengthHint, callback);
+            return true;
+        }
+        return false;
+
+    }
+
+    void sendSearchOrCancel(OSF2FSearch search, boolean skipQueue, boolean forceSend) {
+        Log.log(""sending search/cancel to "" + connections.size(), logToStdOut);
+        int numSent = 0;
+        for (FriendConnection conn : connections.values()) {
+
+            boolean shouldSend = true;
+            if (!forceSend) {
+                shouldSend = shouldForwardSearch(search, conn);
+            }
+            if (shouldSend) {
+                conn.sendSearch(search.clone(), skipQueue);
+                numSent++;
+            }
+            if (search instanceof OSF2FHashSearch) {
+                OSF2FHashSearch hs = (OSF2FHashSearch) search;
+                searchTimingsLogger.log(System.currentTimeMillis() + "", send_search, ""
+                        + conn.getRemoteFriend().getNick() + "", "" + hs.getSearchID() + "", ""
+                        + hs.getInfohashhash());
+            }
+        }
+        /*
+         * for searches sent by us, if we didn't send it to anyone try again but
+         * without the randomness linitng who we are sending to
+         */
+        if (numSent == 0 && !forceSend) {
+            sendSearchOrCancel(search, skipQueue, true);
+        }
+    }
+
+    /**
+     * to protect against colluding friends we are only forwarding searches with
+     * 95% probability
+     * 
+     * if forcesend = true the search will be forwarded anyway even if the
+     * randomness says that friend shouldn't be forwarded
+     */
+    private boolean shouldForwardSearch(OSF2FSearch search, FriendConnection conn) {
+        boolean shouldSend = true;
+        if (search instanceof OSF2FHashSearch) {
+            shouldSend = shouldForwardSearch(((OSF2FHashSearch) search).getInfohashhash(), conn);
+        } else if (search instanceof OSF2FSearchCancel) {
+            long infohash = searchManager.getInfoHashHashFromSearchId(search.getSearchID());
+            if (infohash != -1) {
+                shouldSend = shouldForwardSearch(infohash, conn);
+            } else {
+                shouldSend = false;
+            }
+        }
+        return shouldSend;
+    }
+
+    private boolean shouldForwardSearch(long infohashhash, FriendConnection conn) {
+        if (conn.getRemoteFriend().isCanSeeFileList()) {
+            return true;
+        }
+        byte[] infohashbytes = RandomnessManager.getBytes(infohashhash);
+        byte[] friendHash = RandomnessManager.getBytes(conn.getRemotePublicKeyHash());
+        byte[] all = new byte[infohashbytes.length + friendHash.length];
+        System.arraycopy(infohashbytes, 0, all, 0, infohashbytes.length);
+        System.arraycopy(friendHash, 0, all, infohashbytes.length, friendHash.length);
+
+        int randomVal = randomnessManager.getDeterministicRandomInt(all);
+        if (randomVal < 0) {
+            randomVal = -randomVal;
+        }
+        if (randomVal < Integer.MAX_VALUE * mForwardSearchProbability) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void triggerFileListUpdates() {
+        List<FriendConnection> conns = new LinkedList<FriendConnection>();
+        lock.lock();
+        try {
+            conns.addAll(connections.values());
+        } finally {
+            lock.unlock();
+        }
+        for (FriendConnection conn : connections.values()) {
+            conn.triggerFileListSend();
+        }
+    }
+
+    private class ConnectionChecker extends TimerTask {
+
+        @Override
+        public void run() {
+
+            try {
+                // first, check if we have any overlays that are timed out
+                for (FriendConnection connection : connections.values()) {
+                    connection.clearTimedOutForwards();
+                    connection.clearTimedOutTransports();
+                    connection.clearTimedOutSearchRecords();
+                    connection.clearOldMetainfoRequests();
+                }
+            } catch (Throwable t) {
+                Debug.out(""F2F Connection Checker: got error when clearing transports/forwards"", t);
+            }
+            try {
+                // then, check if we need to send any keepalives
+                for (FriendConnection connection : connections.values()) {
+                    connection.doKeepAliveCheck();
+                }
+            } catch (Throwable t) {
+                Debug.out(""F2F Connection Checker: got error when sending keep alives"", t);
+            }
+
+            try {
+                // check if we have any timed out connections
+                List<FriendConnection> timedOut = new ArrayList<FriendConnection>();
+                for (FriendConnection connection : connections.values()) {
+                    if (connection.isTimedOut()) {
+                        timedOut.add(connection);
+                    }
+                }
+                // and close them
+                for (FriendConnection friendConnection : timedOut) {
+                    friendConnection.close();
+                }
+            } catch (Throwable t) {
+                Debug.out(""F2F Connection Checker: got error when clearing friend connections"", t);
+            }
+
+            try {
+                // then, recycle the search IDs
+                searchManager.clearTimedOutSearches();
+            } catch (Throwable t) {
+                Debug.out(""F2F Connection Checker: got error when clearing timed out searches"", t);
+            }
+            lastConnectionCheckRun = System.currentTimeMillis();
+        }
+    }
+
+    class FriendConnectionListener {
+        public boolean connectSuccess(FriendConnection friendConnection) {
+            if (!registerConnection(friendConnection)) {
+                Log.log(""Unable to register connection, ""
+                        + ""connect count to high, closing connection"", logToStdOut);
+                friendConnection.close();
+                return false;
+            }
+            return true;
+        }
+
+        public void disconnected(FriendConnection friendConnection) {
+            if (friendConnection.isFileListReceived()) {
+                notifyConnectionListeners(friendConnection.getRemoteFriend(), false);
+            }
+            deregisterConnection(friendConnection);
+        }
+
+        public void gotSearchCancel(FriendConnection friendConnection, OSF2FSearchCancel msg) {
+            searchManager.handleIncomingSearchCancel(friendConnection, msg);
+        }
+
+        public void gotSearchMessage(FriendConnection friendConnection, OSF2FSearch msg) {
+            if (msg instanceof OSF2FHashSearch) {
+                OSF2FHashSearch hs = (OSF2FHashSearch) msg;
+                searchTimingsLogger.log(System.currentTimeMillis() + "", search, ""
+                        + friendConnection.getRemoteFriend().getNick() + "", "" + hs.getSearchID()
+                        + "", "" + hs.getInfohashhash() + "", ""
+                        + friendConnection.getRemoteIp().getHostAddress());
+            }
+            searchManager.handleIncomingSearch(friendConnection, msg);
+        }
+
+        public void gotSearchResponse(FriendConnection friendConnection, OSF2FSearchResp msg) {
+            if (msg instanceof OSF2FHashSearchResp) {
+                OSF2FHashSearchResp hsr = (OSF2FHashSearchResp) msg;
+                searchTimingsLogger.log(System.currentTimeMillis() + "", response, ""
+                        + friendConnection.getRemoteFriend().getNick() + "", "" + hsr.getSearchID()
+                        + "", "" + hsr.getChannelID() + "", ""
+                        + friendConnection.getRemoteIp().getHostAddress() + "", "" + hsr.getPathID());
+            }
+            searchManager.handleIncomingSearchResponse(friendConnection, msg);
+        }
+
+        @SuppressWarnings(""unchecked"")
+        public void handshakeCompletedFully(final FriendConnection friendConnection) {
+
+            notifyConnectionListeners(friendConnection.getRemoteFriend(), true);
+
+            /*
+             * check if we have any running downloads that this friend has
+             */
+            Log.log(""New friend connected, checking if friend has anything we want"", logToStdOut);
+            List<byte[]> runningDownloadHashes = new LinkedList<byte[]>();
+            List<DownloadManager> dms = AzureusCoreImpl.getSingleton().getGlobalManager()
+                    .getDownloadManagers();
+            for (DownloadManager dm : dms) {
+                if (dm.getState() == DownloadManager.STATE_DOWNLOADING) {
+                    try {
+                        TOTorrent torrent = dm.getTorrent();
+                        if (torrent != null) {
+                            runningDownloadHashes.add(torrent.getHash());
+                        }
+                    } catch (TOTorrentException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            Log.log(""found "" + runningDownloadHashes.size() + "" running downloads"", logToStdOut);
+            FileList remoteFileList = filelistManager.getFriendsList(friendConnection
+                    .getRemoteFriend());
+            for (byte[] hash : runningDownloadHashes) {
+                if (remoteFileList.contains(hash)) {
+                    Log.log(""sending search for '"" + Base32.encode(hash) + ""' to ""
+                            + friendConnection.getRemoteFriend(), logToStdOut);
+                    searchManager.sendDirectedHashSearch(friendConnection, hash);
+                }
+            }
+
+            /**
+             * Check if we need to send any pending chat messages to this user.
+             * (5/sec)
+             */
+            Thread queryThread = new Thread(""Queued chat SQL query for: ""
+                    + friendConnection.getRemoteFriend().getNick()) {
+                @Override
+                public void run() {
+
+                    try {
+                        Thread.sleep(3 * 1000);
+                    } catch (InterruptedException e) {
+                    }
+
+                    String base64Key = new String(Base64.encode(friendConnection
+                            .getRemotePublicKey()));
+                    ChatDAO dao = ChatDAO.get();
+                    List<Chat> out = dao.getQueuedMessagesForUser(base64Key);
+                    for (Chat c : out) {
+                        if (friendConnection.isTimedOut() || friendConnection.isClosing()) {
+                            return;
+                        }
+
+                        friendConnection.sendChat(c.getMessage() + "" (sent ""
+                                + StringTools.formatDateAppleLike(new Date(c.getTimestamp()), true)
+                                + "")"");
+                        dao.markSent(c.getUID());
+
+                        try {
+                            Thread.sleep(200);
+                        } catch (InterruptedException e) {
+                        }
+                    }
+                }
+            };
+            queryThread.setDaemon(true);
+            queryThread.start();
+        }
+    }
 }
 
 class RandomnessManager {
-	private byte[] secretBytes = new byte[20];
-
-	public RandomnessManager() {
-		SecureRandom random;
-		try {
-			random = SecureRandom.getInstance(""SHA1PRNG"");
-			random.nextBytes(secretBytes);
-		} catch (NoSuchAlgorithmException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			secretBytes = null;
-		}
-	}
-
-	public RandomnessManager(byte[] secretBytes) {
-		this.secretBytes = secretBytes;
-	}
-
-	/**
-	 * returns a random int between 0 (inclusive) and n (exclusive) seeded by
-	 * seedBytes
-	 */
-
-	public int getDeterministicNextInt(byte[] seedBytes, int minValue, int maxValue) {
-		int randomInt = getDeterministicRandomInt(seedBytes);
-		if (randomInt < 0) {
-			randomInt = -randomInt;
-		}
-		return minValue + (randomInt % (maxValue - minValue));
-	}
-
-	public int getDeterministicNextInt(int seed, int minValue, int maxValue) {
-		byte[] seedBytes = getBytes(seed);
-		return getDeterministicNextInt(seedBytes, minValue, maxValue);
-	}
-
-	public int getDeterministicNextInt(long seed, int minValue, int maxValue) {
-		byte[] seedBytes = getBytes(seed);
-		return getDeterministicNextInt(seedBytes, minValue, maxValue);
-	}
-
-	public int getDeterministicRandomInt(byte[] seedBytes) {
-		if (secretBytes != null) {
-			byte[] sha1input = new byte[secretBytes.length + seedBytes.length];
-			System.arraycopy(secretBytes, 0, sha1input, 0, secretBytes.length);
-			System.arraycopy(seedBytes, 0, sha1input, secretBytes.length, seedBytes.length);
-			MessageDigest md;
-			try {
-				md = MessageDigest.getInstance(""SHA-1"");
-				md.update(sha1input);
-				byte[] sha1 = md.digest();
-				ByteArrayInputStream bis = new ByteArrayInputStream(sha1);
-				DataInputStream in = new DataInputStream(bis);
-				return in.readInt();
-			} catch (NoSuchAlgorithmException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		throw new RuntimeException(""unable to generate deterministic random int"");
-	}
-
-	/**
-	 * Returns a random int seeded with the secret appended to the seed. For a
-	 * given seed the returned value will always be the same for a given
-	 * instance of the RandomnessManager
-	 *
-	 * @param seed
-	 * @return
-	 * @throws NoSuchAlgorithmException
-	 * @throws IOException
-	 */
-	public int getDeterministicRandomInt(int seed) {
-		byte[] seedBytes = getBytes(seed);
-		return getDeterministicRandomInt(seedBytes);
-	}
-
-	public int getDeterministicRandomInt(long seed) {
-		byte[] seedBytes = getBytes(seed);
-		return getDeterministicRandomInt(seedBytes);
-	}
-
-	public byte[] getSecretBytes() {
-		return secretBytes;
-	}
-
-	static byte[] getBytes(int val) {
-		byte[] b = new byte[4];
-		b[3] = (byte) (val >>> 0);
-		b[2] = (byte) (val >>> 8);
-		b[1] = (byte) (val >>> 16);
-		b[0] = (byte) (val >>> 24);
-		return b;
-	}
-
-	static byte[] getBytes(long val) {
-		byte[] b = new byte[8];
-		b[7] = (byte) (val >>> 0);
-		b[6] = (byte) (val >>> 8);
-		b[5] = (byte) (val >>> 16);
-		b[4] = (byte) (val >>> 24);
-		b[3] = (byte) (val >>> 32);
-		b[2] = (byte) (val >>> 40);
-		b[1] = (byte) (val >>> 48);
-		b[0] = (byte) (val >>> 56);
-		return b;
-	}
+    private byte[] secretBytes = new byte[20];
+
+    public RandomnessManager() {
+        SecureRandom random;
+        try {
+            random = SecureRandom.getInstance(""SHA1PRNG"");
+            random.nextBytes(secretBytes);
+        } catch (NoSuchAlgorithmException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            secretBytes = null;
+        }
+    }
+
+    public RandomnessManager(byte[] secretBytes) {
+        this.secretBytes = secretBytes;
+    }
+
+    /**
+     * returns a random int between 0 (inclusive) and n (exclusive) seeded by
+     * seedBytes
+     */
+
+    public int getDeterministicNextInt(byte[] seedBytes, int minValue, int maxValue) {
+        int randomInt = getDeterministicRandomInt(seedBytes);
+        if (randomInt < 0) {
+            randomInt = -randomInt;
+        }
+        return minValue + (randomInt % (maxValue - minValue));
+    }
+
+    public int getDeterministicNextInt(int seed, int minValue, int maxValue) {
+        byte[] seedBytes = getBytes(seed);
+        return getDeterministicNextInt(seedBytes, minValue, maxValue);
+    }
+
+    public int getDeterministicNextInt(long seed, int minValue, int maxValue) {
+        byte[] seedBytes = getBytes(seed);
+        return getDeterministicNextInt(seedBytes, minValue, maxValue);
+    }
+
+    public int getDeterministicRandomInt(byte[] seedBytes) {
+        if (secretBytes != null) {
+            byte[] sha1input = new byte[secretBytes.length + seedBytes.length];
+            System.arraycopy(secretBytes, 0, sha1input, 0, secretBytes.length);
+            System.arraycopy(seedBytes, 0, sha1input, secretBytes.length, seedBytes.length);
+            MessageDigest md;
+            try {
+                md = MessageDigest.getInstance(""SHA-1"");
+                md.update(sha1input);
+                byte[] sha1 = md.digest();
+                ByteArrayInputStream bis = new ByteArrayInputStream(sha1);
+                DataInputStream in = new DataInputStream(bis);
+                return in.readInt();
+            } catch (NoSuchAlgorithmException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+
+        throw new RuntimeException(""unable to generate deterministic random int"");
+    }
+
+    /**
+     * Returns a random int seeded with the secret appended to the seed. For a
+     * given seed the returned value will always be the same for a given
+     * instance of the RandomnessManager
+     * 
+     * @param seed
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws IOException
+     */
+    public int getDeterministicRandomInt(int seed) {
+        byte[] seedBytes = getBytes(seed);
+        return getDeterministicRandomInt(seedBytes);
+    }
+
+    public int getDeterministicRandomInt(long seed) {
+        byte[] seedBytes = getBytes(seed);
+        return getDeterministicRandomInt(seedBytes);
+    }
+
+    public byte[] getSecretBytes() {
+        return secretBytes;
+    }
+
+    static byte[] getBytes(int val) {
+        byte[] b = new byte[4];
+        b[3] = (byte) (val >>> 0);
+        b[2] = (byte) (val >>> 8);
+        b[1] = (byte) (val >>> 16);
+        b[0] = (byte) (val >>> 24);
+        return b;
+    }
+
+    static byte[] getBytes(long val) {
+        byte[] b = new byte[8];
+        b[7] = (byte) (val >>> 0);
+        b[6] = (byte) (val >>> 8);
+        b[5] = (byte) (val >>> 16);
+        b[4] = (byte) (val >>> 24);
+        b[3] = (byte) (val >>> 32);
+        b[2] = (byte) (val >>> 40);
+        b[1] = (byte) (val >>> 48);
+        b[0] = (byte) (val >>> 56);
+        return b;
+    }
 
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransport.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransport.java
index 9ad34c81..8cdb2c01 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransport.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransport.java
@@ -9,7 +9,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
-import java.util.TimerTask;
 import java.util.logging.Logger;
 
 import org.bouncycastle.util.encoders.Base64;
@@ -20,7 +19,6 @@
 import org.gudy.azureus2.core3.peer.impl.PEPeerTransport;
 import org.gudy.azureus2.core3.peer.impl.PEPeerTransportFactory;
 import org.gudy.azureus2.core3.util.AENetworkClassifier;
-import org.gudy.azureus2.core3.util.Average;
 import org.gudy.azureus2.core3.util.Debug;
 import org.gudy.azureus2.core3.util.DirectByteBuffer;
 import org.gudy.azureus2.core3.util.DirectByteBufferPool;
@@ -30,7 +28,6 @@
 import com.aelitis.azureus.core.networkmanager.ConnectionEndpoint;
 import com.aelitis.azureus.core.networkmanager.EventWaiter;
 import com.aelitis.azureus.core.networkmanager.NetworkConnection;
-import com.aelitis.azureus.core.networkmanager.NetworkManager;
 import com.aelitis.azureus.core.networkmanager.ProtocolEndpoint;
 import com.aelitis.azureus.core.networkmanager.Transport;
 import com.aelitis.azureus.core.networkmanager.TransportEndpoint;
@@ -38,211 +35,63 @@
 import com.aelitis.azureus.core.peermanager.messaging.bittorrent.BTMessageDecoder;
 import com.aelitis.azureus.core.peermanager.messaging.bittorrent.BTMessageEncoder;
 
-import edu.washington.cs.oneswarm.f2f.Friend;
 import edu.washington.cs.oneswarm.f2f.OSF2FAzSwtUi;
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FChannelDataMsg;
-import edu.washington.cs.oneswarm.f2f.messaging.OSF2FChannelReset;
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FMessage;
-import edu.washington.cs.oneswarm.f2f.network.DelayedExecutorService.DelayedExecutor;
 import edu.washington.cs.oneswarm.f2f.share.DownloadManagerStarter;
 import edu.washington.cs.oneswarm.f2f.share.DownloadManagerStarter.DownloadManagerStartListener;
 
-public class OverlayTransport implements Transport {
+public class OverlayTransport extends OverlayEndpoint implements Transport {
 
-    private final static Logger logger = Logger.getLogger(OverlayTransport.class.getName());
-
-    class OverlayProtocolEndpoint implements ProtocolEndpoint {
-        private ConnectionEndpoint connectionEndpoint;
-
-        public OverlayProtocolEndpoint() {
-            connectionEndpoint = new ConnectionEndpoint(getRandomAddr());
-        }
-
-        public Transport connectOutbound(boolean connect_with_crypto, boolean allow_fallback,
-                byte[][] shared_secrets, ByteBuffer initial_data, boolean high_priority,
-                ConnectListener listener) {
-            Debug.out(""tried to create outgoing OverlayTransport, this should never happen!!!"");
-            throw new RuntimeException(""not implemented"");
-        }
-
-        public Transport connectOutbound(boolean connect_with_crypto, boolean allow_fallback,
-                byte[][] shared_secrets, ByteBuffer initial_data, ConnectListener listener) {
-            Debug.out(""tried to create outgoing OverlayTransport, this should never happen!!!"");
-            throw new RuntimeException(""not implemented"");
-        }
-
-        public ConnectionEndpoint getConnectionEndpoint() {
-            return connectionEndpoint;
-        }
-
-        public String getDescription() {
-            return ""PROTOCOL_TCP"";
-        }
-
-        public int getType() {
-            return PROTOCOL_TCP;
-        }
-
-        public void setConnectionEndpoint(ConnectionEndpoint ce) {
-            this.connectionEndpoint = ce;
-        }
-    }
-
-    interface WriteQueueWaiter {
-        public void readyForWrite();
-    }
-
-    /*
-     * max number of ms that a message can be delivered earlier than
-     * overlayDelayMs if that avoids a call to Thread.sleep()
-     */
-    private final static int INCOMING_MESSAGE_DELAY_SLACK = 10;
+    static final String chars = ""abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"";
 
-    public final static byte[] ID_BYTES = new String(""-OS-F2F-"").getBytes();
-    private final static int HANDSHAKE_RESERVED_BITS_START_POS = 20;
-    private final static int HANDSHAKE_RESERVED_BITS_END_POS = 28;
-    private final static int HANDSHAKE_INFO_HASH_START_POS = 28;
     private final static int HANDSHAKE_INFO_HASH_END_POS = 48;
+    private final static int HANDSHAKE_INFO_HASH_START_POS = 28;
     private final static int HANDSHAKE_PEER_ID_POS = 48;
-    private static final int HANDSHAKE_END_POS = HANDSHAKE_PEER_ID_POS + 20;
+    private final static int HANDSHAKE_RESERVED_BITS_END_POS = 28;
+    private final static int HANDSHAKE_RESERVED_BITS_START_POS = 20;
+    public final static byte[] ID_BYTES = new String(""-OS-F2F-"").getBytes();
     private final static int HANDSHAKE_PEER_ID_KEEP = ID_BYTES.length;
+    private static final int HANDSHAKE_END_POS = HANDSHAKE_PEER_ID_POS + 20;
     private static final int HANDSHAKE_PEER_ID_START_MOD_POS = HANDSHAKE_PEER_ID_POS
             + HANDSHAKE_PEER_ID_KEEP;
 
-    public static InetSocketAddress getRandomAddr() {
-        byte[] randomAddr = new byte[16];
-        randomAddr[0] = (byte) 0xfc;
-        randomAddr[1] = 0;
-        Random r = new Random();
-        byte[] rand = new byte[randomAddr.length - 2];
-        r.nextBytes(rand);
-        System.arraycopy(rand, 0, randomAddr, 2, rand.length);
-        InetAddress addr;
-        try {
-            addr = InetAddress.getByAddress(randomAddr);
-            InetSocketAddress remoteFakeAddr = new InetSocketAddress(addr, 1);
-            return remoteFakeAddr;
-        } catch (UnknownHostException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private ByteBuffer data_already_read = null;
-
-    protected boolean closed = false;
-    private String closeReason = """";
-    private boolean sentReset = false;
-    private final int TIMEOUT = 2 * 60 * 1000;
-    private long lastMsgTime;
-
-    private final byte[] infoHash;
-    private final long startTime;
-    private boolean started = false;
-    private final int channelId;
+    private final static Logger logger = Logger.getLogger(OverlayTransport.class.getName());
 
-    private final int pathID;
     // all operations on this object must be in a synchronized block
     private final LinkedList<OSF2FChannelDataMsg> bufferedMessages;
 
-    protected final FriendConnection connection;
-
-    private List<EventWaiter> readWaiter = new LinkedList<EventWaiter>();
-    private List<EventWaiter> writeWaiter = new LinkedList<EventWaiter>();
+    private final byte[] channelPeerId;
+    private ByteBuffer data_already_read = null;
 
-    private int transport_mode;
+    private final byte[] infoHash;
 
+    private volatile boolean outgoing;
     private int posInHandshake = 0;
 
-    private byte[] remoteHandshakeInfoHashBytes = new byte[20];
-    private volatile boolean remoteHandshakeRecieved;
-    private volatile boolean outgoing;
+    private List<EventWaiter> readWaiter = new LinkedList<EventWaiter>();
 
-    private final byte[] channelPeerId;
+    private byte[] remoteHandshakeInfoHashBytes = new byte[20];
 
-    private long bytesIn = 0;
-    private long bytesOut = 0;
-    private Average uploadRateAverage = Average.getInstance(1000, 10);
-    private Average downloadRateAverage = Average.getInstance(1000, 10);
+    private volatile boolean remoteHandshakeRecieved;
 
-    private final long overlayDelayMs;
+    private int transport_mode;
 
-    private final DelayedExecutor delayedOverlayMessageTimer;
+    private List<EventWaiter> writeWaiter = new LinkedList<EventWaiter>();
 
     public OverlayTransport(FriendConnection connection, int channelId, byte[] infohash,
             int pathID, boolean outgoing, long overlayDelayMs) {
-        this.lastMsgTime = System.currentTimeMillis();
-        this.overlayDelayMs = overlayDelayMs;
+        super(connection, channelId, pathID, overlayDelayMs);
         this.infoHash = infohash;
         this.bufferedMessages = new LinkedList<OSF2FChannelDataMsg>();
-        this.connection = connection;
-        this.channelId = channelId;
         logger.fine(getDescription() + "": Creating overlay transport"");
         this.channelPeerId = generatePeerId();
-        this.pathID = pathID;
         this.outgoing = outgoing;
-        this.startTime = System.currentTimeMillis();
-        delayedOverlayMessageTimer = DelayedExecutorService.getInstance().getFixedDelayExecutor(
-                overlayDelayMs);
     }
 
-    /**
-     * This method is called ""from above"", when the peer connection is
-     * terminated, send a reset to other side
-     */
-    public void close(String reason) {
-        if (!closed) {
-            closeReason = ""peer - "" + reason;
-            logger.fine(getDescription() + "": OverlayTransport closed, reason:"" + closeReason);
-
-            closed = true;
-            this.sendReset();
-        }
-        // we don't expect anyone to read whatever we have left in the buffer
-        synchronized (bufferedMessages) {
-            while (bufferedMessages.size() > 0) {
-                bufferedMessages.removeFirst().destroy();
-            }
-        }
-        // and remove it from the friend connection
-        connection.deregisterOverlayTransport(this);
-
-    }
-
-    /**
-     * this method is called from below when a reset is received
-     * 
-     * @param reason
-     */
-    public void closeChannelReset() {
-
-        if (sentReset) {
-            // ok, this is the response to our previous close
-            connection.deregisterOverlayTransport(this);
-        } else {
-            if (!closed) {
-                closeReason = ""remote host closed overlay channel"";
-                logger.fine(getDescription() + "": OverlayTransport closed, reason:"" + closeReason);
-                // this is the remote side saying that the connection is closed
-                // send a reset back to confirm
-                sendReset();
-                closed = true;
-            }
-        }
-    }
-
-    /**
-     * this method is called from below if the friend connection dies
-     * 
-     * @param reason
-     */
-    public void closeConnectionClosed(String reason) {
-        closeReason = reason;
-        logger.fine(getDescription() + "": OverlayTransport closed, reason:"" + closeReason);
-
-        closed = true;
-        connection.deregisterOverlayTransport(this);
+    @Override
+    protected void cleanup() {
+        // not used.
     }
 
     public void connectedInbound() {
@@ -258,7 +107,43 @@ public void connectOutbound(ByteBuffer initial_data, ConnectListener listener,
         throw new RuntimeException(""not implemented"");
     }
 
-    static final String chars = ""abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"";
+    private void createPeerTransport(DownloadManager downloadManager) {
+        // final check, we only allow this if the osf2f network is enabled, and
+        // osf2f friend search is a valid peer source
+        boolean allowed = checkOSF2FAllowed(downloadManager.getDownloadState().getPeerSources(),
+                downloadManager.getDownloadState().getNetworks());
+
+        if (!allowed) {
+            Debug.out(""denied request to create a peer"");
+            this.closeConnectionClosed(""access denied when creating overlay"");
+            return;
+        }
+
+        PEPeerManager manager = downloadManager.getPeerManager();
+
+        PEPeerControl control = (PEPeerControl) manager;
+        // set it up the same way as an incoming connection
+        final NetworkConnection overlayConn = new NetworkConnectionImpl(this,
+                new BTMessageEncoder(), new BTMessageDecoder());
+        PEPeerTransport pt = PEPeerTransportFactory.createTransport(control, PEPeerSource.PS_OSF2F,
+                overlayConn, null);
+
+        // start it
+        pt.start();
+        // and add it to the control
+        control.addPeerTransport(pt);
+
+        // add the friend
+        pt.setData(OSF2FAzSwtUi.KEY_OVERLAY_TRANSPORT, this);
+    }
+
+    protected void destroyBufferedMessages() {
+        synchronized (bufferedMessages) {
+            while (bufferedMessages.size() > 0) {
+                bufferedMessages.removeFirst().destroy();
+            }
+        }
+    }
 
     public byte[] generatePeerId() {
         byte[] peerId = new byte[20];
@@ -272,20 +157,6 @@ public byte[] generatePeerId() {
         return peerId;
     }
 
-    public int getChannelId() {
-        return channelId;
-    }
-
-    private String desc = null;
-
-    public String getDescription() {
-        if (desc == null) {
-            desc = NetworkManager.OSF2F_TRANSPORT_PREFIX + "": ""
-                    + connection.getRemoteFriend().getNick() + "":"" + Integer.toHexString(channelId);
-        }
-        return desc;
-    }
-
     public String getEncryption() {
         return (""FriendToFriend over SSL"");
     }
@@ -294,10 +165,6 @@ public int getMssSize() {
         return OSF2FMessage.MAX_MESSAGE_SIZE;
     }
 
-    public int getPathID() {
-        return pathID;
-    }
-
     public TransportEndpoint getTransportEndpoint() {
 
         return new TransportEndpoint() {
@@ -315,21 +182,7 @@ public int getTransportMode() {
         return transport_mode;
     }
 
-    public void incomingOverlayMsg(final OSF2FChannelDataMsg msg) {
-        lastMsgTime = System.currentTimeMillis();
-        if (closed) {
-            return;
-        }
-        delayedOverlayMessageTimer.queue(overlayDelayMs, INCOMING_MESSAGE_DELAY_SLACK,
-                new TimerTask() {
-                    @Override
-                    public void run() {
-                        handleDelayedOverlayMessage(msg);
-                    }
-                });
-    }
-
-    private void handleDelayedOverlayMessage(final OSF2FChannelDataMsg msg) {
+    protected void handleDelayedOverlayMessage(final OSF2FChannelDataMsg msg) {
         synchronized (bufferedMessages) {
             bufferedMessages.add(msg);
 
@@ -381,7 +234,7 @@ public boolean isReadyForWrite(final EventWaiter waiter) {
         if (closed) {
             return false;
         }
-        if (!connection.isReadyForWrite(new WriteQueueWaiter() {
+        if (!friendConnection.isReadyForWrite(new WriteQueueWaiter() {
             public void readyForWrite() {
                 if (waiter != null) {
                     logger.finest(getDescription() + "": connection ready, notifying waiter"");
@@ -396,18 +249,10 @@ public void readyForWrite() {
         return true;
     }
 
-    public boolean isStarted() {
-        return started;
-    }
-
     public boolean isTCP() {
         return true;
     }
 
-    public boolean isTimedOut() {
-        return System.currentTimeMillis() - lastMsgTime > TIMEOUT;
-    }
-
     private byte modifyIncomingHandShake(byte b) {
         if (posInHandshake == -1) {
             return b;
@@ -428,7 +273,7 @@ private byte modifyIncomingHandShake(byte b) {
                 if (!Arrays.equals(infoHash, remoteHandshakeInfoHashBytes)) {
                     logger.warning(getDescription()
                             + "": WARNING in ""
-                            + connection
+                            + friendConnection
                             + "" :: remote host different infohash ""
                             + ""than what we expected ,expected:\n ""
                             + new String(Base64.encode(infoHash) + "" got\n""
@@ -584,12 +429,6 @@ public long read(ByteBuffer[] buffers, int array_offset, int length) throws IOEx
         return totalRead;
     }
 
-    public void sendReset() {
-        sentReset = true;
-        connection.sendChannelRst(new OSF2FChannelReset(OSF2FChannelReset.CURRENT_VERSION,
-                channelId));
-    }
-
     public void setAlreadyRead(ByteBuffer bytes_already_read) {
         if (data_already_read != null) {
             Debug.out(""push back already performed"");
@@ -631,38 +470,31 @@ public void downloadStarted() {
         });
     }
 
-    public long getArtificialDelay() {
-        return overlayDelayMs;
-    }
-
-    private void createPeerTransport(DownloadManager downloadManager) {
-        // final check, we only allow this if the osf2f network is enabled, and
-        // osf2f friend search is a valid peer source
-        boolean allowed = checkOSF2FAllowed(downloadManager.getDownloadState().getPeerSources(),
-                downloadManager.getDownloadState().getNetworks());
-
-        if (!allowed) {
-            Debug.out(""denied request to create a peer"");
-            this.closeConnectionClosed(""access denied when creating overlay"");
-            return;
+    public long write(ByteBuffer[] buffers, int array_offset, int length) throws IOException {
+        if (closed) {
+            // when closed just ignore the write requests
+            // hopefully the peertransport will read everything in the buffer
+            // and get the exception there when done
+            return 0;
         }
-
-        PEPeerManager manager = downloadManager.getPeerManager();
-
-        PEPeerControl control = (PEPeerControl) manager;
-        // set it up the same way as an incoming connection
-        final NetworkConnection overlayConn = new NetworkConnectionImpl(this,
-                new BTMessageEncoder(), new BTMessageDecoder());
-        PEPeerTransport pt = PEPeerTransportFactory.createTransport(control, PEPeerSource.PS_OSF2F,
-                overlayConn, null);
-
-        // start it
-        pt.start();
-        // and add it to the control
-        control.addPeerTransport(pt);
-
-        // add the friend
-        pt.setData(OSF2FAzSwtUi.KEY_OVERLAY_TRANSPORT, this);
+        int totalToWrite = 0;
+        int totalWritten = 0;
+        for (int i = array_offset; i < array_offset + length; i++) {
+            totalToWrite += buffers[i].remaining();
+        }
+        logger.finest(getDescription() + ""got write request for: "" + totalToWrite);
+        // only write one packet at the time
+        if (isReadyForWrite(null)) {
+            DirectByteBuffer msgBuffer = DirectByteBufferPool.getBuffer(DirectByteBuffer.AL_MSG,
+                    Math.min(totalToWrite, OSF2FMessage.MAX_PAYLOAD_SIZE));
+            this.putInBuffer(buffers, array_offset, length, msgBuffer);
+            msgBuffer.flip(DirectByteBuffer.SS_MSG);
+            totalWritten += writeMessageToFriendConnection(msgBuffer);
+        }
+        logger.finest(""wrote "" + totalWritten + "" to overlay channel "" + channelId);
+        bytesOut += totalWritten;
+        uploadRateAverage.addValue(totalWritten);
+        return totalWritten;
     }
 
     /**
@@ -697,76 +529,64 @@ public static boolean checkOSF2FAllowed(String[] peerSources, String[] netSource
         return allowed;
     }
 
-    public long write(ByteBuffer[] buffers, int array_offset, int length) throws IOException {
-        if (closed) {
-            // when closed just ignore the write requests
-            // hopefully the peertransport will read everything in the buffer
-            // and get the exception there when done
-            return 0;
-        }
-        int totalToWrite = 0;
-        int totalWritten = 0;
-        for (int i = array_offset; i < array_offset + length; i++) {
-            totalToWrite += buffers[i].remaining();
-        }
-        logger.finest(getDescription() + ""got write request for: "" + totalToWrite);
-        // only write one packet at the time
-        if (isReadyForWrite(null)) {
-            DirectByteBuffer msgBuffer = DirectByteBufferPool.getBuffer(DirectByteBuffer.AL_MSG,
-                    Math.min(totalToWrite, OSF2FMessage.MAX_PAYLOAD_SIZE));
-            this.putInBuffer(buffers, array_offset, length, msgBuffer);
-            msgBuffer.flip(DirectByteBuffer.SS_MSG);
-            totalWritten += writeMessage(msgBuffer);
+    public static InetSocketAddress getRandomAddr() {
+        byte[] randomAddr = new byte[16];
+        randomAddr[0] = (byte) 0xfc;
+        randomAddr[1] = 0;
+        Random r = new Random();
+        byte[] rand = new byte[randomAddr.length - 2];
+        r.nextBytes(rand);
+        System.arraycopy(rand, 0, randomAddr, 2, rand.length);
+        InetAddress addr;
+        try {
+            addr = InetAddress.getByAddress(randomAddr);
+            InetSocketAddress remoteFakeAddr = new InetSocketAddress(addr, 1);
+            return remoteFakeAddr;
+        } catch (UnknownHostException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
         }
-        logger.finest(""wrote "" + totalWritten + "" to overlay channel "" + channelId);
-        bytesOut += totalWritten;
-        uploadRateAverage.addValue(totalWritten);
-        return totalWritten;
-    }
-
-    protected long writeMessage(DirectByteBuffer msgBuffer) {
-        OSF2FChannelDataMsg msg = new OSF2FChannelDataMsg(OSF2FMessage.CURRENT_VERSION, channelId,
-                msgBuffer);
-        long totalWritten = msgBuffer.remaining(DirectByteBuffer.SS_MSG);
-        msg.setForward(false);
-        connection.sendChannelMsg(msg, true);
-        return totalWritten;
+        return null;
     }
 
-    public String getRemoteIP() {
-        return connection.getRemoteIp().getHostAddress();
-    }
+    private static class OverlayProtocolEndpoint implements ProtocolEndpoint {
+        private ConnectionEndpoint connectionEndpoint;
 
-    public Friend getRemoteFriend() {
-        return connection.getRemoteFriend();
-    }
+        public OverlayProtocolEndpoint() {
+            connectionEndpoint = new ConnectionEndpoint(getRandomAddr());
+        }
 
-    public long getAge() {
-        return System.currentTimeMillis() - startTime;
-    }
+        public Transport connectOutbound(boolean connect_with_crypto, boolean allow_fallback,
+                byte[][] shared_secrets, ByteBuffer initial_data, boolean high_priority,
+                ConnectListener listener) {
+            Debug.out(""tried to create outgoing OverlayTransport, this should never happen!!!"");
+            throw new RuntimeException(""not implemented"");
+        }
 
-    public long getLastMsgTime() {
-        return System.currentTimeMillis() - lastMsgTime;
-    }
+        public Transport connectOutbound(boolean connect_with_crypto, boolean allow_fallback,
+                byte[][] shared_secrets, ByteBuffer initial_data, ConnectListener listener) {
+            Debug.out(""tried to create outgoing OverlayTransport, this should never happen!!!"");
+            throw new RuntimeException(""not implemented"");
+        }
 
-    public long getBytesIn() {
-        return bytesIn;
-    }
+        public ConnectionEndpoint getConnectionEndpoint() {
+            return connectionEndpoint;
+        }
 
-    public long getBytesOut() {
-        return bytesOut;
-    }
+        public String getDescription() {
+            return ""PROTOCOL_TCP"";
+        }
 
-    public int getUploadRate() {
-        return (int) uploadRateAverage.getAverage();
-    }
+        public int getType() {
+            return PROTOCOL_TCP;
+        }
 
-    public int getDownloadRate() {
-        return (int) downloadRateAverage.getAverage();
+        public void setConnectionEndpoint(ConnectionEndpoint ce) {
+            this.connectionEndpoint = ce;
+        }
     }
 
-    public boolean isLANLocal() {
-        return connection.getNetworkConnection().isLANLocal();
+    interface WriteQueueWaiter {
+        public void readyForWrite();
     }
-
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransportEncrypted.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransportEncrypted.java
index 0a210a17..ae86c793 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransportEncrypted.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/OverlayTransportEncrypted.java
@@ -17,97 +17,103 @@
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FMessage;
 
 public class OverlayTransportEncrypted extends OverlayTransport {
-	private final static Logger logger = Logger.getLogger(OverlayTransportEncrypted.class.getName());
+    private final static Logger logger = Logger
+            .getLogger(OverlayTransportEncrypted.class.getName());
 
-	private static final String ENCRYPTION_ALGORITHM = ""AES/CFB/NoPadding"";
-	public final static int KEY_LENGTH_BITS = 256;
-	final Cipher readCipher;
-	final Cipher writeCipher;
+    private static final String ENCRYPTION_ALGORITHM = ""AES/CFB/NoPadding"";
+    public final static int KEY_LENGTH_BITS = 256;
+    final Cipher readCipher;
+    final Cipher writeCipher;
 
-	public OverlayTransportEncrypted(FriendConnection connection, int channelId, byte[] infohash, int pathID, boolean outgoing, long overlayDelayMs, byte[] key) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
-		super(connection, channelId, infohash, pathID, outgoing, overlayDelayMs);
-		if (key.length / 8 != KEY_LENGTH_BITS) {
-			throw new InvalidKeyException(""invalid key length"");
-		}
+    public OverlayTransportEncrypted(FriendConnection connection, int channelId, byte[] infohash,
+            int pathID, boolean outgoing, long overlayDelayMs, byte[] key)
+            throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
+        super(connection, channelId, infohash, pathID, outgoing, overlayDelayMs);
+        if (key.length / 8 != KEY_LENGTH_BITS) {
+            throw new InvalidKeyException(""invalid key length"");
+        }
 
-		SecretKeySpec keySpec = new SecretKeySpec(key, 0, key.length, ENCRYPTION_ALGORITHM);
-		readCipher = Cipher.getInstance(ENCRYPTION_ALGORITHM);
-		readCipher.init(Cipher.DECRYPT_MODE, keySpec);
-		writeCipher = Cipher.getInstance(ENCRYPTION_ALGORITHM);
-		writeCipher.init(Cipher.ENCRYPT_MODE, keySpec);
-	}
+        SecretKeySpec keySpec = new SecretKeySpec(key, 0, key.length, ENCRYPTION_ALGORITHM);
+        readCipher = Cipher.getInstance(ENCRYPTION_ALGORITHM);
+        readCipher.init(Cipher.DECRYPT_MODE, keySpec);
+        writeCipher = Cipher.getInstance(ENCRYPTION_ALGORITHM);
+        writeCipher.init(Cipher.ENCRYPT_MODE, keySpec);
+    }
 
-	public long write(ByteBuffer[] buffers, int array_offset, int length) throws IOException {
+    public long write(ByteBuffer[] buffers, int array_offset, int length) throws IOException {
 
-		if (closed) {
-			// when closed just ignore the write requests
-			// hopefully the peertransport will read everything in the
-			// buffer
-			// and get the exception there when done
-			return 0;
-		}
-		int totalToWrite = 0;
-		int totalWritten = 0;
-		try {
-			for (int i = array_offset; i < array_offset + length; i++) {
-				totalToWrite += buffers[i].remaining();
-			}
-			logger.finest(getDescription() + ""got write request for: "" + totalToWrite);
-			// only write one packet at the time
-			if (isReadyForWrite(null)) {
-				DirectByteBuffer msgBuffer = DirectByteBufferPool.getBuffer(DirectByteBuffer.AL_MSG, Math.min(totalToWrite, OSF2FMessage.MAX_PAYLOAD_SIZE));
+        if (closed) {
+            // when closed just ignore the write requests
+            // hopefully the peertransport will read everything in the
+            // buffer
+            // and get the exception there when done
+            return 0;
+        }
+        int totalToWrite = 0;
+        int totalWritten = 0;
+        try {
+            for (int i = array_offset; i < array_offset + length; i++) {
+                totalToWrite += buffers[i].remaining();
+            }
+            logger.finest(getDescription() + ""got write request for: "" + totalToWrite);
+            // only write one packet at the time
+            if (isReadyForWrite(null)) {
+                DirectByteBuffer msgBuffer = DirectByteBufferPool.getBuffer(
+                        DirectByteBuffer.AL_MSG,
+                        Math.min(totalToWrite, OSF2FMessage.MAX_PAYLOAD_SIZE));
 
-				ByteBuffer dstBuffer = msgBuffer.getBuffer(DirectByteBuffer.SS_MSG);
-				for (int i = 0; i < buffers.length; i++) {
-					ByteBuffer currBuffer = buffers[i];
+                ByteBuffer dstBuffer = msgBuffer.getBuffer(DirectByteBuffer.SS_MSG);
+                for (int i = 0; i < buffers.length; i++) {
+                    ByteBuffer currBuffer = buffers[i];
 
-					if (currBuffer.remaining() > dstBuffer.remaining()) {
-						// we have more to write than what we can fit
-						// set the limit of the source to reflect this
-						int oldLimit = currBuffer.limit();
-						int newLimit = currBuffer.position() + dstBuffer.remaining();
-						currBuffer.limit(newLimit);
-						writeCipher.update(currBuffer, dstBuffer);
-						// and restore the limit when done
-						currBuffer.limit(oldLimit);
-						break;
-					} else {
-						writeCipher.update(currBuffer, dstBuffer);
-					}
-				}
-				msgBuffer.flip(DirectByteBuffer.SS_MSG);
-				totalWritten += writeMessage(msgBuffer);
-			}
-		} catch (ShortBufferException e) {
-			logger.warning(""not enough room in the destination buffer, this should NEVER happen!"");
-			e.printStackTrace();
-			super.close(""short buffer exception"");
-		}
+                    if (currBuffer.remaining() > dstBuffer.remaining()) {
+                        // we have more to write than what we can fit
+                        // set the limit of the source to reflect this
+                        int oldLimit = currBuffer.limit();
+                        int newLimit = currBuffer.position() + dstBuffer.remaining();
+                        currBuffer.limit(newLimit);
+                        writeCipher.update(currBuffer, dstBuffer);
+                        // and restore the limit when done
+                        currBuffer.limit(oldLimit);
+                        break;
+                    } else {
+                        writeCipher.update(currBuffer, dstBuffer);
+                    }
+                }
+                msgBuffer.flip(DirectByteBuffer.SS_MSG);
+                totalWritten += writeMessageToFriendConnection(msgBuffer);
+            }
+        } catch (ShortBufferException e) {
+            logger.warning(""not enough room in the destination buffer, this should NEVER happen!"");
+            e.printStackTrace();
+            super.close(""short buffer exception"");
+        }
 
-		return totalWritten;
-	}
+        return totalWritten;
+    }
 
-	public long read(ByteBuffer[] buffers, int array_offset, int length) throws IOException {
-		DirectByteBuffer[] tempBufferPool = new DirectByteBuffer[buffers.length];
-		ByteBuffer[] tempBuffers = new ByteBuffer[buffers.length];
-		for (int i = 0; i < buffers.length; i++) {
-			tempBufferPool[i] = DirectByteBufferPool.getBuffer(DirectByteBuffer.AL_MSG, buffers[i].remaining());
-			tempBuffers[i] = tempBufferPool[i].getBuffer(DirectByteBuffer.SS_MSG);
-		}
-		long len = super.read(tempBuffers, array_offset, length);
-		try {
-			for (int i = 0; i < tempBuffers.length; i++) {
-				readCipher.update(tempBuffers[i], buffers[i]);
-				tempBufferPool[i].returnToPool();
-			}
-		} catch (ShortBufferException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return len;
-	}
+    public long read(ByteBuffer[] buffers, int array_offset, int length) throws IOException {
+        DirectByteBuffer[] tempBufferPool = new DirectByteBuffer[buffers.length];
+        ByteBuffer[] tempBuffers = new ByteBuffer[buffers.length];
+        for (int i = 0; i < buffers.length; i++) {
+            tempBufferPool[i] = DirectByteBufferPool.getBuffer(DirectByteBuffer.AL_MSG,
+                    buffers[i].remaining());
+            tempBuffers[i] = tempBufferPool[i].getBuffer(DirectByteBuffer.SS_MSG);
+        }
+        long len = super.read(tempBuffers, array_offset, length);
+        try {
+            for (int i = 0; i < tempBuffers.length; i++) {
+                readCipher.update(tempBuffers[i], buffers[i]);
+                tempBufferPool[i].returnToPool();
+            }
+        } catch (ShortBufferException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return len;
+    }
 
-	public String getDescription() {
-		return ""ENCR: "" + super.getDescription();
-	}
+    public String getDescription() {
+        return ""ENCR: "" + super.getDescription();
+    }
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/SearchManager.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/SearchManager.java
index 85eeb392..6095107d 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/SearchManager.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/SearchManager.java
@@ -57,1603 +57,1711 @@
 import edu.washington.cs.oneswarm.f2f.network.DelayedExecutorService.DelayedExecutionEntry;
 import edu.washington.cs.oneswarm.f2f.network.DelayedExecutorService.DelayedExecutor;
 import edu.washington.cs.oneswarm.f2f.network.FriendConnection.OverlayRegistrationError;
+import edu.washington.cs.oneswarm.f2f.servicesharing.ServiceSharingManager;
+import edu.washington.cs.oneswarm.f2f.servicesharing.ServiceSharingManager.SharedService;
 import edu.washington.cs.oneswarm.f2f.share.ShareManagerTools;
 import edu.washington.cs.oneswarm.ui.gwt.BackendErrorLog;
 
 public class SearchManager {
 
-	public static final String SEARCH_QUEUE_THREAD_NAME = ""DelayedSearchQueue"";
-
-	private final static BigFatLock lock = OverlayManager.lock;
-	private static Logger logger = Logger.getLogger(SearchManager.class.getName());
-	// search sources are remembered for 1 minute, any replies after this will
-	// be dropped
-	public static final long MAX_SEARCH_AGE = 60 * 1000;
-	public static final int MAX_SEARCH_QUEUE_LENGTH = 100;
-//	private static final int MAX_SEARCH_RESP_BEFORE_CANCEL = COConfigurationManager.getIntParameter(""f2f_search_max_paths"");
-
-	protected int mMaxSearchResponsesBeforeCancel = COConfigurationManager.getIntParameter(""f2f_search_max_paths"");
-
-	// don't respond if average torrent upload rate is less than 10K/s
-	private static final double NO_RESPONSE_TORRENT_AVERAGE_RATE = 10000;
-
-	private static final double NO_RESPONSE_TOTAL_FRAC_OF_MAX_UPLOAD = 0.9;
-
-	private static final double NO_RESPONSE_TRANSPORT_FRAC_OF_MAX_UPLOAD = 0.75;
-	/*
-	 * this is to avoid searches living forever, search uid are remembered for
-	 * 45min-1h, there are 4 bloom filter buckets that are rotating, each one
-	 * containing 15minutes worth of searches
-	 */
-	private static final int RECENT_SEARCH_BUCKETS = 4;
-
-	private static final long RECENT_SEARCH_MEMORY = 20 * 60 * 1000;
-//	static final int SEARCH_DELAY = COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-	protected int mSearchDelay = COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-
-	/**
-	 * This Map is protected by the BigFatLock: lock. We use this to drop searches from friends
-	 * that are crowding the outgoing search queue early, thus allowing friends that send searches
-	 * more rarely to get through.
-	 *
-	 * This map is emptied once every 60 seconds to deal with accounting errors that may accumulate.
-	 */
-	class MutableInteger { public int v=0; }
-	long lastSearchAccountingFlush = System.currentTimeMillis();
-	private final Map<Friend, MutableInteger> searchesPerFriend = new HashMap<Friend, MutableInteger>();
-
-	private int bloomSearchesBlockedCurr = 0;
-
-	private int bloomSearchesBlockedPrev = 0;
-	private int bloomSearchesSentCurr = 0;
-	private int bloomSearchesSentPrev = 0;
-
-	private final HashMap<Integer, Long> canceledSearches;
-	private final DebugChannelSetupErrorStats debugChannelIdErrorSetupErrorStats = new DebugChannelSetupErrorStats();
-
-	private final DelayedSearchQueue delayedSearchQueue;
-
-	// private final DeterministicDelayResponseQueue delayedResponseQueue;
-
-	private final FileListManager filelistManager;
-
-	private final HashMap<Integer, ForwardedSearch> forwardedSearches;
-	private int forwardedSearchNum = 0;
-	private List<Integer> hashSearchStats = new LinkedList<Integer>();
-
-	private boolean includeLanUploads;
-	private final double NO_FORWARD_FRAC_OF_MAX_UPLOAD = 0.9;
-	private final OverlayManager overlayManager;
-
-	private final Random random = new Random();
-	private final RandomnessManager randomnessManager;
-
-	private int rateLimitInKBps;
-
-	private final RotatingBloomFilter recentSearches;
-	private final HashMap<Integer, SentSearch> sentSearches;
-	private final GlobalManagerStats stats;
-	private final TextSearchManager textSearchManager;
-
-	private List<Integer> textSearchStats = new LinkedList<Integer>();
-
-	private final DelayedExecutor delayedExecutor;
-
-	private String[] filteredKeywords = new String[0];
-
-	public SearchManager(OverlayManager overlayManager, FileListManager filelistManager, RandomnessManager randomnessManager, GlobalManagerStats stats) {
-		this.stats = stats;
-		this.delayedExecutor = DelayedExecutorService.getInstance().getVariableDelayExecutor();
-		// this.delayedResponseQueue = new DeterministicDelayResponseQueue();
-		this.overlayManager = overlayManager;
-		this.sentSearches = new HashMap<Integer, SentSearch>();
-		this.forwardedSearches = new HashMap<Integer, ForwardedSearch>();
-		this.canceledSearches = new HashMap<Integer, Long>();
-		this.filelistManager = filelistManager;
-		this.randomnessManager = randomnessManager;
-		this.textSearchManager = new TextSearchManager();
-		this.recentSearches = new RotatingBloomFilter(RECENT_SEARCH_MEMORY, RECENT_SEARCH_BUCKETS);
-		this.delayedSearchQueue = new DelayedSearchQueue(mSearchDelay);
-		COConfigurationManager.addAndFireParameterListeners(new String[] { ""LAN Speed Enabled"", ""Max Upload Speed KBs"", ""oneswarm.search.filter.keywords"",
-				""f2f_search_max_paths"", ""f2f_search_forward_delay"" }, new ParameterListener() {
-			public void parameterChanged(String parameterName) {
-				includeLanUploads = !COConfigurationManager.getBooleanParameter(""LAN Speed Enabled"");
-				rateLimitInKBps = COConfigurationManager.getIntParameter(""Max Upload Speed KBs"");
-
-				StringList keywords = COConfigurationManager.getStringListParameter(""oneswarm.search.filter.keywords"");
-				if (keywords != null) {
-					String[] neu = new String[keywords.size()];
-					for (int i = 0; i < keywords.size(); i++) {
-						String firstTok = (new StringTokenizer(keywords.get(i))).nextToken();
-						neu[i] = firstTok;
-					}
-					filteredKeywords = neu;
-					logger.fine(""Updated filtered keywords "" + keywords.size());
-				}
-
-				mMaxSearchResponsesBeforeCancel = COConfigurationManager.getIntParameter(""f2f_search_max_paths"");
-
-				mSearchDelay = COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
-				delayedSearchQueue.setDelay(mSearchDelay);
-			}
-		});
-	}
-
-	private boolean canForwardSearch() {
-		double util = fracUpload();
-		if (util == -1 || util < NO_FORWARD_FRAC_OF_MAX_UPLOAD) {
-			return true;
-		} else {
-			logger.finest(""not forwarding search (overloaded, util="" + util + "")"");
-			return false;
-		}
-	}
-
-	private boolean canRespondToSearch() {
-		double totalUtil = fracUpload();
-		if (totalUtil == -1) {
-			return true;
-		}
-		// ok, check if we are using more than 90% of total
-		if (totalUtil < NO_RESPONSE_TOTAL_FRAC_OF_MAX_UPLOAD) {
-			return true;
-		}
-		double transUtil = fracTransportUpload();
-		// check if we are using more than 75% for transports
-		if (transUtil < NO_RESPONSE_TRANSPORT_FRAC_OF_MAX_UPLOAD) {
-			return true;
-		}
-
-		double torrentAvgSpeed = getAverageUploadPerRunningTorrent();
-		if (torrentAvgSpeed == -1) {
-			return true;
-		}
-		if (torrentAvgSpeed > NO_RESPONSE_TORRENT_AVERAGE_RATE) {
-			return true;
-		}
-		if (logger.isLoggable(Level.FINER)) {
-			logger.finer(""not responding to search (overloaded, util="" + transUtil + "")"");
-		}
-		return false;
-	}
-
-	public void clearTimedOutSearches() {
-		lock.lock();
-		try {
-			/*
-			 * check if we need to rotate the bloom filter of recent searches
-			 */
-			boolean rotated = recentSearches.rotateIfNeeded();
-			if (rotated) {
-				bloomSearchesBlockedPrev = bloomSearchesBlockedCurr;
-				bloomSearchesBlockedCurr = 0;
-				bloomSearchesSentPrev = bloomSearchesSentCurr;
-				bloomSearchesSentCurr = 0;
-			}
-
-			for (Iterator<ForwardedSearch> iterator = forwardedSearches.values().iterator(); iterator.hasNext();) {
-				ForwardedSearch fs = iterator.next();
-				if (fs.isTimedOut()) {
-					iterator.remove();
-				}
-			}
-
-			for (Iterator<SentSearch> iterator = sentSearches.values().iterator(); iterator.hasNext();) {
-				SentSearch sentSearch = iterator.next();
-				if (sentSearch.isTimedOut()) {
-					iterator.remove();
-					if (sentSearch.getSearch() instanceof OSF2FHashSearch) {
-						hashSearchStats.add(sentSearch.getResponseNum());
-					} else if (sentSearch.getSearch() instanceof OSF2FTextSearch) {
-						textSearchStats.add(sentSearch.getResponseNum());
-					}
-				}
-			}
-
-			/*
-			 * Delete any expired canceled searches
-			 */
-			LinkedList<Integer> toDelete = new LinkedList<Integer>();
-			for (Integer key : canceledSearches.keySet()) {
-				long age = System.currentTimeMillis() - canceledSearches.get(key);
-				if (age > MAX_SEARCH_AGE) {
-					toDelete.add(key);
-				}
-			}
-
-			for (Integer key : toDelete) {
-				canceledSearches.remove(key);
-			}
-
-			textSearchManager.clearOldResponses();
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public List<String> debugCanceledSearches() {
-		List<String> l = new LinkedList<String>();
-		lock.lock();
-		try {
-			for (Integer s : canceledSearches.keySet()) {
-				l.add(""search="" + Integer.toHexString(s) + "" age="" + ((System.currentTimeMillis() - canceledSearches.get(s)) / 1000) + ""s"");
-			}
-		} finally {
-			lock.unlock();
-		}
-		return l;
-	}
-
-	public List<String> debugForwardedSearches() {
-		List<String> l = new LinkedList<String>();
-		lock.lock();
-		try {
-			for (ForwardedSearch f : forwardedSearches.values()) {
-				l.add(""search="" + Integer.toHexString(f.getSearchId()) + "" responses="" + f.getResponseNum() + "" age="" + (f.getAge() / 1000) + ""s"");
-			}
-		} finally {
-			lock.unlock();
-		}
-		return l;
-	}
-
-	public List<String> debugSentSearches() {
-		List<String> l = new LinkedList<String>();
-		lock.lock();
-		try {
-			for (SentSearch s : sentSearches.values()) {
-				l.add(""search="" + Integer.toHexString(s.getSearch().getSearchID()) + "" responses="" + s.getResponseNum() + "" age="" + (s.getAge() / 1000) + ""s"");
-			}
-		} finally {
-			lock.unlock();
-		}
-		return l;
-	}
-
-	private void forwardSearch(FriendConnection source, OSF2FSearch search) {
-		lock.lock();
-		try {
-
-			// check if search is canceled or forwarded first
-			int searchID = search.getSearchID();
-			if (forwardedSearches.containsKey(searchID)) {
-				logger.finest(""not forwarding search, already forwarded. id: "" + searchID);
-				return;
-			}
-
-			if (canceledSearches.containsKey(searchID)) {
-				logger.finest(""not forwarding search, cancel received. id: "" + searchID);
-				return;
-			}
-
-			int valueID = search.getValueID();
-			if (recentSearches.contains(searchID, valueID)) {
-				bloomSearchesBlockedCurr++;
-				logger.finest(""not forwarding search, in recent filter. id: "" + searchID);
-				return;
-			}
-			bloomSearchesSentCurr++;
-			forwardedSearchNum++;
-			if (logger.isLoggable(Level.FINEST)) {
-				logger.finest(""forwarding search "" + search.getDescription() + "" id: "" + searchID);
-			}
-			forwardedSearches.put(searchID, new ForwardedSearch(source, search));
-			recentSearches.insert(searchID, valueID);
-		} finally {
-			lock.unlock();
-		}
-
-		overlayManager.forwardSearchOrCancel(source, search.clone());
-	}
-
-	private double fracTransportUpload() {
-
-		if (rateLimitInKBps < 1) {
-			return -1;
-		}
-		long uploadRate = overlayManager.getTransportSendRate(includeLanUploads);
-
-		double util = uploadRate / (rateLimitInKBps * 1024.0);
-		return util;
-	}
-
-	private double fracUpload() {
-
-		if (rateLimitInKBps < 1) {
-			return -1;
-		}
-		long uploadRate;
-		if (!includeLanUploads) {
-			uploadRate = stats.getProtocolSendRateNoLAN() + stats.getDataSendRateNoLAN();
-		} else {
-			uploadRate = stats.getProtocolSendRate() + stats.getDataSendRate();
-		}
-
-		double util = uploadRate / (rateLimitInKBps * 1024.0);
-		return util;
-	}
-
-	public int getAndClearForwardedSearchNum() {
-		lock.lock();
-		try {
-			int ret = forwardedSearchNum;
-			forwardedSearchNum = 0;
-			return ret;
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public List<Integer> getAndClearHashSearchStats() {
-		lock.lock();
-		try {
-			List<Integer> ret = hashSearchStats;
-			hashSearchStats = new LinkedList<Integer>();
-			return ret;
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public List<Integer> getAndClearTextSearchStats() {
-		lock.lock();
-		try {
-			List<Integer> ret = textSearchStats;
-			textSearchStats = new LinkedList<Integer>();
-			return ret;
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	@SuppressWarnings(""unchecked"")
-	private double getAverageUploadPerRunningTorrent() {
-		LinkedList<DownloadManager> dms = new LinkedList<DownloadManager>();
-		final List<DownloadManager> downloadManagers = AzureusCoreImpl.getSingleton().getGlobalManager().getDownloadManagers();
-		dms.addAll(downloadManagers);
-
-		long total = 0;
-		int num = 0;
-
-		for (DownloadManager dm : dms) {
-			final DownloadManagerStats s = dm.getStats();
-			if (s == null) {
-				continue;
-			}
-			final PEPeerManager p = dm.getPeerManager();
-			if (p == null) {
-				continue;
-			}
-
-			if (p.getNbPeers() == 0 && p.getNbSeeds() == 0) {
-				continue;
-			}
-
-			long uploadRate = s.getDataSendRate() + s.getProtocolSendRate();
-			total += uploadRate;
-			num++;
-		}
-		if (num == 0) {
-			return -1;
-		}
-
-		return ((double) total) / num;
-
-	}
-
-	public String getSearchDebug() {
-		StringBuilder b = new StringBuilder();
-		b.append(""total_frac="" + fracUpload() + ""\ntransport_frac="" + fracTransportUpload()
-				+ ""\ntorrent_avg="" + getAverageUploadPerRunningTorrent());
-		b.append(""\ncan forward="" + canForwardSearch());
-		b.append(""\ncan respond="" + canRespondToSearch());
-
-		b.append(""\n\nforwarded searches size="" + forwardedSearches.size() + "" canceled size=""
-				+ canceledSearches.size() + "" sent size="" + sentSearches.size());
-		b.append(""\nbloom: stored="" + recentSearches.getPrevFilterNumElements()
-				+ "" est false positives=""
-				+ (100 * recentSearches.getPrevFilterFalsePositiveEst() + ""%""));
-		b.append(""\nbloom blocked|sent curr="" + bloomSearchesBlockedCurr + ""|""
-				+ bloomSearchesSentCurr + "" prev="" + bloomSearchesBlockedPrev + ""|""
-				+ bloomSearchesSentPrev);
-		b.append(""\n\n"" + debugChannelIdErrorSetupErrorStats.getDebugStats());
-
-		long sum = 0, now = System.currentTimeMillis(), count = 0;
-
-		// Include per-friend queue stats
-		lock.lock();
-		try {
-			Map<String, MutableInteger> counts = new HashMap<String, MutableInteger>();
-			for (DelayedSearchQueueEntry e : delayedSearchQueue.queuedSearches.values()) {
-
-				count++;
-				sum += (now - e.insertionTime);
-
-				String nick = e.source.getRemoteFriend().getNick();
-				if (counts.containsKey(nick) == false) {
-					counts.put(nick, new MutableInteger());
-				}
-				counts.get(nick).v++;
-			}
-			for (String nick : counts.keySet()) {
-				b.append(""\n\t"" + nick + "" -> "" + counts.get(nick).v);
-			}
-			b.append(""\n\nQueue size: "" + delayedSearchQueue.queuedSearches.size());
-		} finally {
-			lock.unlock();
-		}
-
-		b.append(""\nAverage queued search delay: "" + (double)sum/(double)count);
-
-		return b.toString();
-	}
-
-	public List<TextSearchResult> getSearchResult(int searchId) {
-		return textSearchManager.getResults(searchId);
-	}
-
-	private boolean handleHashSearch(final FriendConnection source, final OSF2FHashSearch msg) {
-
-		// second, we might actually have this data
-		final byte[] infohash = filelistManager.getMetainfoHash(msg.getInfohashhash());
-
-		if (infohash != null) {
-			DownloadManager dm = AzureusCoreImpl.getSingleton().getGlobalManager().getDownloadManager(new HashWrapper(infohash));
-
-			if (dm != null) {
-				logger.fine(""found match: "" + new String(Base64.encode(infohash)));
-
-				logger.fine(""found dm match, we have this stuff"");
-
-				// check if the torrent allow osf2f search peers
-				boolean allowed = OverlayTransport.checkOSF2FAllowed(dm.getDownloadState().getPeerSources(), dm.getDownloadState().getNetworks());
-				if (!allowed) {
-					logger.warning(""got search match for torrent "" + ""that does not allow osf2f peers"");
-					return true;
-				}
-
-				boolean completedOrDownloading = FileListManager.completedOrDownloading(dm);
-				if (!completedOrDownloading) {
-					return true;
-				}
-
-				// check if we have the capacity to respond
-				if (canRespondToSearch() == false) {
-					return false;
-				}
-
-				// yeah, we actually have this stuff and we have spare capacity
-				// create an overlay transport
-				final int newChannelId = random.nextInt();
-				final int transportFakePathId = random.nextInt();
-				// set the path id for the overlay transport for something
-				// random (since otherwise all transports for this infohash will
-				// get the same pathid, which will limit it to be only one. The
-				// path id set in the channel setup message will be
-				// deterministic. It is the responsibility of the source to
-				// monitor for duplicate paths
-
-				// set the path id to something that will persist between
-				// searches, for example a deterministic random seeded with
-				// the infohashhash
-				final int pathID = randomnessManager.getDeterministicRandomInt((int) msg.getInfohashhash());
-
-				// get the delay for this overlaytranport, that is the latency
-				// component of the delay
-				final int overlayDelay = overlayManager.getLatencyDelayForInfohash(source.getRemoteFriend(), infohash);
-
-				TimerTask task = new TimerTask() {
-					@Override
-					public void run() {
-						try {
-							/*
-							 * check if the search got canceled while we were
-							 * sleeping
-							 */
-							if (!isSearchCanceled(msg.getSearchID())) {
-								final OSF2FHashSearchResp response = new OSF2FHashSearchResp(OSF2FMessage.CURRENT_VERSION, msg.getSearchID(), newChannelId, pathID);
-
-								final OverlayTransport transp = new OverlayTransport(source, newChannelId, infohash, transportFakePathId, false, overlayDelay);
-								// register it with the friendConnection
-								source.registerOverlayTransport(transp);
-								// send the channel setup message
-								source.sendChannelSetup(response, false);
-							}
-						} catch (OverlayRegistrationError e) {
-							Debug.out(""got an error when registering incoming transport to '"" + source.getRemoteFriend().getNick() + ""': "" + e.message);
-						}
-					}
-
-				};
-				delayedExecutor.queue(overlayDelay, task);
-
-				// we are still forwarding if there are files in the torrent
-				// that we chose not to download
-				DiskManagerFileInfo[] diskManagerFileInfo = dm.getDiskManagerFileInfo();
-				for (DiskManagerFileInfo d : diskManagerFileInfo) {
-					if (d.isSkipped()) {
-						return true;
-					}
-				}
-				/*
-				 * ok, we shouldn't forward this, already sent a hash response
-				 * and we have/are downloading all the files
-				 */
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private boolean isSearchCanceled(int searchId) {
-		boolean canceled = false;
-		lock.lock();
-		try {
-			if (canceledSearches.containsKey(searchId)) {
-				canceled = true;
-			}
-		} finally {
-			lock.unlock();
-		}
-		return canceled;
-	}
-
-	/**
-	 * Returns the probability of rejecting a search from this friend given the share of the
-	 * overall queue
-	 */
-	public double getFriendSearchDropProbability(Friend inFriend) {
-
-		lock.lock();
-		try {
-
-			// Always accept if we don't have any searches from friend.
-			if (searchesPerFriend.get(inFriend) == null) {
-				return 0;
-			}
-
-			// Reject proportionally to recent rate. Do not admit more than X/sec.
-			// Also, proportional to processing queue size.
-			double rateBound = delayedSearchQueue.searchCount / 80.0;
-			double queueBound = (double)delayedSearchQueue.queuedSearches.size() / (double)MAX_SEARCH_QUEUE_LENGTH;
-
-			return Math.max(rateBound, queueBound);
-
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	private void handleIncomingHashSearchResponse(OSF2FHashSearch hashSearch, FriendConnection source, OSF2FHashSearchResp msg) {
-		// great, we found someone that has what we searched for!
-		// create the overlay transport
-		byte[] infoHash = filelistManager.getMetainfoHash(hashSearch.getInfohashhash());
-		if (infoHash == null) {
-			logger.warning(""got channel setup request, "" + ""but the infohash we searched for "" + ""is not in filelistmananger"");
-			return;
-		}
-
-		DownloadManager dm = AzureusCoreImpl.getSingleton().getGlobalManager().getDownloadManager(new HashWrapper(infoHash));
-		if (dm == null) {
-			logger.warning(""got channel setup request, "" + ""but the downloadmanager is null"");
-			return;
-		}
-
-		if (source.hasRegisteredPath(msg.getPathID())) {
-			logger.finer(""got channel setup response, "" + ""but path is already used: sending back a reset"");
-			source.sendChannelRst(new OSF2FChannelReset(OSF2FMessage.CURRENT_VERSION, msg.getChannelID()));
-			return;
-		}
-
-		OverlayTransport overlayTransport = new OverlayTransport(source, msg.getChannelID(), infoHash, msg.getPathID(), true, overlayManager.getLatencyDelayForInfohash(source.getRemoteFriend(), infoHash));
-		// register it with the friendConnection
-		try {
-			source.registerOverlayTransport(overlayTransport);
-			// safe to start it since we know that the other party is interested
-			overlayTransport.start();
-		} catch (OverlayRegistrationError e) {
-			Debug.out(""got an error when registering outgoing transport: "" + e.message);
-			return;
-		}
-
-	}
-
-	public void handleIncomingSearch(FriendConnection source, OSF2FSearch msg) {
-		lock.lock();
-		try {
-			logger.finest(""got search: "" + msg.getDescription());
-			// first, check if we either sent or forwarded this search before
-			if (forwardedSearches.containsKey(msg.getSearchID()) || sentSearches.containsKey(msg.getSearchID()) || delayedSearchQueue.isQueued(msg)) {
-				return;
-			}
-		} finally {
-			lock.unlock();
-		}
-
-		boolean shouldForward = true;
-		// second, check if we actually can do something about this
-		if (msg instanceof OSF2FHashSearch) {
-			shouldForward = handleHashSearch(source, (OSF2FHashSearch) msg);
-		} else if (msg instanceof OSF2FTextSearch) {
-			shouldForward = handleTextSearch(source, (OSF2FTextSearch) msg);
-		} else {
-			logger.warning(""received unrecgonized search type: "" + msg.getID() + "" / "" + msg.getClass().getCanonicalName());
-		}
-
-		/*
-		 * check if we are at full capacity
-		 */
-		if (canForwardSearch() == false) {
-			shouldForward = false;
-		}
-
-		if (shouldForward) {
-			// ok, seems like we should attempt to forward this, put it in
-			// the queue
-			delayedSearchQueue.add(source, msg);
-		}
-
-	}
-
-	public void handleIncomingSearchCancel(FriendConnection source, OSF2FSearchCancel msg) {
-
-		boolean forward = false;
-		lock.lock();
-		try {
-
-			/*
-			 * if this is the first time we see the cancel, check if we
-			 * forwarded this search, if we did, send a cancel
-			 */
-			if (!canceledSearches.containsKey(msg.getSearchID())) {
-				canceledSearches.put(msg.getSearchID(), System.currentTimeMillis());
-				/*
-				 * we only forward the cancel if we already sent the search
-				 */
-				if (forwardedSearches.containsKey(msg.getSearchID())) {
-					forward = true;
-				} else {
-					logger.fine(""got search cancel for unknown search id"");
-				}
-			}
-		} finally {
-			lock.unlock();
-		}
-		if (forward) {
-			overlayManager.forwardSearchOrCancel(source, msg);
-		}
-	}
-
-	/**
-	 * There are 2 possible explanations for getting a search response, either
-	 * we got a response for a search we sent ourselves, or we got a response
-	 * for a search we forwarded
-	 *
-	 * @param source
-	 *            connection from where we got the setup
-	 * @param msg
-	 *            the channel setup message
-	 */
-	public void handleIncomingSearchResponse(FriendConnection source, OSF2FSearchResp msg) {
-		SentSearch sentSearch;
-		lock.lock();
-		try {
-			sentSearch = sentSearches.get(msg.getSearchID());
-		} finally {
-			lock.unlock();
-		}
-		// first, if might be a search we sent
-		if (sentSearch != null) {
-			logger.finest(""got response to search: "" + sentSearch.getSearch().getDescription());
-			OSF2FSearch search = sentSearch.getSearch();
-			// update response stats
-			sentSearch.gotResponse();
-			/*
-			 * check if we got enough search responses to cancel this search
-			 *
-			 * we will still use the data, even if the search is canceled. I
-			 * mean, since it already made it here why not use it...
-			 */
-			if (sentSearch.getResponseNum() > mMaxSearchResponsesBeforeCancel) {
-				/*
-				 * only send a cancel message once
-				 */
-				boolean sendCancel = false;
-				lock.lock();
-				try {
-					if (!canceledSearches.containsKey(msg.getSearchID())) {
-						canceledSearches.put(msg.getSearchID(), System.currentTimeMillis());
-						logger.finer(""canceling search "" + msg);
-						sendCancel = true;
-					}
-				} finally {
-					lock.unlock();
-				}
-				if (sendCancel) {
-					overlayManager.sendSearchOrCancel(new OSF2FSearchCancel(OSF2FMessage.CURRENT_VERSION, msg.getSearchID()), true, false);
-				}
-			}
-			if (search instanceof OSF2FHashSearch) {
-				// ok, it was a hash search that we sent
-				handleIncomingHashSearchResponse((OSF2FHashSearch) search, source, (OSF2FHashSearchResp) msg);
-			} else if (search instanceof OSF2FTextSearch) {
-				// this was from a text search we sent
-				FileList fileList;
-				try {
-					OSF2FTextSearchResp textSearchResp = (OSF2FTextSearchResp) msg;
-					fileList = FileListManager.decode_basic(textSearchResp.getFileList());
-
-					textSearchManager.gotSearchResponse(search.getSearchID(), source.getRemoteFriend(), fileList, textSearchResp.getChannelID(), source.hashCode());
-
-					logger.fine(""results so far:"");
-					List<TextSearchResult> res = getSearchResult(search.getSearchID());
-					for (TextSearchResult textSearchResult : res) {
-						logger.fine(textSearchResult.toString());
-					}
-				} catch (IOException e) {
-					logger.warning(""got malformed search response"");
-				}
-			} else {
-				logger.warning(""unknown search response type"");
-			}
-		}
-		// sentsearch == null
-		else {
-			// ok, this is for a search we forwarded
-			ForwardedSearch search;
-			lock.lock();
-			try {
-				search = forwardedSearches.get(msg.getSearchID());
-				if (search == null) {
-					logger.warning(""got response for unknown search:"" + source + "":"" + msg.getDescription());
-					return;
-				}
-
-				logger.finest(""got response to forwarded search: "" + search.getSearch().getDescription());
-
-				if (canceledSearches.containsKey(msg.getSearchID())) {
-					logger.finer(""not forwarding search, it is already canceled, "" + msg.getSearchID());
-					return;
-				}
-			} finally {
-				lock.unlock();
-			}
-
-			FriendConnection searcher = search.getSource();
-			FriendConnection responder = source;
-
-			if (search.getResponseNum() > mMaxSearchResponsesBeforeCancel) {
-				/*
-				 * we really shouldn't cancel other peoples searches, but if
-				 * they don't do it we have to
-				 */
-				lock.lock();
-				try {
-					canceledSearches.put(msg.getSearchID(), System.currentTimeMillis());
-				} finally {
-					lock.unlock();
-				}
-				logger.finest(""Sending cancel for someone elses search!, searcher="" + searcher.getRemoteFriend() + "" responder="" + responder.getRemoteFriend() + "":\t"" + search);
-				overlayManager.forwardSearchOrCancel(source, new OSF2FSearchCancel(OSF2FMessage.CURRENT_VERSION, msg.getSearchID()));
-			} else {
-				search.gotResponse();
-				// register the forwarding
-				logger.finest(""registering overlay forward: "" + searcher.getRemoteFriend().getNick() + ""<->"" + responder.getRemoteFriend().getNick());
-				try {
-					responder.registerOverlayForward(msg, searcher, search.getSearch(), false);
-					searcher.registerOverlayForward(msg, responder, search.getSearch(), true);
-				} catch (FriendConnection.OverlayRegistrationError e) {
-					String direction = ""'"" + responder.getRemoteFriend().getNick() + ""'->'"" + searcher.getRemoteFriend().getNick() + ""'"";
-					e.direction = direction;
-					e.setupMessageSource = responder.getRemoteFriend().getNick();
-					logger.warning(""not forwarding overlay setup request "" + direction + e.message);
-					debugChannelIdErrorSetupErrorStats.add(e);
-					return;
-				}
-
-				// and send out the search
-				if (msg instanceof OSF2FHashSearchResp) {
-					searcher.sendChannelSetup((OSF2FHashSearchResp) msg.clone(), true);
-				} else if (msg instanceof OSF2FTextSearchResp) {
-					searcher.sendTextSearchResp((OSF2FTextSearchResp) msg.clone(), true);
-				} else {
-					Debug.out(""got unknown message: "" + msg.getDescription());
-				}
-			}
-		}
-
-	}
-
-	/**
-	 *
-	 * @param source
-	 * @param msg
-	 * @return
-	 */
-	private boolean handleTextSearch(final FriendConnection source, final OSF2FTextSearch msg) {
-
-		boolean shouldForward = true;
-
-		if (logger.isLoggable(Level.FINER)) {
-			logger.finer(""handleTextSearch: "" + msg.getSearchString() + "" from "" + source.getRemoteFriend().getNick());
-		}
-
-		String searchString = msg.getSearchString();
-
-		// common case is no filtering.
-		if (filteredKeywords.length > 0) {
-			StringTokenizer toks = new StringTokenizer(searchString);
-
-			for (String filter : filteredKeywords) {
-				if (searchString.contains(filter)) {
-					logger.fine(""Blocking search due to filter: "" + searchString + "" matched by: "" + filter);
-					return false;
-				}
-			}
-		}
-
-		List<FileCollection> results = filelistManager.handleSearch(source.getRemoteFriend(), searchString);
-
-		if (results.size() > 0) {
-			if (canRespondToSearch()) {
-				logger.finer(""found matches: "" + results.size());
-				// long fileListSize = results.getFileNum();
-
-				List<DelayedExecutionEntry> delayedExecutionTasks = new LinkedList<DelayedExecutionEntry>();
-				long time = System.currentTimeMillis();
-				for (FileCollection c : results) {
-					// send back a response
-					int channelId = random.nextInt();
-					LinkedList<FileCollection> list = new LinkedList<FileCollection>();
-					list.add(c);
-					byte[] encoded = FileListManager.encode_basic(new FileList(list), false);
-
-					final OSF2FTextSearchResp resp = new OSF2FTextSearchResp(OSF2FMessage.CURRENT_VERSION, OSF2FMessage.FILE_LIST_TYPE_PARTIAL, msg.getSearchID(), channelId, encoded);
-					int delay = overlayManager.getSearchDelayForInfohash(source.getRemoteFriend(), c.getUniqueIdBytes());
-					delayedExecutionTasks.add(new DelayedExecutionEntry(time + delay, 0, new TimerTask() {
-						@Override
-						public void run() {
-							/*
-							 * check if the search got canceled while we were
-							 * sleeping
-							 */
-							if (!isSearchCanceled(msg.getSearchID())) {
-								source.sendTextSearchResp(resp, false);
-							}
-						}
-					}));
-				}
-				delayedExecutor.queue(delayedExecutionTasks);
-
-			} else {
-				// not enough capacity :-(
-				shouldForward = false;
-			}
-		}
-
-		return shouldForward;
-	}
-
-	public void sendDirectedHashSearch(FriendConnection target, byte[] infoHash) {
-
-		long metainfohashhash = filelistManager.getInfoHashhash(infoHash);
-
-		int newSearchId = 0;
-		while (newSearchId == 0) {
-			newSearchId = random.nextInt();
-		}
-		OSF2FHashSearch search = new OSF2FHashSearch(OSF2FMessage.CURRENT_VERSION, newSearchId, metainfohashhash);
-		lock.lock();
-		try {
-			sentSearches.put(newSearchId, new SentSearch(search));
-		} finally {
-			lock.unlock();
-		}
-		overlayManager.sendDirectedSearch(target, search);
-
-	}
-
-	public long getInfoHashHashFromSearchId(int searchId) {
-		lock.lock();
-		try {
-			SentSearch sentSearch = sentSearches.get(searchId);
-			if (sentSearch != null && sentSearch.search instanceof OSF2FHashSearch) {
-				return ((OSF2FHashSearch) sentSearch.search).getInfohashhash();
-			}
-		} finally {
-			lock.unlock();
-		}
-		return -1;
-	}
-
-	public void sendHashSearch(byte[] infoHash) {
-		long metainfohashhash = filelistManager.getInfoHashhash(infoHash);
-
-		int newSearchId = 0;
-		while (newSearchId == 0) {
-			newSearchId = random.nextInt();
-		}
-		OSF2FSearch search = new OSF2FHashSearch(OSF2FMessage.CURRENT_VERSION, newSearchId, metainfohashhash);
-
-		// these should go in the slow (forward) path so to route around slow
-		// nodes
-		sendSearch(newSearchId, search, false);
-	}
-
-	private void sendSearch(int newSearchId, OSF2FSearch search, boolean skipQueue) {
-		lock.lock();
-		try {
-			sentSearches.put(newSearchId, new SentSearch(search));
-		} finally {
-			lock.unlock();
-		}
-		overlayManager.sendSearchOrCancel(search, skipQueue, false);
-	}
-
-	public int sendTextSearch(String searchString, TextSearchListener listener) {
-		int newSearchId = 0;
-		while (newSearchId == 0) {
-			newSearchId = random.nextInt();
-		}
-
-		if (FileCollection.containsKeyword(searchString)) {
-			searchString = searchString.replaceAll("":"", "";"");
-			searchString = handleKeyWords(searchString);
-		}
-
-		OSF2FSearch search = new OSF2FTextSearch(OSF2FMessage.CURRENT_VERSION, OSF2FMessage.FILE_LIST_TYPE_PARTIAL, newSearchId, searchString);
-		textSearchManager.sentSearch(newSearchId, searchString, listener);
-		sendSearch(newSearchId, search, false);
-		return newSearchId;
-	}
-
-	private static String handleKeyWords(String searchString) {
-		searchString = FileCollection.removeWhiteSpaceAfteKeyChars(searchString);
-		String[] interestingKeyWords = new String[] { ""id"", ""sha1"", ""ed2k"" };
-		int[] interestingKeyWordExectedKeyLen = { 20, 20, 16 };
-		StringBuilder b = new StringBuilder();
-		String[] split = searchString.split("" "");
-		for (String s : split) {
-			// check for id
-			String toAdd = s;
-			for (int i = 0; i < interestingKeyWords.length; i++) {
-				String fromId = convertToBase64(s, interestingKeyWords[i], interestingKeyWordExectedKeyLen[i]);
-				if (fromId != null) {
-					toAdd = fromId;
-				}
-			}
-			b.append(toAdd + "" "");
-			if (!toAdd.equals(s)) {
-				logger.fine(""converted search: "" + s + ""->"" + toAdd);
-			}
-		}
-		return b.toString().trim();
-	}
-
-	private static String convertToBase64(String searchTerm, String _keyword, int expectedBytes) {
-		for (String sep : FileCollection.KEYWORDENDINGS) {
-			String keyword = _keyword + sep;
-			if (searchTerm.contains(keyword)) {
-				logger.finer(""converting base: "" + searchTerm);
-				try {
-					String baseXHash = searchTerm.substring(keyword.length());
-					logger.finer(""basex hash: "" + baseXHash);
-					String hash = ShareManagerTools.baseXtoBase64(baseXHash, expectedBytes);
-					String toAdd = keyword + hash;
-					logger.finer(""new string: "" + toAdd);
-					return toAdd;
-				} catch (UnsupportedEncodingException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}
-		return null;
-	}
-
-	static class DebugChannelIdEntry implements Comparable<DebugChannelIdEntry> {
-		final int count;
-		final String name;
-
-		public DebugChannelIdEntry(String name, int count) {
-			super();
-			this.name = name;
-			this.count = count;
-		}
-
-		public int compareTo(DebugChannelIdEntry o) {
-			if (o.count > count) {
-				return 1;
-			} else if (o.count == count) {
-				return 0;
-			} else {
-				return -1;
-			}
-		}
-	}
-
-	private static class DebugChannelSetupErrorStats {
-		private final LinkedList<FriendConnection.OverlayRegistrationError> errorList = new LinkedList<FriendConnection.OverlayRegistrationError>();
-
-		int MAX_SIZE = 10000;
-
-		public void add(FriendConnection.OverlayRegistrationError error) {
-			lock.lock();
-			try {
-				if (errorList.size() > MAX_SIZE) {
-					errorList.removeLast();
-				}
-				errorList.addFirst(error);
-			} finally {
-				lock.unlock();
-			}
-		}
-
-		public String getDebugStats() {
-			StringBuilder b = new StringBuilder();
-			HashMap<String, Integer> errorsPerFriend = new HashMap<String, Integer>();
-			HashMap<String, Integer> errorsPerPair = new HashMap<String, Integer>();
-			lock.lock();
-			try {
-
-				for (FriendConnection.OverlayRegistrationError error : errorList) {
-					final String s = error.setupMessageSource;
-					if (!errorsPerFriend.containsKey(s)) {
-						errorsPerFriend.put(s, 0);
-					}
-					errorsPerFriend.put(s, errorsPerFriend.get(s) + 1);
-
-					String d = error.direction;
-					if (!errorsPerPair.containsKey(d)) {
-						errorsPerPair.put(d, 0);
-					}
-					errorsPerPair.put(d, errorsPerPair.get(d) + 1);
-				}
-
-				ArrayList<DebugChannelIdEntry> friendTotalOrder = new ArrayList<DebugChannelIdEntry>();
-				for (String f : errorsPerFriend.keySet()) {
-					friendTotalOrder.add(new DebugChannelIdEntry(f, errorsPerFriend.get(f)));
-				}
-				Collections.sort(friendTotalOrder);
-				b.append(""by source:\n"");
-				for (DebugChannelIdEntry e : friendTotalOrder) {
-					b.append(""  "" + e.name + "" "" + e.count + ""\n"");
-				}
-
-				ArrayList<DebugChannelIdEntry> byPairOrder = new ArrayList<DebugChannelIdEntry>();
-				for (String f : errorsPerPair.keySet()) {
-					byPairOrder.add(new DebugChannelIdEntry(f, errorsPerPair.get(f)));
-				}
-				Collections.sort(byPairOrder);
-				b.append(""by pair:\n"");
-				for (DebugChannelIdEntry e : byPairOrder) {
-					b.append(""  "" + e.name + "" "" + e.count + ""\n"");
-				}
-
-			} finally {
-				lock.unlock();
-			}
-			return b.toString();
-		}
-	}
-
-	class DelayedSearchQueue {
-
-		long lastSearchesPerSecondLogTime = 0;
-		long lastBytesPerSecondCount = 0;
-		int searchCount = 0;
-
-		private long mDelay;
-		private final LinkedBlockingQueue<DelayedSearchQueueEntry> queue = new LinkedBlockingQueue<DelayedSearchQueueEntry>();
-		private final HashMap<Integer, DelayedSearchQueueEntry> queuedSearches = new HashMap<Integer, DelayedSearchQueueEntry>();
-
-		public DelayedSearchQueue(long delay) {
-			this.mDelay = delay;
-			Thread t = new Thread(new DelayedSearchQueueThread());
-			t.setDaemon(true);
-			t.setName(SEARCH_QUEUE_THREAD_NAME);
-			t.start();
-		}
-
-		/**
-		 * Warning -- changing this won't re-order things already in the queue, so if you add something with
-		 * a much smaller delay than the current head of the queue, it will wait until that's removed before
-		 * sending the new message.
-		 */
-		public void setDelay( long inDelay ) {
-			this.mDelay = inDelay;
-		}
-
-		public void add(FriendConnection source, OSF2FSearch search) {
-
-			if (lastSearchesPerSecondLogTime + 1000 < System.currentTimeMillis()) {
-
-				lock.lock();
-				try {
-					logger.fine(""Searches/sec: "" + searchCount + "" bytes: ""
-							+ lastBytesPerSecondCount + "" searchQueueSize: ""
-							+ queuedSearches.size());
-				} finally {
-					lock.unlock();
-				}
-
-				lastSearchesPerSecondLogTime = System.currentTimeMillis();
-				searchCount = 0;
-				lastBytesPerSecondCount = 0;
-			}
-
-			searchCount++;
-			lastBytesPerSecondCount += FriendConnectionQueue.getMessageLen(search);
-
-			lock.lock();
-			try {
-
-				// Flush the accounting info every 60 seconds
-				if (SearchManager.this.lastSearchAccountingFlush + 60*1000 < System.currentTimeMillis()) {
-					lastSearchAccountingFlush = System.currentTimeMillis();
-					searchesPerFriend.clear();
-				}
-
-				// If the search queue is more than half full, start dropping searches
-				// proportional to how much of the total queue each person is
-				// consuming
-				if (queuedSearches.size() > 0.25 * MAX_SEARCH_QUEUE_LENGTH) {
-					if (searchesPerFriend.containsKey(source.getRemoteFriend())) {
-						int outstanding = searchesPerFriend.get(source.getRemoteFriend()).v;
-
-						// We add a hard limit on the number of searches from any one person.
-						if (outstanding > 0.15 * MAX_SEARCH_QUEUE_LENGTH) {
-							logger.fine(""Dropping due to 25% of total queue consumption "" + source.getRemoteFriend().getNick() + "" "" + outstanding + "" / "" + MAX_SEARCH_QUEUE_LENGTH);
-							return;
-						}
-
-						// In other cases, we drop proportional to the consumption of the overall queue.
-						double acceptProb = (double) outstanding / (double) queuedSearches.size();
-						if (random.nextDouble() < acceptProb) {
-							if (logger.isLoggable(Level.FINE)) {
-								logger.fine(""*** RED for search from "" + source + "" outstanding: ""
-										+ outstanding + "" total: "" + queuedSearches.size());
-							}
-							return;
-						}
-					}
-				}
-
-				if (queuedSearches.size() > MAX_SEARCH_QUEUE_LENGTH) {
-					if (logger.isLoggable(Level.FINER)) {
-						logger.finer(""not forwarding search, queue length too large. id: ""
-								+ search.getSearchID());
-					}
-					return;
-				}
-				if (!queuedSearches.containsKey(search.getSearchID())) {
-					logger.finest(""adding search to forward queue, will forward in "" + mDelay
-							+ "" ms"");
-					DelayedSearchQueueEntry entry = new DelayedSearchQueueEntry(search, source,
-							System.currentTimeMillis() + mDelay);
-
-					if (searchesPerFriend.containsKey(source.getRemoteFriend()) == false) {
-						searchesPerFriend.put(source.getRemoteFriend(), new SearchManager.MutableInteger());
-					}
-					searchesPerFriend.get(source.getRemoteFriend()).v++;
-					logger.finest(""Search for friend: "" + source.getRemoteFriend().getNick() + "" ""
-							+ searchesPerFriend.get(source.getRemoteFriend()).v);
-
-					queuedSearches.put(search.getSearchID(), entry);
-					queue.add(entry);
-
-				} else {
-					logger.finer(""search already in queue, not adding"");
-				}
-			} finally {
-				lock.unlock();
-			}
-		}
-
-		/*
-		 * make sure to already have the lock when calling this
-		 */
-		public boolean isQueued(OSF2FSearch search) {
-			return queuedSearches.containsKey(search.getSearchID());
-		}
-
-		class DelayedSearchQueueThread implements Runnable {
-
-			public void run() {
-				while (true) {
-					try {
-						DelayedSearchQueueEntry e = queue.take();
-						long timeUntilSend = e.dontSendBefore - System.currentTimeMillis();
-						if (timeUntilSend > 0) {
-							logger.finer(""got search ("" + e.search.getDescription() + "") to forward, waiting "" + timeUntilSend + "" ms until sending"");
-							Thread.sleep(timeUntilSend);
-						}
-						forwardSearch(e.source, e.search);
-						/*
-						 * remove the search from the queuedSearchesMap
-						 */
-						lock.lock();
-						try {
-							queuedSearches.remove(e.search.getSearchID());
-							// If searchesPerFriend was flushed while this search was in the
-							// queue, the get() call will return null.
-							if (searchesPerFriend.containsKey(e.source.getRemoteFriend())) {
-								searchesPerFriend.get(e.source.getRemoteFriend()).v--;
-							}
-						} finally {
-							lock.unlock();
-						}
-						/*
-						 * if we didn't sleep at all, sleep the min time between
-						 * searches
-						 */
-						if (timeUntilSend < 1) {
-							double ms = 1000.0 / FriendConnection.MAX_OUTGOING_SEARCH_RATE;
-							int msFloor = (int) Math.floor(ms);
-							int nanosLeft = (int) Math.round((ms - msFloor) * 1000000.0);
-							logger.finest(""sleeping "" + msFloor + ""ms + "" + nanosLeft + "" ns"");
-							Thread.sleep(msFloor, Math.min(999999, nanosLeft));
-						}
-
-					} catch (Exception e1) {
-						logger.warning(""*** Delayed search queue thread error: "" + e1.toString());
-						e1.printStackTrace();
-						BackendErrorLog.get().logException(e1);
-					}
-				}
-			}
-		}
-	}
-
-	static class DelayedSearchQueueEntry {
-		final long dontSendBefore;
-		final OSF2FSearch search;
-		final FriendConnection source;
-		final long insertionTime;
-
-		public DelayedSearchQueueEntry(OSF2FSearch search, FriendConnection source, long dontSendBefore) {
-			this.insertionTime = System.currentTimeMillis();
-			this.search = search;
-			this.source = source;
-			this.dontSendBefore = dontSendBefore;
-		}
-	}
-
-	class ForwardedSearch {
-		private int responsesForwarded = 0;
-		private final OSF2FSearch search;
-		private final FriendConnection source;
-		private final long time;
-
-		public ForwardedSearch(FriendConnection source, OSF2FSearch search) {
-			this.time = System.currentTimeMillis();
-			this.source = source;
-			this.search = search;
-
-		}
-
-		public long getAge() {
-			return System.currentTimeMillis() - this.time;
-		}
-
-		public int getResponseNum() {
-			return responsesForwarded;
-		}
-
-		public OSF2FSearch getSearch() {
-			return search;
-		}
-
-		public int getSearchId() {
-			return search.getSearchID();
-		}
-
-		public FriendConnection getSource() {
-			return source;
-		}
-
-		public void gotResponse() {
-			responsesForwarded++;
-		}
-
-		public boolean isTimedOut() {
-			return getAge() > MAX_SEARCH_AGE;
-		}
-	}
-
-	static class RotatingBloomFilter {
-		private static final int OBJECTS_TO_STORE = 1000000;
-
-		private static final int SIZE_IN_BITS = 10240 * 1024;
-
-		private long currentFilterCreated;
-		private final LinkedList<BloomFilter> filters = new LinkedList<BloomFilter>();
-		private final int maxBuckets;
-		private final long maxFilterAge;
-
-		public RotatingBloomFilter(long totalAge, int buckets) {
-			this.maxBuckets = buckets;
-			this.maxFilterAge = (totalAge / buckets) + 1;
-			rotate();
-		}
-
-		public boolean contains(int searchId, int searchValue) {
-			byte[] bytes = bytesFromInts(searchId, searchValue);
-			for (BloomFilter f : filters) {
-				if (f.test(bytes)) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		public double getPrevFilterFalsePositiveEst() {
-			if (filters.size() > 1) {
-				return filters.get(1).getPredictedFalsePositiveRate();
-			} else {
-				return filters.getFirst().getPredictedFalsePositiveRate();
-			}
-		}
-
-		public int getPrevFilterNumElements() {
-			if (filters.size() > 1) {
-				return filters.get(1).getUniqueObjectsStored();
-			} else {
-				return filters.getFirst().getUniqueObjectsStored();
-			}
-		}
-
-		public void insert(int searchId, int searchValue) {
-			byte[] bytes = bytesFromInts(searchId, searchValue);
-			filters.getFirst().insert(bytes);
-		}
-
-		private void rotate() {
-
-			if (filters.size() > 0) {
-				BloomFilter prevFilter = filters.getFirst();
-				String str = ""Rotating bloom filter: objects="" + prevFilter.getUniqueObjectsStored() + "" predicted false positive rate="" + (100 * prevFilter.getPredictedFalsePositiveRate() + ""%"");
-				logger.info(str);
-			}
-			currentFilterCreated = System.currentTimeMillis();
-			try {
-				filters.addFirst(new BloomFilter(SIZE_IN_BITS, OBJECTS_TO_STORE));
-			} catch (NoSuchAlgorithmException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			if (filters.size() > maxBuckets) {
-				filters.removeLast();
-			}
-		}
-
-		public boolean rotateIfNeeded() {
-			long currentFilterAge = System.currentTimeMillis() - currentFilterCreated;
-			if (currentFilterAge > maxFilterAge) {
-				rotate();
-				return true;
-			}
-			return false;
-		}
-
-		private static byte[] bytesFromInts(int int1, int int2) {
-			byte[] bytes = new byte[8];
-
-			bytes[0] = (byte) (int1 >>> 24);
-			bytes[1] = (byte) (int1 >>> 16);
-			bytes[2] = (byte) (int1 >>> 8);
-			bytes[3] = (byte) int1;
-
-			bytes[4] = (byte) (int2 >>> 24);
-			bytes[5] = (byte) (int2 >>> 16);
-			bytes[6] = (byte) (int2 >>> 8);
-			bytes[7] = (byte) int2;
-			return bytes;
-		}
-
-		public static void main(String[] args) {
-			OSF2FMain.getSingelton();
-			logger.setLevel(Level.FINE);
-			Random rand = new Random();
-
-			RotatingBloomFilter bf = new RotatingBloomFilter(60 * 1000, 4);
-
-			Set<String> inserts = new HashSet<String>();
-			for (int j = 0; j < 8; j++) {
-				for (int i = 0; i < 20000; i++) {
-					int r1 = rand.nextInt();
-					int r2 = rand.nextInt();
-					byte[] bytes = bytesFromInts(r1, r2);
-					inserts.add(new String(Base64.encode(bytes)));
-					bf.insert(r1, r2);
-					if (!bf.contains(r1, r2)) {
-						System.err.println(""insert failes (does not contain it anymore)"");
-					}
-				}
-				bf.rotate();
-			}
-
-			int fps = 0, to_check = 200000;
-			for (int i = 0; i < to_check; i++) {
-				int int1;
-				int int2;
-				byte[] bytes;
-				do {
-					int1 = rand.nextInt();
-					int2 = rand.nextInt();
-					bytes = bytesFromInts(int1, int2);
-				} while (inserts.contains(new String(Base64.encode(bytes))) == true);
-				if (bf.contains(int1, int2) == true)
-					fps++;
-			}
-
-			System.out.println(""false positive check, "" + fps + ""/"" + to_check);
-
-			System.out.println(""mem: "" + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
-
-		}
-
-	}
-
-	class SentSearch {
-		private int responses = 0;
-		private final OSF2FSearch search;
-
-		private final long time;
-
-		public SentSearch(OSF2FSearch search) {
-			this.search = search;
-			this.time = System.currentTimeMillis();
-		}
-
-		public long getAge() {
-			return System.currentTimeMillis() - this.time;
-		}
-
-		public int getResponseNum() {
-			return responses;
-		}
-
-		public OSF2FSearch getSearch() {
-			return search;
-		}
-
-		public void gotResponse() {
-			responses++;
-		}
-
-		public boolean isTimedOut() {
-			return getAge() > MAX_SEARCH_AGE;
-		}
-
-	}
-
-	public interface TextSearchListener {
-		public void searchResponseReceived(TextSearchResponseItem r);
-	}
-
-	class TextSearchManager {
-		private final ConcurrentHashMap<Integer, TextSearchResponse> responses;
-		private final ConcurrentHashMap<Integer, TextSearchListener> listeners;
-
-		public TextSearchManager() {
-			responses = new ConcurrentHashMap<Integer, TextSearchResponse>();
-			listeners = new ConcurrentHashMap<Integer, TextSearchListener>();
-		}
-
-		public List<TextSearchResult> getResults(int searchId) {
-			TextSearchResponse resps = responses.get(searchId);
-
-			HashMap<String, TextSearchResult> result = new HashMap<String, TextSearchResult>();
-
-			if (resps != null) {
-				/*
-				 * group into file collections
-				 */
-				for (TextSearchResponseItem item : resps.getItems()) {
-					for (FileCollection collection : item.getFileList().getElements()) {
-						if (result.containsKey(collection.getUniqueID())) {
-							TextSearchResult existing = result.get(collection.getUniqueID());
-							existing.merge(item, collection);
-						} else {
-							// mark stuff that we already have
-							boolean alreadyInLibrary = true;
-							GlobalManager globalManager = AzureusCoreImpl.getSingleton().getGlobalManager();
-							DownloadManager dm = globalManager.getDownloadManager(new HashWrapper(collection.getUniqueIdBytes()));
-							if (dm == null) {
-								alreadyInLibrary = false;
-							}
-							result.put(collection.getUniqueID(), new TextSearchResult(item, collection, alreadyInLibrary));
-						}
-					}
-				}
-
-				// /*
-				// * verify that we didn't get any bad data
-				// */
-				// for (TextSearchResult item : result.values()) {
-				// FileCollection collection = item.getCollection();
-				// String searchString = resps.getSearchString();
-				// boolean collectionMatch = collection.nameMatch(searchString);
-				//
-				// Set<FileListFile> filteredFiles = new
-				// HashSet<FileListFile>();
-				// List<FileListFile> allChildren = collection.getChildren();
-				// for (int i = 0; i < allChildren.size(); i++) {
-				// FileListFile f = allChildren.get(i);
-				// if (filteredFiles.contains(f)) {
-				// continue;
-				// }
-				// if (collectionMatch) {
-				// filteredFiles.add(f);
-				// } else if (f.searchMatch(searchString)) {
-				// filteredFiles.add(f);
-				// } else {
-				// logger.fine(""got search result that doesn't match search: "" +
-				// f.getFileName() + "" ! "" + searchString);
-				// }
-				// }
-				// logger.fine(collection.getName() + "" totalResp: "" +
-				// allChildren.size() + "" afterFiler="" + filteredFiles.size());
-				// collection.setChildren(new
-				// ArrayList<FileListFile>(filteredFiles));
-				// }
-
-				return new ArrayList<TextSearchResult>(result.values());
-			}
-			logger.fine(""no responses for searchId="" + searchId);
-			return new ArrayList<TextSearchResult>();
-		}
-
-		public void gotSearchResponse(int searchId, Friend throughFriend, FileList fileList, int channelId, int connectionId) {
-			TextSearchResponse r = responses.get(searchId);
-			if (r != null) {
-				long age = System.currentTimeMillis() - r.getTime();
-				TextSearchResponseItem item = new TextSearchResponseItem(throughFriend, fileList, age, channelId, connectionId);
-				r.add(item);
-				TextSearchListener listener = listeners.get(searchId);
-				if (listener != null) {
-					listener.searchResponseReceived(item);
-				}
-			} else {
-				logger.warning(""got response for unknown search"");
-			}
-		}
-
-		public void sentSearch(int searchId, String searchString, TextSearchListener listener) {
-			responses.put(searchId, new TextSearchResponse(searchString));
-			if (listener != null) {
-				listeners.put(searchId, listener);
-			}
-		}
-
-		public void clearOldResponses() {
-			for (Iterator<Integer> iterator = responses.keySet().iterator(); iterator.hasNext();) {
-				Integer key = iterator.next();
-				TextSearchResponse response = responses.get(key);
-				if (System.currentTimeMillis() - response.getTime() > 10 * 60 * 1000) {
-					iterator.remove();
-					listeners.remove(key);
-				}
-
-			}
-		}
-	}
-
-	public boolean isSearchInBloomFilter(OSF2FSearch search) {
-		lock.lock();
-		try {
-			int searchID = search.getSearchID();
-			int valueID = search.getValueID();
-			if (recentSearches.contains(searchID, valueID)) {
-				bloomSearchesBlockedCurr++;
-			}
-		} finally {
-			lock.unlock();
-		}
-		return false;
-	}
+    public static final String SEARCH_QUEUE_THREAD_NAME = ""DelayedSearchQueue"";
+
+    private final static BigFatLock lock = OverlayManager.lock;
+    private static Logger logger = Logger.getLogger(SearchManager.class.getName());
+    // search sources are remembered for 1 minute, any replies after this will
+    // be dropped
+    public static final long MAX_SEARCH_AGE = 60 * 1000;
+    public static final int MAX_SEARCH_QUEUE_LENGTH = 100;
+    // private static final int MAX_SEARCH_RESP_BEFORE_CANCEL =
+    // COConfigurationManager.getIntParameter(""f2f_search_max_paths"");
+
+    protected int mMaxSearchResponsesBeforeCancel = COConfigurationManager
+            .getIntParameter(""f2f_search_max_paths"");
+
+    // don't respond if average torrent upload rate is less than 10K/s
+    private static final double NO_RESPONSE_TORRENT_AVERAGE_RATE = 10000;
+
+    private static final double NO_RESPONSE_TOTAL_FRAC_OF_MAX_UPLOAD = 0.9;
+
+    private static final double NO_RESPONSE_TRANSPORT_FRAC_OF_MAX_UPLOAD = 0.75;
+    /*
+     * this is to avoid searches living forever, search uid are remembered for
+     * 45min-1h, there are 4 bloom filter buckets that are rotating, each one
+     * containing 15minutes worth of searches
+     */
+    private static final int RECENT_SEARCH_BUCKETS = 4;
+
+    private static final long RECENT_SEARCH_MEMORY = 20 * 60 * 1000;
+    // static final int SEARCH_DELAY =
+    // COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+    protected int mSearchDelay = COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+
+    /**
+     * This Map is protected by the BigFatLock: lock. We use this to drop
+     * searches from friends that are crowding the outgoing search queue early,
+     * thus allowing friends that send searches more rarely to get through.
+     * 
+     * This map is emptied once every 60 seconds to deal with accounting errors
+     * that may accumulate.
+     */
+    class MutableInteger {
+        public int v = 0;
+    }
+
+    long lastSearchAccountingFlush = System.currentTimeMillis();
+    private final Map<Friend, MutableInteger> searchesPerFriend = new HashMap<Friend, MutableInteger>();
+
+    private int bloomSearchesBlockedCurr = 0;
+
+    private int bloomSearchesBlockedPrev = 0;
+    private int bloomSearchesSentCurr = 0;
+    private int bloomSearchesSentPrev = 0;
+
+    private final HashMap<Integer, Long> canceledSearches;
+    private final DebugChannelSetupErrorStats debugChannelIdErrorSetupErrorStats = new DebugChannelSetupErrorStats();
+
+    private final DelayedSearchQueue delayedSearchQueue;
+
+    // private final DeterministicDelayResponseQueue delayedResponseQueue;
+
+    private final FileListManager filelistManager;
+
+    private final HashMap<Integer, ForwardedSearch> forwardedSearches;
+    private int forwardedSearchNum = 0;
+    private List<Integer> hashSearchStats = new LinkedList<Integer>();
+
+    private boolean includeLanUploads;
+    private final double NO_FORWARD_FRAC_OF_MAX_UPLOAD = 0.9;
+    private final OverlayManager overlayManager;
+
+    private final Random random = new Random();
+    private final RandomnessManager randomnessManager;
+
+    private int rateLimitInKBps;
+
+    private final RotatingBloomFilter recentSearches;
+    private final HashMap<Integer, SentSearch> sentSearches;
+    private final GlobalManagerStats stats;
+    private final TextSearchManager textSearchManager;
+
+    private List<Integer> textSearchStats = new LinkedList<Integer>();
+
+    private final DelayedExecutor delayedExecutor;
+
+    private String[] filteredKeywords = new String[0];
+
+    public SearchManager(OverlayManager overlayManager, FileListManager filelistManager,
+            RandomnessManager randomnessManager, GlobalManagerStats stats) {
+        this.stats = stats;
+        this.delayedExecutor = DelayedExecutorService.getInstance().getVariableDelayExecutor();
+        // this.delayedResponseQueue = new DeterministicDelayResponseQueue();
+        this.overlayManager = overlayManager;
+        this.sentSearches = new HashMap<Integer, SentSearch>();
+        this.forwardedSearches = new HashMap<Integer, ForwardedSearch>();
+        this.canceledSearches = new HashMap<Integer, Long>();
+        this.filelistManager = filelistManager;
+        this.randomnessManager = randomnessManager;
+        this.textSearchManager = new TextSearchManager();
+        this.recentSearches = new RotatingBloomFilter(RECENT_SEARCH_MEMORY, RECENT_SEARCH_BUCKETS);
+        this.delayedSearchQueue = new DelayedSearchQueue(mSearchDelay);
+        COConfigurationManager.addAndFireParameterListeners(new String[] { ""LAN Speed Enabled"",
+                ""Max Upload Speed KBs"", ""oneswarm.search.filter.keywords"", ""f2f_search_max_paths"",
+                ""f2f_search_forward_delay"" }, new ParameterListener() {
+            public void parameterChanged(String parameterName) {
+                includeLanUploads = !COConfigurationManager
+                        .getBooleanParameter(""LAN Speed Enabled"");
+                rateLimitInKBps = COConfigurationManager.getIntParameter(""Max Upload Speed KBs"");
+
+                StringList keywords = COConfigurationManager
+                        .getStringListParameter(""oneswarm.search.filter.keywords"");
+                if (keywords != null) {
+                    String[] neu = new String[keywords.size()];
+                    for (int i = 0; i < keywords.size(); i++) {
+                        String firstTok = (new StringTokenizer(keywords.get(i))).nextToken();
+                        neu[i] = firstTok;
+                    }
+                    filteredKeywords = neu;
+                    logger.fine(""Updated filtered keywords "" + keywords.size());
+                }
+
+                mMaxSearchResponsesBeforeCancel = COConfigurationManager
+                        .getIntParameter(""f2f_search_max_paths"");
+
+                mSearchDelay = COConfigurationManager.getIntParameter(""f2f_search_forward_delay"");
+                delayedSearchQueue.setDelay(mSearchDelay);
+            }
+        });
+    }
+
+    private boolean canForwardSearch() {
+        double util = fracUpload();
+        if (util == -1 || util < NO_FORWARD_FRAC_OF_MAX_UPLOAD) {
+            return true;
+        } else {
+            logger.finest(""not forwarding search (overloaded, util="" + util + "")"");
+            return false;
+        }
+    }
+
+    private boolean canRespondToSearch() {
+        double totalUtil = fracUpload();
+        if (totalUtil == -1) {
+            return true;
+        }
+        // ok, check if we are using more than 90% of total
+        if (totalUtil < NO_RESPONSE_TOTAL_FRAC_OF_MAX_UPLOAD) {
+            return true;
+        }
+        double transUtil = fracTransportUpload();
+        // check if we are using more than 75% for transports
+        if (transUtil < NO_RESPONSE_TRANSPORT_FRAC_OF_MAX_UPLOAD) {
+            return true;
+        }
+
+        double torrentAvgSpeed = getAverageUploadPerRunningTorrent();
+        if (torrentAvgSpeed == -1) {
+            return true;
+        }
+        if (torrentAvgSpeed > NO_RESPONSE_TORRENT_AVERAGE_RATE) {
+            return true;
+        }
+        if (logger.isLoggable(Level.FINER)) {
+            logger.finer(""not responding to search (overloaded, util="" + transUtil + "")"");
+        }
+        return false;
+    }
+
+    public void clearTimedOutSearches() {
+        lock.lock();
+        try {
+            /*
+             * check if we need to rotate the bloom filter of recent searches
+             */
+            boolean rotated = recentSearches.rotateIfNeeded();
+            if (rotated) {
+                bloomSearchesBlockedPrev = bloomSearchesBlockedCurr;
+                bloomSearchesBlockedCurr = 0;
+                bloomSearchesSentPrev = bloomSearchesSentCurr;
+                bloomSearchesSentCurr = 0;
+            }
+
+            for (Iterator<ForwardedSearch> iterator = forwardedSearches.values().iterator(); iterator
+                    .hasNext();) {
+                ForwardedSearch fs = iterator.next();
+                if (fs.isTimedOut()) {
+                    iterator.remove();
+                }
+            }
+
+            for (Iterator<SentSearch> iterator = sentSearches.values().iterator(); iterator
+                    .hasNext();) {
+                SentSearch sentSearch = iterator.next();
+                if (sentSearch.isTimedOut()) {
+                    iterator.remove();
+                    if (sentSearch.getSearch() instanceof OSF2FHashSearch) {
+                        hashSearchStats.add(sentSearch.getResponseNum());
+                    } else if (sentSearch.getSearch() instanceof OSF2FTextSearch) {
+                        textSearchStats.add(sentSearch.getResponseNum());
+                    }
+                }
+            }
+
+            /*
+             * Delete any expired canceled searches
+             */
+            LinkedList<Integer> toDelete = new LinkedList<Integer>();
+            for (Integer key : canceledSearches.keySet()) {
+                long age = System.currentTimeMillis() - canceledSearches.get(key);
+                if (age > MAX_SEARCH_AGE) {
+                    toDelete.add(key);
+                }
+            }
+
+            for (Integer key : toDelete) {
+                canceledSearches.remove(key);
+            }
+
+            textSearchManager.clearOldResponses();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public List<String> debugCanceledSearches() {
+        List<String> l = new LinkedList<String>();
+        lock.lock();
+        try {
+            for (Integer s : canceledSearches.keySet()) {
+                l.add(""search="" + Integer.toHexString(s) + "" age=""
+                        + ((System.currentTimeMillis() - canceledSearches.get(s)) / 1000) + ""s"");
+            }
+        } finally {
+            lock.unlock();
+        }
+        return l;
+    }
+
+    public List<String> debugForwardedSearches() {
+        List<String> l = new LinkedList<String>();
+        lock.lock();
+        try {
+            for (ForwardedSearch f : forwardedSearches.values()) {
+                l.add(""search="" + Integer.toHexString(f.getSearchId()) + "" responses=""
+                        + f.getResponseNum() + "" age="" + (f.getAge() / 1000) + ""s"");
+            }
+        } finally {
+            lock.unlock();
+        }
+        return l;
+    }
+
+    public List<String> debugSentSearches() {
+        List<String> l = new LinkedList<String>();
+        lock.lock();
+        try {
+            for (SentSearch s : sentSearches.values()) {
+                l.add(""search="" + Integer.toHexString(s.getSearch().getSearchID()) + "" responses=""
+                        + s.getResponseNum() + "" age="" + (s.getAge() / 1000) + ""s"");
+            }
+        } finally {
+            lock.unlock();
+        }
+        return l;
+    }
+
+    private void forwardSearch(FriendConnection source, OSF2FSearch search) {
+        lock.lock();
+        try {
+
+            // check if search is canceled or forwarded first
+            int searchID = search.getSearchID();
+            if (forwardedSearches.containsKey(searchID)) {
+                logger.finest(""not forwarding search, already forwarded. id: "" + searchID);
+                return;
+            }
+
+            if (canceledSearches.containsKey(searchID)) {
+                logger.finest(""not forwarding search, cancel received. id: "" + searchID);
+                return;
+            }
+
+            int valueID = search.getValueID();
+            if (recentSearches.contains(searchID, valueID)) {
+                bloomSearchesBlockedCurr++;
+                logger.finest(""not forwarding search, in recent filter. id: "" + searchID);
+                return;
+            }
+            bloomSearchesSentCurr++;
+            forwardedSearchNum++;
+            if (logger.isLoggable(Level.FINEST)) {
+                logger.finest(""forwarding search "" + search.getDescription() + "" id: "" + searchID);
+            }
+            forwardedSearches.put(searchID, new ForwardedSearch(source, search));
+            recentSearches.insert(searchID, valueID);
+        } finally {
+            lock.unlock();
+        }
+
+        overlayManager.forwardSearchOrCancel(source, search.clone());
+    }
+
+    private double fracTransportUpload() {
+
+        if (rateLimitInKBps < 1) {
+            return -1;
+        }
+        long uploadRate = overlayManager.getTransportSendRate(includeLanUploads);
+
+        double util = uploadRate / (rateLimitInKBps * 1024.0);
+        return util;
+    }
+
+    private double fracUpload() {
+
+        if (rateLimitInKBps < 1) {
+            return -1;
+        }
+        long uploadRate;
+        if (!includeLanUploads) {
+            uploadRate = stats.getProtocolSendRateNoLAN() + stats.getDataSendRateNoLAN();
+        } else {
+            uploadRate = stats.getProtocolSendRate() + stats.getDataSendRate();
+        }
+
+        double util = uploadRate / (rateLimitInKBps * 1024.0);
+        return util;
+    }
+
+    public int getAndClearForwardedSearchNum() {
+        lock.lock();
+        try {
+            int ret = forwardedSearchNum;
+            forwardedSearchNum = 0;
+            return ret;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public List<Integer> getAndClearHashSearchStats() {
+        lock.lock();
+        try {
+            List<Integer> ret = hashSearchStats;
+            hashSearchStats = new LinkedList<Integer>();
+            return ret;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public List<Integer> getAndClearTextSearchStats() {
+        lock.lock();
+        try {
+            List<Integer> ret = textSearchStats;
+            textSearchStats = new LinkedList<Integer>();
+            return ret;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @SuppressWarnings(""unchecked"")
+    private double getAverageUploadPerRunningTorrent() {
+        LinkedList<DownloadManager> dms = new LinkedList<DownloadManager>();
+        final List<DownloadManager> downloadManagers = AzureusCoreImpl.getSingleton()
+                .getGlobalManager().getDownloadManagers();
+        dms.addAll(downloadManagers);
+
+        long total = 0;
+        int num = 0;
+
+        for (DownloadManager dm : dms) {
+            final DownloadManagerStats s = dm.getStats();
+            if (s == null) {
+                continue;
+            }
+            final PEPeerManager p = dm.getPeerManager();
+            if (p == null) {
+                continue;
+            }
+
+            if (p.getNbPeers() == 0 && p.getNbSeeds() == 0) {
+                continue;
+            }
+
+            long uploadRate = s.getDataSendRate() + s.getProtocolSendRate();
+            total += uploadRate;
+            num++;
+        }
+        if (num == 0) {
+            return -1;
+        }
+
+        return ((double) total) / num;
+
+    }
+
+    public String getSearchDebug() {
+        StringBuilder b = new StringBuilder();
+        b.append(""total_frac="" + fracUpload() + ""\ntransport_frac="" + fracTransportUpload()
+                + ""\ntorrent_avg="" + getAverageUploadPerRunningTorrent());
+        b.append(""\ncan forward="" + canForwardSearch());
+        b.append(""\ncan respond="" + canRespondToSearch());
+
+        b.append(""\n\nforwarded searches size="" + forwardedSearches.size() + "" canceled size=""
+                + canceledSearches.size() + "" sent size="" + sentSearches.size());
+        b.append(""\nbloom: stored="" + recentSearches.getPrevFilterNumElements()
+                + "" est false positives=""
+                + (100 * recentSearches.getPrevFilterFalsePositiveEst() + ""%""));
+        b.append(""\nbloom blocked|sent curr="" + bloomSearchesBlockedCurr + ""|""
+                + bloomSearchesSentCurr + "" prev="" + bloomSearchesBlockedPrev + ""|""
+                + bloomSearchesSentPrev);
+        b.append(""\n\n"" + debugChannelIdErrorSetupErrorStats.getDebugStats());
+
+        long sum = 0, now = System.currentTimeMillis(), count = 0;
+
+        // Include per-friend queue stats
+        lock.lock();
+        try {
+            Map<String, MutableInteger> counts = new HashMap<String, MutableInteger>();
+            for (DelayedSearchQueueEntry e : delayedSearchQueue.queuedSearches.values()) {
+
+                count++;
+                sum += (now - e.insertionTime);
+
+                String nick = e.source.getRemoteFriend().getNick();
+                if (counts.containsKey(nick) == false) {
+                    counts.put(nick, new MutableInteger());
+                }
+                counts.get(nick).v++;
+            }
+            for (String nick : counts.keySet()) {
+                b.append(""\n\t"" + nick + "" -> "" + counts.get(nick).v);
+            }
+            b.append(""\n\nQueue size: "" + delayedSearchQueue.queuedSearches.size());
+        } finally {
+            lock.unlock();
+        }
+
+        b.append(""\nAverage queued search delay: "" + (double) sum / (double) count);
+
+        return b.toString();
+    }
+
+    public List<TextSearchResult> getSearchResult(int searchId) {
+        return textSearchManager.getResults(searchId);
+    }
+
+    private boolean handleHashSearch(final FriendConnection source, final OSF2FHashSearch msg) {
+
+        // we might actually have this data
+        final byte[] infohash = filelistManager.getMetainfoHash(msg.getInfohashhash());
+
+        // Check if this is a service
+        SharedService service = ServiceSharingManager.getInstance().handleSearch(msg);
+        if (service != null) {
+            try {
+                // TODO: support artificial delays and merge with normal search
+                // handling code
+                final int newChannelId = random.nextInt();
+                final int transportFakePathId = random.nextInt();
+                final int pathID = randomnessManager.getDeterministicRandomInt((int) msg
+                        .getInfohashhash());
+                final OSF2FHashSearchResp response = new OSF2FHashSearchResp(
+                        OSF2FMessage.CURRENT_VERSION, msg.getSearchID(), newChannelId, pathID);
+
+                ServiceConnection conn = new ServiceConnection(service, source, newChannelId,
+                        transportFakePathId, true);
+                // register it with the friendConnection
+                source.registerOverlayTransport(conn);
+                // send the channel setup message
+                source.sendChannelSetup(response, false);
+            } catch (OverlayRegistrationError e) {
+                Debug.out(""got an error when registering incoming transport to '""
+                        + source.getRemoteFriend().getNick() + ""': "" + e.message);
+            }
+            return false;
+        } else if (infohash != null) {
+            DownloadManager dm = AzureusCoreImpl.getSingleton().getGlobalManager()
+                    .getDownloadManager(new HashWrapper(infohash));
+
+            if (dm != null) {
+                logger.fine(""found match: "" + new String(Base64.encode(infohash)));
+
+                // check if the torrent allow osf2f search peers
+                boolean allowed = OverlayTransport.checkOSF2FAllowed(dm.getDownloadState()
+                        .getPeerSources(), dm.getDownloadState().getNetworks());
+                if (!allowed) {
+                    logger.warning(""got search match for torrent ""
+                            + ""that does not allow osf2f peers"");
+                    return true;
+                }
+
+                boolean completedOrDownloading = FileListManager.completedOrDownloading(dm);
+                if (!completedOrDownloading) {
+                    return true;
+                }
+
+                // check if we have the capacity to respond
+                if (canRespondToSearch() == false) {
+                    return false;
+                }
+
+                // yeah, we actually have this stuff and we have spare capacity
+                // create an overlay transport
+                final int newChannelId = random.nextInt();
+                final int transportFakePathId = random.nextInt();
+                // set the path id for the overlay transport for something
+                // random (since otherwise all transports for this infohash will
+                // get the same pathid, which will limit it to be only one. The
+                // path id set in the channel setup message will be
+                // deterministic. It is the responsibility of the source to
+                // monitor for duplicate paths
+
+                // set the path id to something that will persist between
+                // searches, for example a deterministic random seeded with
+                // the infohashhash
+                final int pathID = randomnessManager.getDeterministicRandomInt((int) msg
+                        .getInfohashhash());
+
+                // get the delay for this overlaytranport, that is the latency
+                // component of the delay
+                final int overlayDelay = overlayManager.getLatencyDelayForInfohash(
+                        source.getRemoteFriend(), infohash);
+
+                TimerTask task = new TimerTask() {
+                    @Override
+                    public void run() {
+                        try {
+                            /*
+                             * check if the search got canceled while we were
+                             * sleeping
+                             */
+                            if (!isSearchCanceled(msg.getSearchID())) {
+                                final OSF2FHashSearchResp response = new OSF2FHashSearchResp(
+                                        OSF2FMessage.CURRENT_VERSION, msg.getSearchID(),
+                                        newChannelId, pathID);
+
+                                final OverlayTransport transp = new OverlayTransport(source,
+                                        newChannelId, infohash, transportFakePathId, false,
+                                        overlayDelay);
+                                // register it with the friendConnection
+                                source.registerOverlayTransport(transp);
+                                // send the channel setup message
+                                source.sendChannelSetup(response, false);
+                            }
+                        } catch (OverlayRegistrationError e) {
+                            Debug.out(""got an error when registering incoming transport to '""
+                                    + source.getRemoteFriend().getNick() + ""': "" + e.message);
+                        }
+                    }
+
+                };
+                delayedExecutor.queue(overlayDelay, task);
+
+                // we are still forwarding if there are files in the torrent
+                // that we chose not to download
+                DiskManagerFileInfo[] diskManagerFileInfo = dm.getDiskManagerFileInfo();
+                for (DiskManagerFileInfo d : diskManagerFileInfo) {
+                    if (d.isSkipped()) {
+                        return true;
+                    }
+                }
+                /*
+                 * ok, we shouldn't forward this, already sent a hash response
+                 * and we have/are downloading all the files
+                 */
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private boolean isSearchCanceled(int searchId) {
+        boolean canceled = false;
+        lock.lock();
+        try {
+            if (canceledSearches.containsKey(searchId)) {
+                canceled = true;
+            }
+        } finally {
+            lock.unlock();
+        }
+        return canceled;
+    }
+
+    /**
+     * Returns the probability of rejecting a search from this friend given the
+     * share of the overall queue
+     */
+    public double getFriendSearchDropProbability(Friend inFriend) {
+
+        lock.lock();
+        try {
+
+            // Always accept if we don't have any searches from friend.
+            if (searchesPerFriend.get(inFriend) == null) {
+                return 0;
+            }
+
+            // Reject proportionally to recent rate. Do not admit more than
+            // X/sec.
+            // Also, proportional to processing queue size.
+            double rateBound = delayedSearchQueue.searchCount / 80.0;
+            double queueBound = (double) delayedSearchQueue.queuedSearches.size()
+                    / (double) MAX_SEARCH_QUEUE_LENGTH;
+
+            return Math.max(rateBound, queueBound);
+
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private void handleIncomingHashSearchResponse(OSF2FHashSearch hashSearch,
+            FriendConnection source, OSF2FHashSearchResp msg) {
+        // great, we found someone that has what we searched for!
+        // create the overlay transport
+        byte[] infoHash = filelistManager.getMetainfoHash(hashSearch.getInfohashhash());
+        if (infoHash == null) {
+            logger.warning(""got channel setup request, "" + ""but the infohash we searched for ""
+                    + ""is not in filelistmananger"");
+            return;
+        }
+
+        DownloadManager dm = AzureusCoreImpl.getSingleton().getGlobalManager()
+                .getDownloadManager(new HashWrapper(infoHash));
+        if (dm == null) {
+            logger.warning(""got channel setup request, "" + ""but the downloadmanager is null"");
+            return;
+        }
+
+        if (source.hasRegisteredPath(msg.getPathID())) {
+            logger.finer(""got channel setup response, ""
+                    + ""but path is already used: sending back a reset"");
+            source.sendChannelRst(new OSF2FChannelReset(OSF2FMessage.CURRENT_VERSION, msg
+                    .getChannelID()));
+            return;
+        }
+
+        OverlayTransport overlayTransport = new OverlayTransport(source, msg.getChannelID(),
+                infoHash, msg.getPathID(), true, overlayManager.getLatencyDelayForInfohash(
+                        source.getRemoteFriend(), infoHash));
+        // register it with the friendConnection
+        try {
+            source.registerOverlayTransport(overlayTransport);
+            // safe to start it since we know that the other party is interested
+            overlayTransport.start();
+        } catch (OverlayRegistrationError e) {
+            Debug.out(""got an error when registering outgoing transport: "" + e.message);
+            return;
+        }
+
+    }
+
+    public void handleIncomingSearch(FriendConnection source, OSF2FSearch msg) {
+        lock.lock();
+        try {
+            logger.finest(""got search: "" + msg.getDescription());
+            // first, check if we either sent or forwarded this search before
+            if (forwardedSearches.containsKey(msg.getSearchID())
+                    || sentSearches.containsKey(msg.getSearchID())
+                    || delayedSearchQueue.isQueued(msg)) {
+                return;
+            }
+        } finally {
+            lock.unlock();
+        }
+
+        boolean shouldForward = true;
+        // second, check if we actually can do something about this
+        if (msg instanceof OSF2FHashSearch) {
+            shouldForward = handleHashSearch(source, (OSF2FHashSearch) msg);
+        } else if (msg instanceof OSF2FTextSearch) {
+            shouldForward = handleTextSearch(source, (OSF2FTextSearch) msg);
+        } else {
+            logger.warning(""received unrecgonized search type: "" + msg.getID() + "" / ""
+                    + msg.getClass().getCanonicalName());
+        }
+
+        /*
+         * check if we are at full capacity
+         */
+        if (canForwardSearch() == false) {
+            shouldForward = false;
+        }
+
+        if (shouldForward) {
+            // ok, seems like we should attempt to forward this, put it in
+            // the queue
+            delayedSearchQueue.add(source, msg);
+        }
+
+    }
+
+    public void handleIncomingSearchCancel(FriendConnection source, OSF2FSearchCancel msg) {
+
+        boolean forward = false;
+        lock.lock();
+        try {
+
+            /*
+             * if this is the first time we see the cancel, check if we
+             * forwarded this search, if we did, send a cancel
+             */
+            if (!canceledSearches.containsKey(msg.getSearchID())) {
+                canceledSearches.put(msg.getSearchID(), System.currentTimeMillis());
+                /*
+                 * we only forward the cancel if we already sent the search
+                 */
+                if (forwardedSearches.containsKey(msg.getSearchID())) {
+                    forward = true;
+                } else {
+                    logger.fine(""got search cancel for unknown search id"");
+                }
+            }
+        } finally {
+            lock.unlock();
+        }
+        if (forward) {
+            overlayManager.forwardSearchOrCancel(source, msg);
+        }
+    }
+
+    /**
+     * There are 2 possible explanations for getting a search response, either
+     * we got a response for a search we sent ourselves, or we got a response
+     * for a search we forwarded
+     * 
+     * @param source
+     *            connection from where we got the setup
+     * @param msg
+     *            the channel setup message
+     */
+    public void handleIncomingSearchResponse(FriendConnection source, OSF2FSearchResp msg) {
+        SentSearch sentSearch;
+        lock.lock();
+        try {
+            sentSearch = sentSearches.get(msg.getSearchID());
+        } finally {
+            lock.unlock();
+        }
+        // first, if might be a search we sent
+        if (sentSearch != null) {
+            logger.finest(""got response to search: "" + sentSearch.getSearch().getDescription());
+            OSF2FSearch search = sentSearch.getSearch();
+            // update response stats
+            sentSearch.gotResponse();
+            /*
+             * check if we got enough search responses to cancel this search
+             * 
+             * we will still use the data, even if the search is canceled. I
+             * mean, since it already made it here why not use it...
+             */
+            if (sentSearch.getResponseNum() > mMaxSearchResponsesBeforeCancel) {
+                /*
+                 * only send a cancel message once
+                 */
+                boolean sendCancel = false;
+                lock.lock();
+                try {
+                    if (!canceledSearches.containsKey(msg.getSearchID())) {
+                        canceledSearches.put(msg.getSearchID(), System.currentTimeMillis());
+                        logger.finer(""canceling search "" + msg);
+                        sendCancel = true;
+                    }
+                } finally {
+                    lock.unlock();
+                }
+                if (sendCancel) {
+                    overlayManager.sendSearchOrCancel(new OSF2FSearchCancel(
+                            OSF2FMessage.CURRENT_VERSION, msg.getSearchID()), true, false);
+                }
+            }
+            if (search instanceof OSF2FHashSearch) {
+                // ok, it was a hash search that we sent
+                handleIncomingHashSearchResponse((OSF2FHashSearch) search, source,
+                        (OSF2FHashSearchResp) msg);
+            } else if (search instanceof OSF2FTextSearch) {
+                // this was from a text search we sent
+                FileList fileList;
+                try {
+                    OSF2FTextSearchResp textSearchResp = (OSF2FTextSearchResp) msg;
+                    fileList = FileListManager.decode_basic(textSearchResp.getFileList());
+
+                    textSearchManager.gotSearchResponse(search.getSearchID(),
+                            source.getRemoteFriend(), fileList, textSearchResp.getChannelID(),
+                            source.hashCode());
+
+                    logger.fine(""results so far:"");
+                    List<TextSearchResult> res = getSearchResult(search.getSearchID());
+                    for (TextSearchResult textSearchResult : res) {
+                        logger.fine(textSearchResult.toString());
+                    }
+                } catch (IOException e) {
+                    logger.warning(""got malformed search response"");
+                }
+            } else {
+                logger.warning(""unknown search response type"");
+            }
+        }
+        // sentsearch == null
+        else {
+            // ok, this is for a search we forwarded
+            ForwardedSearch search;
+            lock.lock();
+            try {
+                search = forwardedSearches.get(msg.getSearchID());
+                if (search == null) {
+                    logger.warning(""got response for unknown search:"" + source + "":""
+                            + msg.getDescription());
+                    return;
+                }
+
+                logger.finest(""got response to forwarded search: ""
+                        + search.getSearch().getDescription());
+
+                if (canceledSearches.containsKey(msg.getSearchID())) {
+                    logger.finer(""not forwarding search, it is already canceled, ""
+                            + msg.getSearchID());
+                    return;
+                }
+            } finally {
+                lock.unlock();
+            }
+
+            FriendConnection searcher = search.getSource();
+            FriendConnection responder = source;
+
+            if (search.getResponseNum() > mMaxSearchResponsesBeforeCancel) {
+                /*
+                 * we really shouldn't cancel other peoples searches, but if
+                 * they don't do it we have to
+                 */
+                lock.lock();
+                try {
+                    canceledSearches.put(msg.getSearchID(), System.currentTimeMillis());
+                } finally {
+                    lock.unlock();
+                }
+                logger.finest(""Sending cancel for someone elses search!, searcher=""
+                        + searcher.getRemoteFriend() + "" responder="" + responder.getRemoteFriend()
+                        + "":\t"" + search);
+                overlayManager.forwardSearchOrCancel(source, new OSF2FSearchCancel(
+                        OSF2FMessage.CURRENT_VERSION, msg.getSearchID()));
+            } else {
+                search.gotResponse();
+                // register the forwarding
+                logger.finest(""registering overlay forward: ""
+                        + searcher.getRemoteFriend().getNick() + ""<->""
+                        + responder.getRemoteFriend().getNick());
+                try {
+                    responder.registerOverlayForward(msg, searcher, search.getSearch(), false);
+                    searcher.registerOverlayForward(msg, responder, search.getSearch(), true);
+                } catch (FriendConnection.OverlayRegistrationError e) {
+                    String direction = ""'"" + responder.getRemoteFriend().getNick() + ""'->'""
+                            + searcher.getRemoteFriend().getNick() + ""'"";
+                    e.direction = direction;
+                    e.setupMessageSource = responder.getRemoteFriend().getNick();
+                    logger.warning(""not forwarding overlay setup request "" + direction + e.message);
+                    debugChannelIdErrorSetupErrorStats.add(e);
+                    return;
+                }
+
+                // and send out the search
+                if (msg instanceof OSF2FHashSearchResp) {
+                    searcher.sendChannelSetup((OSF2FHashSearchResp) msg.clone(), true);
+                } else if (msg instanceof OSF2FTextSearchResp) {
+                    searcher.sendTextSearchResp((OSF2FTextSearchResp) msg.clone(), true);
+                } else {
+                    Debug.out(""got unknown message: "" + msg.getDescription());
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 
+     * @param source
+     * @param msg
+     * @return
+     */
+    private boolean handleTextSearch(final FriendConnection source, final OSF2FTextSearch msg) {
+
+        boolean shouldForward = true;
+
+        if (logger.isLoggable(Level.FINER)) {
+            logger.finer(""handleTextSearch: "" + msg.getSearchString() + "" from ""
+                    + source.getRemoteFriend().getNick());
+        }
+
+        String searchString = msg.getSearchString();
+
+        // common case is no filtering.
+        if (filteredKeywords.length > 0) {
+            StringTokenizer toks = new StringTokenizer(searchString);
+
+            for (String filter : filteredKeywords) {
+                if (searchString.contains(filter)) {
+                    logger.fine(""Blocking search due to filter: "" + searchString + "" matched by: ""
+                            + filter);
+                    return false;
+                }
+            }
+        }
+
+        List<FileCollection> results = filelistManager.handleSearch(source.getRemoteFriend(),
+                searchString);
+
+        if (results.size() > 0) {
+            if (canRespondToSearch()) {
+                logger.finer(""found matches: "" + results.size());
+                // long fileListSize = results.getFileNum();
+
+                List<DelayedExecutionEntry> delayedExecutionTasks = new LinkedList<DelayedExecutionEntry>();
+                long time = System.currentTimeMillis();
+                for (FileCollection c : results) {
+                    // send back a response
+                    int channelId = random.nextInt();
+                    LinkedList<FileCollection> list = new LinkedList<FileCollection>();
+                    list.add(c);
+                    byte[] encoded = FileListManager.encode_basic(new FileList(list), false);
+
+                    final OSF2FTextSearchResp resp = new OSF2FTextSearchResp(
+                            OSF2FMessage.CURRENT_VERSION, OSF2FMessage.FILE_LIST_TYPE_PARTIAL,
+                            msg.getSearchID(), channelId, encoded);
+                    int delay = overlayManager.getSearchDelayForInfohash(source.getRemoteFriend(),
+                            c.getUniqueIdBytes());
+                    delayedExecutionTasks.add(new DelayedExecutionEntry(time + delay, 0,
+                            new TimerTask() {
+                                @Override
+                                public void run() {
+                                    /*
+                                     * check if the search got canceled while we
+                                     * were sleeping
+                                     */
+                                    if (!isSearchCanceled(msg.getSearchID())) {
+                                        source.sendTextSearchResp(resp, false);
+                                    }
+                                }
+                            }));
+                }
+                delayedExecutor.queue(delayedExecutionTasks);
+
+            } else {
+                // not enough capacity :-(
+                shouldForward = false;
+            }
+        }
+
+        return shouldForward;
+    }
+
+    public void sendDirectedHashSearch(FriendConnection target, byte[] infoHash) {
+
+        long metainfohashhash = filelistManager.getInfoHashhash(infoHash);
+
+        int newSearchId = 0;
+        while (newSearchId == 0) {
+            newSearchId = random.nextInt();
+        }
+        OSF2FHashSearch search = new OSF2FHashSearch(OSF2FMessage.CURRENT_VERSION, newSearchId,
+                metainfohashhash);
+        lock.lock();
+        try {
+            sentSearches.put(newSearchId, new SentSearch(search));
+        } finally {
+            lock.unlock();
+        }
+        overlayManager.sendDirectedSearch(target, search);
+
+    }
+
+    public long getInfoHashHashFromSearchId(int searchId) {
+        lock.lock();
+        try {
+            SentSearch sentSearch = sentSearches.get(searchId);
+            if (sentSearch != null && sentSearch.search instanceof OSF2FHashSearch) {
+                return ((OSF2FHashSearch) sentSearch.search).getInfohashhash();
+            }
+        } finally {
+            lock.unlock();
+        }
+        return -1;
+    }
+
+    public void sendHashSearch(byte[] infoHash) {
+        long metainfohashhash = filelistManager.getInfoHashhash(infoHash);
+
+        int newSearchId = 0;
+        while (newSearchId == 0) {
+            newSearchId = random.nextInt();
+        }
+        OSF2FSearch search = new OSF2FHashSearch(OSF2FMessage.CURRENT_VERSION, newSearchId,
+                metainfohashhash);
+
+        // these should go in the slow (forward) path so to route around slow
+        // nodes
+        sendSearch(newSearchId, search, false);
+    }
+
+    private void sendSearch(int newSearchId, OSF2FSearch search, boolean skipQueue) {
+        lock.lock();
+        try {
+            sentSearches.put(newSearchId, new SentSearch(search));
+        } finally {
+            lock.unlock();
+        }
+        overlayManager.sendSearchOrCancel(search, skipQueue, false);
+    }
+
+    public int sendTextSearch(String searchString, TextSearchListener listener) {
+        int newSearchId = 0;
+        while (newSearchId == 0) {
+            newSearchId = random.nextInt();
+        }
+
+        if (FileCollection.containsKeyword(searchString)) {
+            searchString = searchString.replaceAll("":"", "";"");
+            searchString = handleKeyWords(searchString);
+        }
+
+        OSF2FSearch search = new OSF2FTextSearch(OSF2FMessage.CURRENT_VERSION,
+                OSF2FMessage.FILE_LIST_TYPE_PARTIAL, newSearchId, searchString);
+        textSearchManager.sentSearch(newSearchId, searchString, listener);
+        sendSearch(newSearchId, search, false);
+        return newSearchId;
+    }
+
+    private static String handleKeyWords(String searchString) {
+        searchString = FileCollection.removeWhiteSpaceAfteKeyChars(searchString);
+        String[] interestingKeyWords = new String[] { ""id"", ""sha1"", ""ed2k"" };
+        int[] interestingKeyWordExectedKeyLen = { 20, 20, 16 };
+        StringBuilder b = new StringBuilder();
+        String[] split = searchString.split("" "");
+        for (String s : split) {
+            // check for id
+            String toAdd = s;
+            for (int i = 0; i < interestingKeyWords.length; i++) {
+                String fromId = convertToBase64(s, interestingKeyWords[i],
+                        interestingKeyWordExectedKeyLen[i]);
+                if (fromId != null) {
+                    toAdd = fromId;
+                }
+            }
+            b.append(toAdd + "" "");
+            if (!toAdd.equals(s)) {
+                logger.fine(""converted search: "" + s + ""->"" + toAdd);
+            }
+        }
+        return b.toString().trim();
+    }
+
+    private static String convertToBase64(String searchTerm, String _keyword, int expectedBytes) {
+        for (String sep : FileCollection.KEYWORDENDINGS) {
+            String keyword = _keyword + sep;
+            if (searchTerm.contains(keyword)) {
+                logger.finer(""converting base: "" + searchTerm);
+                try {
+                    String baseXHash = searchTerm.substring(keyword.length());
+                    logger.finer(""basex hash: "" + baseXHash);
+                    String hash = ShareManagerTools.baseXtoBase64(baseXHash, expectedBytes);
+                    String toAdd = keyword + hash;
+                    logger.finer(""new string: "" + toAdd);
+                    return toAdd;
+                } catch (UnsupportedEncodingException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+        return null;
+    }
+
+    static class DebugChannelIdEntry implements Comparable<DebugChannelIdEntry> {
+        final int count;
+        final String name;
+
+        public DebugChannelIdEntry(String name, int count) {
+            super();
+            this.name = name;
+            this.count = count;
+        }
+
+        public int compareTo(DebugChannelIdEntry o) {
+            if (o.count > count) {
+                return 1;
+            } else if (o.count == count) {
+                return 0;
+            } else {
+                return -1;
+            }
+        }
+    }
+
+    private static class DebugChannelSetupErrorStats {
+        private final LinkedList<FriendConnection.OverlayRegistrationError> errorList = new LinkedList<FriendConnection.OverlayRegistrationError>();
+
+        int MAX_SIZE = 10000;
+
+        public void add(FriendConnection.OverlayRegistrationError error) {
+            lock.lock();
+            try {
+                if (errorList.size() > MAX_SIZE) {
+                    errorList.removeLast();
+                }
+                errorList.addFirst(error);
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        public String getDebugStats() {
+            StringBuilder b = new StringBuilder();
+            HashMap<String, Integer> errorsPerFriend = new HashMap<String, Integer>();
+            HashMap<String, Integer> errorsPerPair = new HashMap<String, Integer>();
+            lock.lock();
+            try {
+
+                for (FriendConnection.OverlayRegistrationError error : errorList) {
+                    final String s = error.setupMessageSource;
+                    if (!errorsPerFriend.containsKey(s)) {
+                        errorsPerFriend.put(s, 0);
+                    }
+                    errorsPerFriend.put(s, errorsPerFriend.get(s) + 1);
+
+                    String d = error.direction;
+                    if (!errorsPerPair.containsKey(d)) {
+                        errorsPerPair.put(d, 0);
+                    }
+                    errorsPerPair.put(d, errorsPerPair.get(d) + 1);
+                }
+
+                ArrayList<DebugChannelIdEntry> friendTotalOrder = new ArrayList<DebugChannelIdEntry>();
+                for (String f : errorsPerFriend.keySet()) {
+                    friendTotalOrder.add(new DebugChannelIdEntry(f, errorsPerFriend.get(f)));
+                }
+                Collections.sort(friendTotalOrder);
+                b.append(""by source:\n"");
+                for (DebugChannelIdEntry e : friendTotalOrder) {
+                    b.append(""  "" + e.name + "" "" + e.count + ""\n"");
+                }
+
+                ArrayList<DebugChannelIdEntry> byPairOrder = new ArrayList<DebugChannelIdEntry>();
+                for (String f : errorsPerPair.keySet()) {
+                    byPairOrder.add(new DebugChannelIdEntry(f, errorsPerPair.get(f)));
+                }
+                Collections.sort(byPairOrder);
+                b.append(""by pair:\n"");
+                for (DebugChannelIdEntry e : byPairOrder) {
+                    b.append(""  "" + e.name + "" "" + e.count + ""\n"");
+                }
+
+            } finally {
+                lock.unlock();
+            }
+            return b.toString();
+        }
+    }
+
+    class DelayedSearchQueue {
+
+        long lastSearchesPerSecondLogTime = 0;
+        long lastBytesPerSecondCount = 0;
+        int searchCount = 0;
+
+        private long mDelay;
+        private final LinkedBlockingQueue<DelayedSearchQueueEntry> queue = new LinkedBlockingQueue<DelayedSearchQueueEntry>();
+        private final HashMap<Integer, DelayedSearchQueueEntry> queuedSearches = new HashMap<Integer, DelayedSearchQueueEntry>();
+
+        public DelayedSearchQueue(long delay) {
+            this.mDelay = delay;
+            Thread t = new Thread(new DelayedSearchQueueThread());
+            t.setDaemon(true);
+            t.setName(SEARCH_QUEUE_THREAD_NAME);
+            t.start();
+        }
+
+        /**
+         * Warning -- changing this won't re-order things already in the queue,
+         * so if you add something with a much smaller delay than the current
+         * head of the queue, it will wait until that's removed before sending
+         * the new message.
+         */
+        public void setDelay(long inDelay) {
+            this.mDelay = inDelay;
+        }
+
+        public void add(FriendConnection source, OSF2FSearch search) {
+
+            if (lastSearchesPerSecondLogTime + 1000 < System.currentTimeMillis()) {
+
+                lock.lock();
+                try {
+                    logger.fine(""Searches/sec: "" + searchCount + "" bytes: ""
+                            + lastBytesPerSecondCount + "" searchQueueSize: ""
+                            + queuedSearches.size());
+                } finally {
+                    lock.unlock();
+                }
+
+                lastSearchesPerSecondLogTime = System.currentTimeMillis();
+                searchCount = 0;
+                lastBytesPerSecondCount = 0;
+            }
+
+            searchCount++;
+            lastBytesPerSecondCount += FriendConnectionQueue.getMessageLen(search);
+
+            lock.lock();
+            try {
+
+                // Flush the accounting info every 60 seconds
+                if (SearchManager.this.lastSearchAccountingFlush + 60 * 1000 < System
+                        .currentTimeMillis()) {
+                    lastSearchAccountingFlush = System.currentTimeMillis();
+                    searchesPerFriend.clear();
+                }
+
+                // If the search queue is more than half full, start dropping
+                // searches
+                // proportional to how much of the total queue each person is
+                // consuming
+                if (queuedSearches.size() > 0.25 * MAX_SEARCH_QUEUE_LENGTH) {
+                    if (searchesPerFriend.containsKey(source.getRemoteFriend())) {
+                        int outstanding = searchesPerFriend.get(source.getRemoteFriend()).v;
+
+                        // We add a hard limit on the number of searches from
+                        // any one person.
+                        if (outstanding > 0.15 * MAX_SEARCH_QUEUE_LENGTH) {
+                            logger.fine(""Dropping due to 25% of total queue consumption ""
+                                    + source.getRemoteFriend().getNick() + "" "" + outstanding
+                                    + "" / "" + MAX_SEARCH_QUEUE_LENGTH);
+                            return;
+                        }
+
+                        // In other cases, we drop proportional to the
+                        // consumption of the overall queue.
+                        double acceptProb = (double) outstanding / (double) queuedSearches.size();
+                        if (random.nextDouble() < acceptProb) {
+                            if (logger.isLoggable(Level.FINE)) {
+                                logger.fine(""*** RED for search from "" + source + "" outstanding: ""
+                                        + outstanding + "" total: "" + queuedSearches.size());
+                            }
+                            return;
+                        }
+                    }
+                }
+
+                if (queuedSearches.size() > MAX_SEARCH_QUEUE_LENGTH) {
+                    if (logger.isLoggable(Level.FINER)) {
+                        logger.finer(""not forwarding search, queue length too large. id: ""
+                                + search.getSearchID());
+                    }
+                    return;
+                }
+                if (!queuedSearches.containsKey(search.getSearchID())) {
+                    logger.finest(""adding search to forward queue, will forward in "" + mDelay
+                            + "" ms"");
+                    DelayedSearchQueueEntry entry = new DelayedSearchQueueEntry(search, source,
+                            System.currentTimeMillis() + mDelay);
+
+                    if (searchesPerFriend.containsKey(source.getRemoteFriend()) == false) {
+                        searchesPerFriend.put(source.getRemoteFriend(),
+                                new SearchManager.MutableInteger());
+                    }
+                    searchesPerFriend.get(source.getRemoteFriend()).v++;
+                    logger.finest(""Search for friend: "" + source.getRemoteFriend().getNick() + "" ""
+                            + searchesPerFriend.get(source.getRemoteFriend()).v);
+
+                    queuedSearches.put(search.getSearchID(), entry);
+                    queue.add(entry);
+
+                } else {
+                    logger.finer(""search already in queue, not adding"");
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        /*
+         * make sure to already have the lock when calling this
+         */
+        public boolean isQueued(OSF2FSearch search) {
+            return queuedSearches.containsKey(search.getSearchID());
+        }
+
+        class DelayedSearchQueueThread implements Runnable {
+
+            public void run() {
+                while (true) {
+                    try {
+                        DelayedSearchQueueEntry e = queue.take();
+                        long timeUntilSend = e.dontSendBefore - System.currentTimeMillis();
+                        if (timeUntilSend > 0) {
+                            logger.finer(""got search ("" + e.search.getDescription()
+                                    + "") to forward, waiting "" + timeUntilSend
+                                    + "" ms until sending"");
+                            Thread.sleep(timeUntilSend);
+                        }
+                        forwardSearch(e.source, e.search);
+                        /*
+                         * remove the search from the queuedSearchesMap
+                         */
+                        lock.lock();
+                        try {
+                            queuedSearches.remove(e.search.getSearchID());
+                            // If searchesPerFriend was flushed while this
+                            // search was in the
+                            // queue, the get() call will return null.
+                            if (searchesPerFriend.containsKey(e.source.getRemoteFriend())) {
+                                searchesPerFriend.get(e.source.getRemoteFriend()).v--;
+                            }
+                        } finally {
+                            lock.unlock();
+                        }
+                        /*
+                         * if we didn't sleep at all, sleep the min time between
+                         * searches
+                         */
+                        if (timeUntilSend < 1) {
+                            double ms = 1000.0 / FriendConnection.MAX_OUTGOING_SEARCH_RATE;
+                            int msFloor = (int) Math.floor(ms);
+                            int nanosLeft = (int) Math.round((ms - msFloor) * 1000000.0);
+                            logger.finest(""sleeping "" + msFloor + ""ms + "" + nanosLeft + "" ns"");
+                            Thread.sleep(msFloor, Math.min(999999, nanosLeft));
+                        }
+
+                    } catch (Exception e1) {
+                        logger.warning(""*** Delayed search queue thread error: "" + e1.toString());
+                        e1.printStackTrace();
+                        BackendErrorLog.get().logException(e1);
+                    }
+                }
+            }
+        }
+    }
+
+    static class DelayedSearchQueueEntry {
+        final long dontSendBefore;
+        final OSF2FSearch search;
+        final FriendConnection source;
+        final long insertionTime;
+
+        public DelayedSearchQueueEntry(OSF2FSearch search, FriendConnection source,
+                long dontSendBefore) {
+            this.insertionTime = System.currentTimeMillis();
+            this.search = search;
+            this.source = source;
+            this.dontSendBefore = dontSendBefore;
+        }
+    }
+
+    class ForwardedSearch {
+        private int responsesForwarded = 0;
+        private final OSF2FSearch search;
+        private final FriendConnection source;
+        private final long time;
+
+        public ForwardedSearch(FriendConnection source, OSF2FSearch search) {
+            this.time = System.currentTimeMillis();
+            this.source = source;
+            this.search = search;
+
+        }
+
+        public long getAge() {
+            return System.currentTimeMillis() - this.time;
+        }
+
+        public int getResponseNum() {
+            return responsesForwarded;
+        }
+
+        public OSF2FSearch getSearch() {
+            return search;
+        }
+
+        public int getSearchId() {
+            return search.getSearchID();
+        }
+
+        public FriendConnection getSource() {
+            return source;
+        }
+
+        public void gotResponse() {
+            responsesForwarded++;
+        }
+
+        public boolean isTimedOut() {
+            return getAge() > MAX_SEARCH_AGE;
+        }
+    }
+
+    static class RotatingBloomFilter {
+        private static final int OBJECTS_TO_STORE = 1000000;
+
+        private static final int SIZE_IN_BITS = 10240 * 1024;
+
+        private long currentFilterCreated;
+        private final LinkedList<BloomFilter> filters = new LinkedList<BloomFilter>();
+        private final int maxBuckets;
+        private final long maxFilterAge;
+
+        public RotatingBloomFilter(long totalAge, int buckets) {
+            this.maxBuckets = buckets;
+            this.maxFilterAge = (totalAge / buckets) + 1;
+            rotate();
+        }
+
+        public boolean contains(int searchId, int searchValue) {
+            byte[] bytes = bytesFromInts(searchId, searchValue);
+            for (BloomFilter f : filters) {
+                if (f.test(bytes)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public double getPrevFilterFalsePositiveEst() {
+            if (filters.size() > 1) {
+                return filters.get(1).getPredictedFalsePositiveRate();
+            } else {
+                return filters.getFirst().getPredictedFalsePositiveRate();
+            }
+        }
+
+        public int getPrevFilterNumElements() {
+            if (filters.size() > 1) {
+                return filters.get(1).getUniqueObjectsStored();
+            } else {
+                return filters.getFirst().getUniqueObjectsStored();
+            }
+        }
+
+        public void insert(int searchId, int searchValue) {
+            byte[] bytes = bytesFromInts(searchId, searchValue);
+            filters.getFirst().insert(bytes);
+        }
+
+        private void rotate() {
+
+            if (filters.size() > 0) {
+                BloomFilter prevFilter = filters.getFirst();
+                String str = ""Rotating bloom filter: objects=""
+                        + prevFilter.getUniqueObjectsStored() + "" predicted false positive rate=""
+                        + (100 * prevFilter.getPredictedFalsePositiveRate() + ""%"");
+                logger.info(str);
+            }
+            currentFilterCreated = System.currentTimeMillis();
+            try {
+                filters.addFirst(new BloomFilter(SIZE_IN_BITS, OBJECTS_TO_STORE));
+            } catch (NoSuchAlgorithmException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            if (filters.size() > maxBuckets) {
+                filters.removeLast();
+            }
+        }
+
+        public boolean rotateIfNeeded() {
+            long currentFilterAge = System.currentTimeMillis() - currentFilterCreated;
+            if (currentFilterAge > maxFilterAge) {
+                rotate();
+                return true;
+            }
+            return false;
+        }
+
+        private static byte[] bytesFromInts(int int1, int int2) {
+            byte[] bytes = new byte[8];
+
+            bytes[0] = (byte) (int1 >>> 24);
+            bytes[1] = (byte) (int1 >>> 16);
+            bytes[2] = (byte) (int1 >>> 8);
+            bytes[3] = (byte) int1;
+
+            bytes[4] = (byte) (int2 >>> 24);
+            bytes[5] = (byte) (int2 >>> 16);
+            bytes[6] = (byte) (int2 >>> 8);
+            bytes[7] = (byte) int2;
+            return bytes;
+        }
+
+        public static void main(String[] args) {
+            OSF2FMain.getSingelton();
+            logger.setLevel(Level.FINE);
+            Random rand = new Random();
+
+            RotatingBloomFilter bf = new RotatingBloomFilter(60 * 1000, 4);
+
+            Set<String> inserts = new HashSet<String>();
+            for (int j = 0; j < 8; j++) {
+                for (int i = 0; i < 20000; i++) {
+                    int r1 = rand.nextInt();
+                    int r2 = rand.nextInt();
+                    byte[] bytes = bytesFromInts(r1, r2);
+                    inserts.add(new String(Base64.encode(bytes)));
+                    bf.insert(r1, r2);
+                    if (!bf.contains(r1, r2)) {
+                        System.err.println(""insert failes (does not contain it anymore)"");
+                    }
+                }
+                bf.rotate();
+            }
+
+            int fps = 0, to_check = 200000;
+            for (int i = 0; i < to_check; i++) {
+                int int1;
+                int int2;
+                byte[] bytes;
+                do {
+                    int1 = rand.nextInt();
+                    int2 = rand.nextInt();
+                    bytes = bytesFromInts(int1, int2);
+                } while (inserts.contains(new String(Base64.encode(bytes))) == true);
+                if (bf.contains(int1, int2) == true)
+                    fps++;
+            }
+
+            System.out.println(""false positive check, "" + fps + ""/"" + to_check);
+
+            System.out.println(""mem: ""
+                    + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
+
+        }
+
+    }
+
+    class SentSearch {
+        private int responses = 0;
+        private final OSF2FSearch search;
+
+        private final long time;
+
+        public SentSearch(OSF2FSearch search) {
+            this.search = search;
+            this.time = System.currentTimeMillis();
+        }
+
+        public long getAge() {
+            return System.currentTimeMillis() - this.time;
+        }
+
+        public int getResponseNum() {
+            return responses;
+        }
+
+        public OSF2FSearch getSearch() {
+            return search;
+        }
+
+        public void gotResponse() {
+            responses++;
+        }
+
+        public boolean isTimedOut() {
+            return getAge() > MAX_SEARCH_AGE;
+        }
+
+    }
+
+    public interface TextSearchListener {
+        public void searchResponseReceived(TextSearchResponseItem r);
+    }
+
+    class TextSearchManager {
+        private final ConcurrentHashMap<Integer, TextSearchResponse> responses;
+        private final ConcurrentHashMap<Integer, TextSearchListener> listeners;
+
+        public TextSearchManager() {
+            responses = new ConcurrentHashMap<Integer, TextSearchResponse>();
+            listeners = new ConcurrentHashMap<Integer, TextSearchListener>();
+        }
+
+        public List<TextSearchResult> getResults(int searchId) {
+            TextSearchResponse resps = responses.get(searchId);
+
+            HashMap<String, TextSearchResult> result = new HashMap<String, TextSearchResult>();
+
+            if (resps != null) {
+                /*
+                 * group into file collections
+                 */
+                for (TextSearchResponseItem item : resps.getItems()) {
+                    for (FileCollection collection : item.getFileList().getElements()) {
+                        if (result.containsKey(collection.getUniqueID())) {
+                            TextSearchResult existing = result.get(collection.getUniqueID());
+                            existing.merge(item, collection);
+                        } else {
+                            // mark stuff that we already have
+                            boolean alreadyInLibrary = true;
+                            GlobalManager globalManager = AzureusCoreImpl.getSingleton()
+                                    .getGlobalManager();
+                            DownloadManager dm = globalManager.getDownloadManager(new HashWrapper(
+                                    collection.getUniqueIdBytes()));
+                            if (dm == null) {
+                                alreadyInLibrary = false;
+                            }
+                            result.put(collection.getUniqueID(), new TextSearchResult(item,
+                                    collection, alreadyInLibrary));
+                        }
+                    }
+                }
+
+                // /*
+                // * verify that we didn't get any bad data
+                // */
+                // for (TextSearchResult item : result.values()) {
+                // FileCollection collection = item.getCollection();
+                // String searchString = resps.getSearchString();
+                // boolean collectionMatch = collection.nameMatch(searchString);
+                //
+                // Set<FileListFile> filteredFiles = new
+                // HashSet<FileListFile>();
+                // List<FileListFile> allChildren = collection.getChildren();
+                // for (int i = 0; i < allChildren.size(); i++) {
+                // FileListFile f = allChildren.get(i);
+                // if (filteredFiles.contains(f)) {
+                // continue;
+                // }
+                // if (collectionMatch) {
+                // filteredFiles.add(f);
+                // } else if (f.searchMatch(searchString)) {
+                // filteredFiles.add(f);
+                // } else {
+                // logger.fine(""got search result that doesn't match search: "" +
+                // f.getFileName() + "" ! "" + searchString);
+                // }
+                // }
+                // logger.fine(collection.getName() + "" totalResp: "" +
+                // allChildren.size() + "" afterFiler="" + filteredFiles.size());
+                // collection.setChildren(new
+                // ArrayList<FileListFile>(filteredFiles));
+                // }
+
+                return new ArrayList<TextSearchResult>(result.values());
+            }
+            logger.fine(""no responses for searchId="" + searchId);
+            return new ArrayList<TextSearchResult>();
+        }
+
+        public void gotSearchResponse(int searchId, Friend throughFriend, FileList fileList,
+                int channelId, int connectionId) {
+            TextSearchResponse r = responses.get(searchId);
+            if (r != null) {
+                long age = System.currentTimeMillis() - r.getTime();
+                TextSearchResponseItem item = new TextSearchResponseItem(throughFriend, fileList,
+                        age, channelId, connectionId);
+                r.add(item);
+                TextSearchListener listener = listeners.get(searchId);
+                if (listener != null) {
+                    listener.searchResponseReceived(item);
+                }
+            } else {
+                logger.warning(""got response for unknown search"");
+            }
+        }
+
+        public void sentSearch(int searchId, String searchString, TextSearchListener listener) {
+            responses.put(searchId, new TextSearchResponse(searchString));
+            if (listener != null) {
+                listeners.put(searchId, listener);
+            }
+        }
+
+        public void clearOldResponses() {
+            for (Iterator<Integer> iterator = responses.keySet().iterator(); iterator.hasNext();) {
+                Integer key = iterator.next();
+                TextSearchResponse response = responses.get(key);
+                if (System.currentTimeMillis() - response.getTime() > 10 * 60 * 1000) {
+                    iterator.remove();
+                    listeners.remove(key);
+                }
+
+            }
+        }
+    }
+
+    public boolean isSearchInBloomFilter(OSF2FSearch search) {
+        lock.lock();
+        try {
+            int searchID = search.getSearchID();
+            int valueID = search.getValueID();
+            if (recentSearches.contains(searchID, valueID)) {
+                bloomSearchesBlockedCurr++;
+            }
+        } finally {
+            lock.unlock();
+        }
+        return false;
+    }
 
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/ServiceConnection.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/ServiceConnection.java
index e1112dfd..b410524f 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/ServiceConnection.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/ServiceConnection.java
@@ -1,10 +1,188 @@
 package edu.washington.cs.oneswarm.f2f.network;
 
-public class ServiceConnection extends OverlayTransport {
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.logging.Logger;
 
-    public ServiceConnection(FriendConnection connection, int channelId, byte[] infohash,
-            int pathID, boolean outgoing, long overlayDelayMs) {
-        super(connection, channelId, infohash, pathID, outgoing, overlayDelayMs);
+import org.gudy.azureus2.core3.util.DirectByteBuffer;
+
+import com.aelitis.azureus.core.networkmanager.IncomingMessageQueue.MessageQueueListener;
+import com.aelitis.azureus.core.networkmanager.NetworkConnection;
+import com.aelitis.azureus.core.networkmanager.NetworkConnection.ConnectionListener;
+import com.aelitis.azureus.core.peermanager.messaging.Message;
+
+import edu.washington.cs.oneswarm.f2f.messaging.OSF2FChannelDataMsg;
+import edu.washington.cs.oneswarm.f2f.servicesharing.DataMessage;
+import edu.washington.cs.oneswarm.f2f.servicesharing.ServiceSharingManager.SharedService;
+
+public class ServiceConnection extends OverlayEndpoint {
+    /**
+     ** High level **
+     * 
+     * Searcher: Register service, enter local port and searchkey, Open local
+     * port, On incoming connection: Search
+     * 
+     * 
+     * Service host: Search hit->Search reply->contact server On server timeout
+     * or any other error: send channel reset
+     * 
+     * Searcher: On search reply: send any incoming data to the channel
+     * 
+     */
+
+    /**
+     ** Details **
+     * 
+     * For service host:
+     * 
+     * Create: Create new network connection, register the network connection to
+     * handle rate limited reads/writes.
+     * 
+     * Server->Overlay: On incoming message: move the payload into a new overlay
+     * message with the proper channel id and queue on the friend connection.
+     * The new message now owns the payload and is responsible for destroying
+     * it.
+     * 
+     * Overlay->Server: put the message in the outgoing queue on the server
+     * connection.
+     */
+
+    private final static Logger logger = Logger.getLogger(ServiceConnection.class.getName());
+    // all operations on this object must be in a synchronized block
+    private final LinkedList<OSF2FChannelDataMsg> bufferedMessages;
+    private NetworkConnection serverConnection;
+
+    private final SharedService service;
+    private final boolean serverSide;
+
+    public ServiceConnection(SharedService service, FriendConnection connection, int channelId,
+            int pathID, boolean serverSide) {
+        super(connection, channelId, pathID, 0);
+        this.service = service;
+        this.bufferedMessages = new LinkedList<OSF2FChannelDataMsg>();
+        this.serverSide = true;
+    }
+
+    @Override
+    public void cleanup() {
+        serverConnection.close();
+    }
+
+    @Override
+    protected void destroyBufferedMessages() {
+        synchronized (bufferedMessages) {
+            while (bufferedMessages.size() > 0) {
+                bufferedMessages.removeFirst().destroy();
+            }
+        }
+    };
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + "" "" + service.toString() + "" serverside="" + serverSide;
+    }
+
+    @Override
+    protected void handleDelayedOverlayMessage(OSF2FChannelDataMsg msg) {
+        if (closed) {
+            return;
+        }
+        if (!started) {
+            start();
+        }
+        if (!serverConnection.isConnected()) {
+            synchronized (bufferedMessages) {
+                bufferedMessages.add(msg);
+            }
+            return;
+        }
+        writeMessageToServerConnection(msg.getData());
+    }
+
+    /**
+     * Currently we connect to the server when we get the first message data.
+     */
+    // TODO (isdal): connect to the server on incoming search message and send
+    // reply on successful connect?
+    @Override
+    public void start() {
+        logger.fine(getDescription() + "" starting"");
+        if (isStarted()) {
+            logger.warning(""Tried to start already started service"");
+            return;
+        }
+        if (!service.isEnabled()) {
+            logger.fine(""Tried to start disabled connection"");
+            return;
+        }
+        serverConnection = service.createConnection(new ConnectionListener() {
+            @Override
+            public void connectFailure(Throwable failure_msg) {
+                logger.fine(ServiceConnection.this.getDescription() + "" connection failure"");
+                ServiceConnection.this.close(""Exception during connect"");
+            }
+
+            @Override
+            public void connectStarted() {
+                logger.fine(ServiceConnection.this.getDescription() + "" connect started"");
+            }
+
+            @Override
+            public void connectSuccess(ByteBuffer remaining_initial_data) {
+                logger.fine(ServiceConnection.this.getDescription() + "" connected"");
+                serverConnection.getIncomingMessageQueue().registerQueueListener(
+                        new ServerIncomingMessageListener());
+                synchronized (bufferedMessages) {
+                    for (OSF2FChannelDataMsg msg : bufferedMessages) {
+                        logger.finest(""sending queued message: "" + msg.getDescription());
+                        writeMessageToServerConnection(msg.getData());
+                    }
+                }
+            }
+
+            @Override
+            public void exceptionThrown(Throwable error) {
+                ServiceConnection.this.close(""Exception during connect"");
+            }
+
+            @Override
+            public String getDescription() {
+                return ServiceConnection.this.getDescription() + "" connect listener"";
+            }
+        });
+        started = true;
     }
 
+    private void writeMessageToServerConnection(DirectByteBuffer[] data) {
+        for (DirectByteBuffer directByteBuffer : data) {
+            DataMessage msg = new DataMessage(directByteBuffer);
+            logger.finest(""writing message to server queue: "" + msg.getDescription());
+            serverConnection.getOutgoingMessageQueue().addMessage(msg, false);
+        }
+    }
+
+    private class ServerIncomingMessageListener implements MessageQueueListener {
+
+        @Override
+        public void dataBytesReceived(int byte_count) {
+        }
+
+        @Override
+        public boolean messageReceived(Message message) {
+            logger.finest(""Message from server: "" + message.getDescription());
+            if (!(message instanceof DataMessage)) {
+                String msg = ""got wrong message type from server: "";
+                logger.warning(msg + message.getDescription());
+                ServiceConnection.this.close(msg);
+                return false;
+            }
+            DataMessage dataMessage = (DataMessage) message;
+            ServiceConnection.this.writeMessageToFriendConnection(dataMessage.transferPayload());
+            return true;
+        }
+
+        @Override
+        public void protocolBytesReceived(int byte_count) {
+        }
+    }
 }
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/DataMessage.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/DataMessage.java
index 11fc62b7..2070626c 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/DataMessage.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/DataMessage.java
@@ -15,16 +15,26 @@
 import com.aelitis.azureus.core.peermanager.messaging.MessageStreamDecoder;
 import com.aelitis.azureus.core.peermanager.messaging.MessageStreamEncoder;
 
+import edu.washington.cs.oneswarm.f2f.messaging.OSF2FChannelDataMsg;
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FMessage;
 
-class DataMessage implements Message {
+public class DataMessage extends OSF2FChannelDataMsg {
+    private static final byte SS = DirectByteBuffer.SS_MSG;
 
     private DirectByteBuffer buffer = null;
     private static String ID = ""RAW_MESSAGE"";
-    private final String DESC = ""Raw message"";
+    private final String desc;
+    private final int size;
 
     public DataMessage(DirectByteBuffer _buffer) {
-        buffer = _buffer;
+        super(OSF2FMessage.CURRENT_VERSION, 1, _buffer);
+        size = _buffer.remaining(SS);
+        desc = ""Raw message: "" + size + "" bytes"";
+    }
+
+    @Override
+    public int getMessageSize() {
+        return size;
     }
 
     public String getID() {
@@ -48,7 +58,7 @@ public int getType() {
     }
 
     public String getDescription() {
-        return DESC;
+        return desc;
     }
 
     public byte getVersion() {
@@ -64,11 +74,26 @@ public DirectByteBuffer[] getData() {
     }
 
     public Message deserialize(DirectByteBuffer data, byte version) throws MessageException {
-        throw (new MessageException(""not imp""));
+        throw (new MessageException(""not implemented""));
     }
 
     public void destroy() {
-        buffer.returnToPool();
+        if (buffer != null) {
+            buffer.returnToPool();
+        }
+    }
+
+    /**
+     * Retrieve the payload from this message for transfer into a new message.
+     * 
+     * The new message is responsible for returning the buffer on destroy.
+     * 
+     * @return
+     */
+    public DirectByteBuffer transferPayload() {
+        DirectByteBuffer data = buffer;
+        buffer = null;
+        return data;
     }
 
     static class RawMessageEncoder implements MessageStreamEncoder {
@@ -81,7 +106,6 @@ public RawMessage[] encodeMessage(Message base_message) {
     }
 
     static class RawMessageDecoder implements MessageStreamDecoder {
-        private static final byte SS = DirectByteBuffer.SS_MSG;
 
         private static int MAX_PAYLOAD = OSF2FMessage.MAX_PAYLOAD_SIZE;
         DirectByteBuffer payload_buffer;
@@ -111,6 +135,9 @@ public int performStreamDecode(Transport transport, int max_bytes) throws IOExce
                 if (payload_buffer == null) {
                     payload_buffer = DirectByteBufferPool.getBuffer(SS, MAX_PAYLOAD);
                 }
+                if (paused) {
+                    break;
+                }
                 long read = transport.read(new ByteBuffer[] { payload_buffer.getBuffer(SS) }, 0,
                         bytes_left);
                 bytes_left -= read;
@@ -119,11 +146,12 @@ public int performStreamDecode(Transport transport, int max_bytes) throws IOExce
                 // * transport has no more data
                 if (payload_buffer.remaining(SS) == 0 || read == 0) {
                     if (payload_buffer.position(SS) > 0) {
+                        payload_buffer.position(SS, 0);
                         Message msg = new DataMessage(payload_buffer);
                         messages_last_read.add(msg);
                         payload_buffer = null;
                     }
-                    // If transport has no more data, break
+                    // If we read all from transport, break
                     if (read == 0) {
                         break;
                     }
@@ -169,5 +197,4 @@ public ByteBuffer destroy() {
             return ByteBuffer.allocate(0);
         }
     }
-
 }
\ No newline at end of file
diff --git a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServiceSharingManager.java b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServiceSharingManager.java
index 4a920db9..1d3d544e 100644
--- a/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServiceSharingManager.java
+++ b/oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/servicesharing/ServiceSharingManager.java
@@ -1,40 +1,78 @@
 package edu.washington.cs.oneswarm.f2f.servicesharing;
 
 import java.net.InetSocketAddress;
-import java.util.concurrent.ConcurrentHashMap;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.logging.Logger;
 
 import com.aelitis.azureus.core.networkmanager.ConnectionEndpoint;
 import com.aelitis.azureus.core.networkmanager.NetworkConnection;
+import com.aelitis.azureus.core.networkmanager.NetworkConnection.ConnectionListener;
 import com.aelitis.azureus.core.networkmanager.NetworkManager;
 
+import edu.washington.cs.oneswarm.f2f.BigFatLock;
 import edu.washington.cs.oneswarm.f2f.messaging.OSF2FHashSearch;
+import edu.washington.cs.oneswarm.f2f.network.OverlayManager;
 import edu.washington.cs.oneswarm.f2f.servicesharing.DataMessage.RawMessageDecoder;
 import edu.washington.cs.oneswarm.f2f.servicesharing.DataMessage.RawMessageEncoder;
 
 public class ServiceSharingManager {
 
-    private final static ServiceSharingManager instace = new ServiceSharingManager();
+    private final static ServiceSharingManager instance = new ServiceSharingManager();
+
+    private static BigFatLock lock = OverlayManager.lock;
+
+    private final static Logger logger = Logger.getLogger(ServiceSharingManager.class.getName());
 
     public static ServiceSharingManager getInstance() {
-        return instace;
+        return instance;
     }
 
     private ServiceSharingManager() {
     }
 
-    public ConcurrentHashMap<Long, Service> services = new ConcurrentHashMap<Long, ServiceSharingManager.Service>();
+    public HashMap<Long, SharedService> serverServices = new HashMap<Long, SharedService>();
+
+    public void registerServerService(long searchkey, SharedService service) {
+        try {
+            lock.lock();
+            serverServices.put(searchkey, service);
+        } finally {
+            lock.unlock();
+        }
+
+    }
+
+    public void deregisterServerService(long searchKey) {
+        try {
+            lock.lock();
+            serverServices.remove(searchKey);
+        } finally {
+            lock.unlock();
+        }
 
-    public void registerService(long searchkey, Service service) {
-        services.put(searchkey, service);
     }
 
-    public Service handleSearch(OSF2FHashSearch search) {
-        Service service = services.get(search.getInfohashhash());
+    public SharedService handleSearch(OSF2FHashSearch search) {
+        SharedService service = null;
+        try {
+            lock.lock();
+            service = serverServices.get(search.getInfohashhash());
+        } finally {
+            lock.unlock();
+        }
+
+        if (service == null || !service.isEnabled()) {
+            return null;
+        }
         return service;
     }
 
-    static class Service {
-        public Service(InetSocketAddress address, String name) {
+    public static class SharedService {
+        // Time the service is disabled after a failed connect attempt;
+        public static final long FAILURE_BACKOFF = 60 * 1000;
+
+        public SharedService(InetSocketAddress address, String name) {
             super();
             this.address = address;
             this.name = name;
@@ -42,13 +80,53 @@ public Service(InetSocketAddress address, String name) {
 
         private final InetSocketAddress address;
         private final String name;
+        private long lastFailedConnect;
 
-        public NetworkConnection createConnection() {
+        public boolean isEnabled() {
+            long lastFailedAge = System.currentTimeMillis() - lastFailedConnect;
+            boolean enabled = lastFailedAge > FAILURE_BACKOFF;
+            logger.finer(String.format(""Service %s is disabled, last failure: %d seconds ago"",
+                    name, lastFailedAge));
+            return enabled;
+        }
+
+        public NetworkConnection createConnection(final ConnectionListener listener) {
             ConnectionEndpoint target = new ConnectionEndpoint(address);
             NetworkConnection conn = NetworkManager.getSingleton().createConnection(target,
                     new RawMessageEncoder(), new RawMessageDecoder(), false, false, new byte[0][0]);
+            conn.connect(false, new ConnectionListener() {
+
+                @Override
+                public String getDescription() {
+                    return name + ""Listener"";
+                }
+
+                @Override
+                public void exceptionThrown(Throwable error) {
+                    listener.exceptionThrown(error);
+                }
+
+                @Override
+                public void connectSuccess(ByteBuffer remaining_initial_data) {
+                    listener.connectSuccess(remaining_initial_data);
+                }
+
+                @Override
+                public void connectStarted() {
+                    listener.connectStarted();
+                }
+
+                @Override
+                public void connectFailure(Throwable failure_msg) {
+                    lastFailedConnect = System.currentTimeMillis();
+                    listener.connectFailure(failure_msg);
+                }
+            });
             return conn;
+        }
 
+        public String toString() {
+            return name + "" "" + address;
         }
     }
 }"
f64233fb2d9bcb77e9249d3bc497fd9d110e6a9f,ReactiveX-RxJava,Add Single.fromCallable()--,a,https://github.com/ReactiveX/RxJava,"diff --git a/src/main/java/rx/Single.java b/src/main/java/rx/Single.java
index 4324d32acf..3701d93189 100644
--- a/src/main/java/rx/Single.java
+++ b/src/main/java/rx/Single.java
@@ -12,6 +12,7 @@
  */
 package rx;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -605,6 +606,43 @@ public final static <T> Single<T> from(Future<? extends T> future, Scheduler sch
         return new Single<T>(OnSubscribeToObservableFuture.toObservableFuture(future)).subscribeOn(scheduler);
     }
 
+    /**
+     * Returns a {@link Single} that invokes passed function and emits its result for each new Observer that subscribes.
+     * <p>
+     * Allows you to defer execution of passed function until Observer subscribes to the {@link Single}.
+     * It makes passed function ""lazy"".
+     * Result of the function invocation will be emitted by the {@link Single}.
+     * <dl>
+     *   <dt><b>Scheduler:</b></dt>
+     *   <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param func
+     *         function which execution should be deferred, it will be invoked when Observer will subscribe to the {@link Single}.
+     * @param <T>
+     *         the type of the item emitted by the {@link Single}.
+     * @return a {@link Single} whose {@link Observer}s' subscriptions trigger an invocation of the given function.
+     */
+    @Experimental
+    public static <T> Single<T> fromCallable(final Callable<? extends T> func) {
+        return create(new OnSubscribe<T>() {
+            @Override
+            public void call(SingleSubscriber<? super T> singleSubscriber) {
+                final T value;
+
+                try {
+                    value = func.call();
+                } catch (Throwable t) {
+                    Exceptions.throwIfFatal(t);
+                    singleSubscriber.onError(t);
+                    return;
+                }
+
+                singleSubscriber.onSuccess(value);
+            }
+        });
+    }
+
     /**
      * Returns a {@code Single} that emits a specified item.
      * <p>
diff --git a/src/test/java/rx/SingleTest.java b/src/test/java/rx/SingleTest.java
index 7d8fe2dc22..f78151b094 100644
--- a/src/test/java/rx/SingleTest.java
+++ b/src/test/java/rx/SingleTest.java
@@ -20,8 +20,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -530,4 +532,42 @@ public void doOnErrorShouldThrowCompositeExceptionIfOnErrorActionThrows() {
 
         verify(action).call(error);
     }
+
+    @Test
+    public void shouldEmitValueFromCallable() throws Exception {
+        Callable<String> callable = mock(Callable.class);
+
+        when(callable.call()).thenReturn(""value"");
+
+        TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+
+        Single
+                .fromCallable(callable)
+                .subscribe(testSubscriber);
+
+        testSubscriber.assertValue(""value"");
+        testSubscriber.assertNoErrors();
+
+        verify(callable).call();
+    }
+
+    @Test
+    public void shouldPassErrorFromCallable() throws Exception {
+        Callable<String> callable = mock(Callable.class);
+
+        Throwable error = new IllegalStateException();
+
+        when(callable.call()).thenThrow(error);
+
+        TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+
+        Single
+                .fromCallable(callable)
+                .subscribe(testSubscriber);
+
+        testSubscriber.assertNoValues();
+        testSubscriber.assertError(error);
+
+        verify(callable).call();
+    }
 }"
e2ffe19d36e25a9d208e53a534f878e8605ed5ab,intellij-community,cleanup--,p,https://github.com/JetBrains/intellij-community,"diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index a34084fa28eaf..6fb2c80e3d801 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -137,7 +137,7 @@ public Boolean fun(String s) {
   private final CompileServerClasspathManager myClasspathManager = new CompileServerClasspathManager();
   private final Executor myPooledThreadExecutor = new Executor() {
     @Override
-    public void execute(Runnable command) {
+    public void execute(@NotNull Runnable command) {
       ApplicationManager.getApplication().executeOnPooledThread(command);
     }
   };
@@ -478,7 +478,7 @@ public void run() {
             globals = buildGlobalSettings();
             myGlobals = globals;
           }
-          CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges = null;
+          CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
           final SequentialTaskExecutor projectTaskQueue;
           synchronized (myProjectDataMap) {
             ProjectData data = myProjectDataMap.get(projectPath);
@@ -761,21 +761,12 @@ private Process launchBuildProcess(Project project, final int port, final UUID s
     cmdLine.addParameter(""-D""+ GlobalOptions.HOSTNAME_OPTION + ""="" + host);
 
     // javac's VM should use the same default locale that IDEA uses in order for javac to print messages in 'correct' language
-    final String lang = System.getProperty(""user.language"");
-    if (lang != null) {
-      //noinspection HardCodedStringLiteral
-      cmdLine.addParameter(""-Duser.language="" + lang);
-    }
-    final String country = System.getProperty(""user.country"");
-    if (country != null) {
-      //noinspection HardCodedStringLiteral
-      cmdLine.addParameter(""-Duser.country="" + country);
-    }
-    //noinspection HardCodedStringLiteral
-    final String region = System.getProperty(""user.region"");
-    if (region != null) {
-      //noinspection HardCodedStringLiteral
-      cmdLine.addParameter(""-Duser.region="" + region);
+    String[] propertyNames = {""user.language"", ""user.country"", ""user.region""};
+    for (String name : propertyNames) {
+      final String value = System.getProperty(name);
+      if (value != null) {
+        cmdLine.addParameter(""-D"" + name + ""="" + value);
+      }
     }
 
     cmdLine.addParameter(""-classpath"");
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java b/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java
index 38d0aa113a458..ac843603c68b7 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java
@@ -22,7 +22,7 @@ public static CmdlineRemoteProto.Message.ControllerMessage createMakeRequest(Str
                                                                                List<TargetTypeBuildScope> scopes,
                                                                                final Map<String, String> userData,
                                                                                final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals,
-                                                                               final CmdlineRemoteProto.Message.ControllerMessage.FSEvent event) {
+                                                                               final @Nullable CmdlineRemoteProto.Message.ControllerMessage.FSEvent event) {
     return createBuildParametersMessage(CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.Type.MAKE, project, scopes,
                                 userData, Collections.<String>emptyList(),
                                 globals, event);
@@ -33,7 +33,7 @@ public static CmdlineRemoteProto.Message.ControllerMessage createForceCompileReq
                                                                                        Collection<String> paths,
                                                                                        final Map<String, String> userData,
                                                                                        final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals,
-                                                                                       final CmdlineRemoteProto.Message.ControllerMessage.FSEvent event) {
+                                                                                       final @Nullable CmdlineRemoteProto.Message.ControllerMessage.FSEvent event) {
     return createBuildParametersMessage(CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.Type.FORCED_COMPILATION, project,
                                         scopes, userData, paths, globals, event);
   }
@@ -63,7 +63,7 @@ public static TargetTypeBuildScope createAllTargetsScope(BuildTargetType<?> type
 
   private static CmdlineRemoteProto.Message.ControllerMessage createBuildParametersMessage(CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.Type buildType,
                                                                                           String project,
-                                                                                          List<CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope> scopes,
+                                                                                          List<TargetTypeBuildScope> scopes,
                                                                                           Map<String, String> userData,
                                                                                           Collection<String> paths,
                                                                                           final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals,
@@ -99,7 +99,7 @@ public static CmdlineRemoteProto.Message.KeyValuePair createPair(String key, Str
   }
 
 
-  public static CmdlineRemoteProto.Message.Failure createFailure(String description, Throwable cause) {
+  public static CmdlineRemoteProto.Message.Failure createFailure(String description, @Nullable Throwable cause) {
     final CmdlineRemoteProto.Message.Failure.Builder builder = CmdlineRemoteProto.Message.Failure.newBuilder();
     builder.setDescription(description);
     if (cause != null) {"
6236c422615cfe33795267214077551f3d9ffa6f,camel,CAMEL-1977: Http based components should filter- out camel internal headers.--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@814567 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/camel,"diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java
index a32be75c50c52..37e81e5c902f3 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java
@@ -45,6 +45,7 @@ protected void initialize() {
         setLowerCase(true);
         
         // filter headers begin with ""Camel"" or ""org.apache.camel""
-        setOutFilterPattern(""(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*"");
+        // must ignore case for Http based transports
+        setOutFilterPattern(""(?i)(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*"");
     }
 }
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
new file mode 100644
index 0000000000000..40861c7fcc891
--- /dev/null
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class HttpFilterCamelHeadersTest extends CamelTestSupport {
+
+    @Test
+    public void testFilterCamelHeaders() throws Exception {
+        Exchange out = template.send(""http://localhost:9090/test/filter"", new Processor() {
+            public void process(Exchange exchange) throws Exception {
+                exchange.getIn().setBody(""Claus"");
+                exchange.getIn().setHeader(""bar"", 123);
+            }
+        });
+
+        assertNotNull(out);
+        assertEquals(""Hi Claus"", out.getOut().getBody(String.class));
+
+        // there should be no internal Camel headers
+        // except for the response code
+        Map<String, Object> headers = out.getOut().getHeaders();
+        for (String key : headers.keySet()) {
+            if (!key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_CODE)) {
+                assertTrue(""Should not contain any Camel internal headers"", !key.toLowerCase().startsWith(""camel""));
+            } else {
+                assertEquals(200, headers.get(Exchange.HTTP_RESPONSE_CODE));
+            }
+        }
+    }
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry jndi = super.createRegistry();
+        jndi.bind(""foo"", new MyFooBean());
+        return jndi;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from(""jetty:http://localhost:9090/test/filter"").beanRef(""foo"");
+            }
+        };
+    }
+
+    public static class MyFooBean {
+
+        public String hello(String name) {
+            return ""Hi "" + name;
+        }
+    }
+}"
e931ef7e6e360b1a89e3f0d97fbc8332852b8dcd,intellij-community,move suppress/settings intention down- (IDEA-72320 )--,c,https://github.com/JetBrains/intellij-community,"diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/emptyIntention/LowPriority.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/emptyIntention/LowPriority.java
new file mode 100644
index 0000000000000..51882b4824e92
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/emptyIntention/LowPriority.java
@@ -0,0 +1,6 @@
+class Test {
+  void method() {
+    final String i = """";
+    i = ""<caret>"";
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EmptyIntentionInspectionQuickFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EmptyIntentionInspectionQuickFixTest.java
index 3381bec67ed7f..f1d7457625e91 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EmptyIntentionInspectionQuickFixTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EmptyIntentionInspectionQuickFixTest.java
@@ -4,6 +4,7 @@
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.codeInspection.defUse.DefUseInspection;
 import com.intellij.psi.JavaElementVisitor;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiLiteralExpression;
@@ -26,7 +27,7 @@ protected String getBasePath() {
 
   @Override
   protected LocalInspectionTool[] configureLocalInspectionTools() {
-    return new LocalInspectionTool[]{new LocalInspectionTool() {
+    return new LocalInspectionTool[]{new DefUseInspection(), new LocalInspectionTool() {
       @Override
       @Nls
       @NotNull
@@ -74,4 +75,26 @@ public void testX() throws Exception {
     }
     assertEquals(1, emptyActions.size());
   }
+
+  public void testLowPriority() throws Exception {
+    configureByFile(getBasePath() + ""/LowPriority.java"");
+    List<IntentionAction> emptyActions = getAvailableActions();
+    int i = 0;
+    for(;i < emptyActions.size(); i++) {
+      final IntentionAction intentionAction = emptyActions.get(i);
+      if (""Make 'i' not final"".equals(intentionAction.getText())) {
+        break;
+      }
+      if (intentionAction instanceof EmptyIntentionAction) {
+        fail(""Low priority action prior to quick fix"");
+      }
+    }
+    assertTrue(i < emptyActions.size());
+    for (; i < emptyActions.size(); i++) {
+      if (emptyActions.get(i) instanceof EmptyIntentionAction) {
+        return;
+      }
+    }
+    fail(""Missed inspection setting action"");
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java
index 8808e65288f17..f74376b27b1d0 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java
@@ -29,7 +29,7 @@
  * User: anna
  * Date: May 11, 2005
  */
-public final class EmptyIntentionAction implements IntentionAction{
+public final class EmptyIntentionAction implements IntentionAction, LowPriorityAction{
   private final String myName;
 
   public EmptyIntentionAction(@NotNull String name) {"
ac93bc54a2c1a7b17d3a0b57fc9a24ec9d334c78,Delta Spike,"DELTASPIKE-289 WindowContext cleanup
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java
index fbd585cdb..14663c5af 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java
@@ -30,7 +30,8 @@
  * session as &#064;SessionScoped bean.
  * </p>
  * <p>Every WindowContext is uniquely identified via a
- * 'windowId'. Each Thread is associated with at most
+ * 'windowId' inside the current Session.
+ * Each Thread is associated with at most
  * one single windowId at a time. The {@link WindowContext}
  * is the interface which allows resolving the current <i>windowId</i>
  * associated with this very Thread.</p>
@@ -47,21 +48,12 @@ public interface WindowContext
      * If no WindowContext exists with the very windowId we will create a new one.
      * @param windowId
      */
-    void activateWindowContext(String windowId);
+    void activateWindow(String windowId);
 
     /**
-     * close the WindowContext with the currently activated windowId for the very Thread.
+     * close the WindowContext with the given windowId.
      * @return <code>true</code> if any did exist, <code>false</code> otherwise
      */
-    boolean closeCurrentWindowContext();
-
-
-    /**
-     * Close all WindowContexts which are managed by the WindowContextManager.
-     * This is necessary when the session gets closed down or the application closes.
-     * @return
-     */
-    void destroy();
-
+    boolean closeWindow(String windowId);
 
 }
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java
index 583faf80c..e30931ca2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java
@@ -154,9 +154,11 @@ public void destroyAllActive()
     }
 
     /**
-     * destroys all the Contextual Instances in the specified ContextualStorage.
+     * Destroys all the Contextual Instances in the specified ContextualStorage.
+     * This is a static method to allow various holder objects to cleanup
+     * properly in &#064;PreDestroy.
      */
-    public void destroyAllActive(ContextualStorage storage)
+    public static void destroyAllActive(ContextualStorage storage)
     {
         Map<Object, ContextualInstanceInfo<?>> contextMap = storage.getStorage();
         for (Map.Entry<Object, ContextualInstanceInfo<?>> entry : contextMap.entrySet())
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
index d51342f41..8acd0e663 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
@@ -18,12 +18,14 @@
  */
 package org.apache.deltaspike.core.impl.scope.window;
 
+import javax.annotation.PreDestroy;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.spi.BeanManager;
 import java.io.Serializable;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.deltaspike.core.util.context.AbstractContext;
 import org.apache.deltaspike.core.util.context.ContextualStorage;
 
 /**
@@ -41,6 +43,7 @@ public class WindowBeanHolder implements Serializable
      */
     private volatile Map<String, ContextualStorage> storageMap = new ConcurrentHashMap<String, ContextualStorage>();
 
+    //X TODO review usage
     public Map<String, ContextualStorage> getStorageMap()
     {
         return storageMap;
@@ -86,4 +89,18 @@ public Map<String, ContextualStorage> forceNewStorage()
         storageMap = new ConcurrentHashMap<String, ContextualStorage>();
         return oldStorageMap;
     }
+
+    @PreDestroy
+    public void destroyBeans()
+    {
+        // we replace the old windowBeanHolder beans with a new storage Map
+        // an afterwards destroy the old Beans without having to care about any syncs.
+        Map<String, ContextualStorage> oldWindowContextStorages = forceNewStorage();
+
+        for (ContextualStorage contextualStorage : oldWindowContextStorages.values())
+        {
+            AbstractContext.destroyAllActive(contextualStorage);
+        }
+
+    }
 }
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
index f20d02fe1..e9aa32661 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
@@ -23,8 +23,6 @@
 import javax.enterprise.inject.spi.BeanManager;
 
 import java.lang.annotation.Annotation;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.deltaspike.core.api.scope.WindowScoped;
 import org.apache.deltaspike.core.spi.scope.window.WindowContext;
@@ -38,13 +36,18 @@
 public class WindowContextImpl extends AbstractContext implements WindowContext
 {
     /**
-     * all the {@link WindowContext}s which are active in this very Session.
+     * Holds the currently active windowId of each Request
      */
-    private Map<String, WindowContext> windowContexts = new ConcurrentHashMap<String, WindowContext>();
-
     private WindowIdHolder windowIdHolder;
+
+    /**
+     * Contains the stored WindowScoped contextual instances.
+     */
     private WindowBeanHolder windowBeanHolder;
 
+    /**
+     * needed for serialisation and passivationId
+     */
     private BeanManager beanManager;
 
 
@@ -55,8 +58,20 @@ public WindowContextImpl(BeanManager beanManager)
         this.beanManager = beanManager;
     }
 
+    /**
+     * We need to pass the session scoped windowbean holder and the
+     * requestscoped windowIdHolder in a later phase because
+     * getBeans is only allowed from AfterDeploymentValidation onwards.
+     */
+    void initWindowContext(WindowBeanHolder windowBeanHolder, WindowIdHolder windowIdHolder)
+    {
+        this.windowBeanHolder = windowBeanHolder;
+        this.windowIdHolder = windowIdHolder;
+    }
+
+
     @Override
-    public void activateWindowContext(String windowId)
+    public void activateWindow(String windowId)
     {
         windowIdHolder.setWindowId(windowId);
     }
@@ -68,16 +83,15 @@ public String getCurrentWindowId()
     }
 
     @Override
-    public boolean closeCurrentWindowContext()
+    public boolean closeWindow(String windowId)
     {
-        String windowId = windowIdHolder.getWindowId();
         if (windowId == null)
         {
             return false;
         }
 
-        WindowContext windowContext = windowContexts.get(windowId);
-        if (windowContext == null)
+        ContextualStorage windowStorage = windowBeanHolder.getContextualStorage(beanManager, windowId);
+        if (windowStorage == null)
         {
             return false;
         }
@@ -85,19 +99,6 @@ public boolean closeCurrentWindowContext()
         return true;
     }
 
-    @Override
-    public synchronized void destroy()
-    {
-        // we replace the old windowBeanHolder beans with a new storage Map
-        // an afterwards destroy the old Beans without having to care about any syncs.
-        Map<String, ContextualStorage> oldWindowContextStorages = windowBeanHolder.forceNewStorage();
-
-        for (ContextualStorage contextualStorage : oldWindowContextStorages.values())
-        {
-            destroyAllActive(contextualStorage);
-        }
-    }
-
     @Override
     protected ContextualStorage getContextualStorage(boolean createIfNotExist)
     {
@@ -127,9 +128,4 @@ public boolean isActive()
         return windowId != null;
     }
 
-    void initWindowContext(WindowBeanHolder windowBeanHolder, WindowIdHolder windowIdHolder)
-    {
-        this.windowBeanHolder = windowBeanHolder;
-        this.windowIdHolder = windowIdHolder;
-    }
 }
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
index 68408fda5..39640b8d4 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
@@ -68,14 +68,14 @@ public void testWindowScoedBean()
         Assert.assertNotNull(someWindowScopedBean);
 
         {
-            windowContext.activateWindowContext(""window1"");
+            windowContext.activateWindow(""window1"");
             someWindowScopedBean.setValue(""Hans"");
             Assert.assertEquals(""Hans"", someWindowScopedBean.getValue());
         }
 
         // now we switch it away to another 'window'
         {
-            windowContext.activateWindowContext(""window2"");
+            windowContext.activateWindow(""window2"");
             Assert.assertNull(someWindowScopedBean.getValue());
             someWindowScopedBean.setValue(""Karl"");
             Assert.assertEquals(""Karl"", someWindowScopedBean.getValue());
@@ -83,7 +83,7 @@ public void testWindowScoedBean()
 
         // and now back to the first window
         {
-            windowContext.activateWindowContext(""window1"");
+            windowContext.activateWindow(""window1"");
 
             // which must still contain the old value
             Assert.assertEquals(""Hans"", someWindowScopedBean.getValue());
@@ -91,7 +91,7 @@ public void testWindowScoedBean()
 
         // and again back to the second window
         {
-            windowContext.activateWindowContext(""window2"");
+            windowContext.activateWindow(""window2"");
 
             // which must still contain the old value of the 2nd window
             Assert.assertEquals(""Karl"", someWindowScopedBean.getValue());"
a035e9fd8a5bde10c26338d7b23f75dbf59f1352,drools,JBRULES-2121: JavaDialect isn't creating unique ids-  - fixed name that is checked--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@26929 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java b/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
index 8d9bf344fe1..e6a9f723ae8 100644
--- a/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
+++ b/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
@@ -721,7 +721,7 @@ public static String getUniqueLegalName(final String packageName,
 
             counter++;
             final String fileName = packageName.replaceAll( ""\\."",
-                                                            ""/"" ) + newName + ""_"" + counter + ext;
+                                                            ""/"" ) + ""/"" + newName + ""_"" + counter + ""."" + ext;
 
             //MVEL:test null to Fix failing test on org.drools.rule.builder.dialect.mvel.MVELConsequenceBuilderTest.testImperativeCodeError()
             exists = src != null && src.isAvailable( fileName );"
01e706466e561557d8591b3031cd85ae39b0559a,intellij-community,gradle: correctly set TestModuleProperties for- modules containing '-' in names (IDEA-151590)--,c,https://github.com/JetBrains/intellij-community,"diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java
index 4179681ab59ba..c2c06d2180435 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java
@@ -3,7 +3,6 @@
 import com.intellij.ide.highlighter.ModuleFileType;
 import com.intellij.openapi.externalSystem.model.ProjectSystemId;
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -58,7 +57,7 @@ protected ModuleData(@NotNull String id,
                        @NotNull String internalName,
                        @NotNull String moduleFileDirectoryPath,
                        @NotNull String externalConfigPath) {
-    super(owner, externalName, FileUtil.sanitizeFileName(internalName));
+    super(owner, externalName, internalName);
     myId = id;
     myModuleTypeId = typeId;
     myExternalConfigPath = externalConfigPath;
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
index 2a7f6b2eb6c25..9f67df07d6893 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
@@ -234,8 +234,8 @@ public DataNode<ModuleData> createModule(@NotNull IdeaModule gradleModule, @NotN
   }
 
   @NotNull
-  public String getInternalModuleName(@NotNull IdeaModule gradleModule, @NotNull String sourceSetName) {
-    return gradleModule.getName() + ""_"" + sourceSetName;
+  private static String getInternalModuleName(@NotNull IdeaModule gradleModule, @NotNull String sourceSetName) {
+    return FileUtil.sanitizeFileName(gradleModule.getName() + ""_"" + sourceSetName);
   }
 
   @Override
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
index c28a1745846c8..88c0cb575d438 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
@@ -59,6 +59,20 @@ public void testTestModuleProperties() throws Exception {
     assertSame(productionModule, testModuleProperties.getProductionModule());
   }
 
+  @Test
+  public void testTestModulePropertiesForModuleWithHyphenInName() throws Exception {
+    createSettingsFile(""rootProject.name='my-project'"");
+    importProject(
+      ""apply plugin: 'java'""
+    );
+
+    assertModules(""my-project"", ""my_project_main"", ""my_project_test"");
+
+    final Module testModule = getModule(""my_project_test"");
+    TestModuleProperties testModuleProperties = TestModuleProperties.getInstance(testModule);
+    assertEquals(""my_project_main"", testModuleProperties.getProductionModuleName());
+  }
+
   @Test
   public void testInheritProjectJdkForModules() throws Exception {
     importProject("
663575068c45608bfd45348ec98d1a26834cbb51,tapiji,"Cleans up build properties and plugin description files.

Based on previous refactorings, build properties got out-of-sync with the plug-in content. This change also cleans warnings from `plugin.xml` files.
(cherry picked from commit 9ae85d634223cec5c208e29c63b81c773fccf0be)
",p,https://github.com/tapiji/tapiji,"diff --git a/org.eclipse.babel.tapiji.tools.core.ui/build.properties b/org.eclipse.babel.tapiji.tools.core.ui/build.properties
index 285b8bf4..f48d8dca 100644
--- a/org.eclipse.babel.tapiji.tools.core.ui/build.properties
+++ b/org.eclipse.babel.tapiji.tools.core.ui/build.properties
@@ -3,4 +3,10 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/
+               icons/,\
+               about.html,\
+               bin/,\
+               epl-v10.html
+src.includes = icons/,\
+               epl-v10.html,\
+               about.html
diff --git a/org.eclipse.babel.tapiji.tools.core/build.properties b/org.eclipse.babel.tapiji.tools.core/build.properties
index 58be59e2..d9a05cb6 100644
--- a/org.eclipse.babel.tapiji.tools.core/build.properties
+++ b/org.eclipse.babel.tapiji.tools.core/build.properties
@@ -6,10 +6,8 @@ bin.includes = plugin.xml,\
                about.html,\
                epl-v10.html,\
                bin/,\
-               src/,\
                resourcebundle.jar
-src.includes = src/,\
-               schema/,\
+src.includes = schema/,\
                about.html,\
                epl-v10.html
 jars.compile.order = .,\
diff --git a/org.eclipse.babel.tapiji.tools.java.ui/build.properties b/org.eclipse.babel.tapiji.tools.java.ui/build.properties
index 5435750f..f28f57e2 100644
--- a/org.eclipse.babel.tapiji.tools.java.ui/build.properties
+++ b/org.eclipse.babel.tapiji.tools.java.ui/build.properties
@@ -3,6 +3,8 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               epl-v10.html
-src.includes = src/,\
-               epl-v10.html
+               epl-v10.html,\
+               about.html,\
+               bin/
+src.includes = epl-v10.html,\
+               about.html
diff --git a/org.eclipse.babel.tapiji.tools.java.ui/plugin.xml b/org.eclipse.babel.tapiji.tools.java.ui/plugin.xml
index ba577346..666fd7e0 100644
--- a/org.eclipse.babel.tapiji.tools.java.ui/plugin.xml
+++ b/org.eclipse.babel.tapiji.tools.java.ui/plugin.xml
@@ -3,9 +3,9 @@
 <plugin>
    <extension
          point=""org.eclipse.babel.tapiji.tools.core.builderExtension"">
-      <i18nResourceAuditor
+      <i18nAuditor
             class=""org.eclipse.babel.tapiji.tools.java.ui.JavaResourceAuditor"">
-      </i18nResourceAuditor>
+      </i18nAuditor>
    </extension>
    <extension
          point=""org.eclipse.jdt.ui.javaEditorTextHovers"">
diff --git a/org.eclipse.babel.tapiji.tools.java/build.properties b/org.eclipse.babel.tapiji.tools.java/build.properties
index e9863e28..8971f49e 100644
--- a/org.eclipse.babel.tapiji.tools.java/build.properties
+++ b/org.eclipse.babel.tapiji.tools.java/build.properties
@@ -2,4 +2,8 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               epl-v10.html,\
+               about.html,\
+               bin/
+src.includes = epl-v10.html,\
+               about.html
diff --git a/org.eclipse.babel.tapiji.tools.rbmanager/build.properties b/org.eclipse.babel.tapiji.tools.rbmanager/build.properties
index f176c838..030c8540 100644
--- a/org.eclipse.babel.tapiji.tools.rbmanager/build.properties
+++ b/org.eclipse.babel.tapiji.tools.rbmanager/build.properties
@@ -2,9 +2,13 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                bin/,\
-               icons/
+               icons/,\
+               epl-v10.html,\
+               about.html,\
+               plugin.xml
 src.includes = icons/,\
-               src/,\
-               bin/
\ No newline at end of file
+               bin/,\
+               epl-v10.html,\
+               about.html
+"
3990e8b478b1d958479c173c74946e38360cfd17,hadoop,Merge r1503933 from trunk to branch-2 for YARN-513.- Create common proxy client for communicating with RM (Xuan Gong & Jian He via- bikas)--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503935 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 65d19bff9d839..4d6cb00b23eca 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -465,6 +465,9 @@ Release 2.1.0-beta - 2013-07-02
     YARN-521. Augment AM - RM client module to be able to request containers
     only at specific locations (Sandy Ryza via bikas)
 
+    YARN-513. Create common proxy client for communicating with RM. (Xuan Gong
+    & Jian He via bikas)
+
   OPTIMIZATIONS
 
     YARN-512. Log aggregation root directory check is more expensive than it
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 44c35c3d58b28..b14e65225200d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -655,17 +655,17 @@ public class YarnConfiguration extends Configuration {
   public static final long DEFAULT_NM_PROCESS_KILL_WAIT_MS =
       2000;
 
-  /** Max time to wait to establish a connection to RM when NM starts
+  /** Max time to wait to establish a connection to RM
    */
-  public static final String RESOURCEMANAGER_CONNECT_WAIT_SECS =
-      NM_PREFIX + ""resourcemanager.connect.wait.secs"";
-  public static final int DEFAULT_RESOURCEMANAGER_CONNECT_WAIT_SECS =
+  public static final String RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS =
+      RM_PREFIX + ""resourcemanager.connect.max.wait.secs"";
+  public static final int DEFAULT_RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS =
       15*60;
 
-  /** Time interval between each NM attempt to connect to RM
+  /** Time interval between each attempt to connect to RM
    */
   public static final String RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS =
-      NM_PREFIX + ""resourcemanager.connect.retry_interval.secs"";
+      RM_PREFIX + ""resourcemanager.connect.retry_interval.secs"";
   public static final long DEFAULT_RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS
       = 30;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java
new file mode 100644
index 0000000000000..f70b44ce3a8db
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java
@@ -0,0 +1,65 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an ""AS IS"" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.client;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+
+public class ClientRMProxy<T> extends RMProxy<T>{
+
+  private static final Log LOG = LogFactory.getLog(ClientRMProxy.class);
+
+  public static <T> T createRMProxy(final Configuration conf,
+      final Class<T> protocol) throws IOException {
+    InetSocketAddress rmAddress = getRMAddress(conf, protocol);
+    return createRMProxy(conf, protocol, rmAddress);
+  }
+
+  private static InetSocketAddress getRMAddress(Configuration conf, Class<?> protocol) {
+    if (protocol == ApplicationClientProtocol.class) {
+      return conf.getSocketAddr(YarnConfiguration.RM_ADDRESS,
+          YarnConfiguration.DEFAULT_RM_ADDRESS,
+          YarnConfiguration.DEFAULT_RM_PORT);
+    } else if (protocol == ResourceManagerAdministrationProtocol.class) {
+      return conf.getSocketAddr(
+          YarnConfiguration.RM_ADMIN_ADDRESS,
+          YarnConfiguration.DEFAULT_RM_ADMIN_ADDRESS,
+          YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
+    } else if (protocol == ApplicationMasterProtocol.class) {
+      return conf.getSocketAddr(
+          YarnConfiguration.RM_SCHEDULER_ADDRESS,
+          YarnConfiguration.DEFAULT_RM_SCHEDULER_ADDRESS,
+          YarnConfiguration.DEFAULT_RM_SCHEDULER_PORT);
+    } else {
+      String message = ""Unsupported protocol found when creating the proxy "" +
+          ""connection to ResourceManager: "" +
+          ((protocol != null) ? protocol.getClass().getName() : ""null"");
+      LOG.error(message);
+      throw new IllegalStateException(message);
+    }
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java
index e8dca61d32a0b..22d80c6e8d90b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java
@@ -19,7 +19,6 @@
 package org.apache.hadoop.yarn.client.api;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Set;
 
@@ -54,25 +53,6 @@ public static YarnClient createYarnClient() {
     return client;
   }
 
-  /**
-   * Create a new instance of YarnClient.
-   */
-  @Public
-  public static YarnClient createYarnClient(InetSocketAddress rmAddress) {
-    YarnClient client = new YarnClientImpl(rmAddress);
-    return client;
-  }
-
-  /**
-   * Create a new instance of YarnClient.
-   */
-  @Public
-  public static YarnClient createYarnClient(String name,
-      InetSocketAddress rmAddress) {
-    YarnClient client = new YarnClientImpl(name, rmAddress);
-    return client;
-  }
-
   @Private
   protected YarnClient(String name) {
     super(name);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
index 0f088a0604b6e..4119a0cb1de7e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.yarn.client.api.impl;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -42,7 +40,6 @@
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.RPC;
-import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
@@ -56,16 +53,16 @@
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
+import org.apache.hadoop.yarn.client.ClientRMProxy;
 import org.apache.hadoop.yarn.client.api.AMRMClient;
+import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest;
 import org.apache.hadoop.yarn.client.api.InvalidContainerRequestException;
 import org.apache.hadoop.yarn.client.api.NMTokenCache;
-import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.ipc.YarnRPC;
 import org.apache.hadoop.yarn.util.RackResolver;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -171,28 +168,11 @@ protected void serviceInit(Configuration conf) throws Exception {
   @Override
   protected void serviceStart() throws Exception {
     final YarnConfiguration conf = new YarnConfiguration(getConfig());
-    final YarnRPC rpc = YarnRPC.create(conf);
-    final InetSocketAddress rmAddress = conf.getSocketAddr(
-        YarnConfiguration.RM_SCHEDULER_ADDRESS,
-        YarnConfiguration.DEFAULT_RM_SCHEDULER_ADDRESS,
-        YarnConfiguration.DEFAULT_RM_SCHEDULER_PORT);
-
-    UserGroupInformation currentUser;
     try {
-      currentUser = UserGroupInformation.getCurrentUser();
+      rmClient = ClientRMProxy.createRMProxy(conf, ApplicationMasterProtocol.class);
     } catch (IOException e) {
       throw new YarnRuntimeException(e);
     }
-
-    // CurrentUser should already have AMToken loaded.
-    rmClient = currentUser.doAs(new PrivilegedAction<ApplicationMasterProtocol>() {
-      @Override
-      public ApplicationMasterProtocol run() {
-        return (ApplicationMasterProtocol) rpc.getProxy(ApplicationMasterProtocol.class, rmAddress,
-            conf);
-      }
-    });
-    LOG.debug(""Connecting to ResourceManager at "" + rmAddress);
     super.serviceStart();
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
index b3b8bdf4316bb..4398359862b06 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
@@ -59,11 +59,12 @@
 import org.apache.hadoop.yarn.api.records.Token;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
 import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
+import org.apache.hadoop.yarn.client.ClientRMProxy;
 import org.apache.hadoop.yarn.client.api.YarnClient;
 import org.apache.hadoop.yarn.client.api.YarnClientApplication;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.hadoop.yarn.ipc.YarnRPC;
+import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.util.Records;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -81,16 +82,7 @@ public class YarnClientImpl extends YarnClient {
   private static final String ROOT = ""root"";
 
   public YarnClientImpl() {
-    this(null);
-  }
-  
-  public YarnClientImpl(InetSocketAddress rmAddress) {
-    this(YarnClientImpl.class.getName(), rmAddress);
-  }
-
-  public YarnClientImpl(String name, InetSocketAddress rmAddress) {
-    super(name);
-    this.rmAddress = rmAddress;
+    super(YarnClientImpl.class.getName());
   }
 
   private static InetSocketAddress getRmAddress(Configuration conf) {
@@ -100,9 +92,7 @@ private static InetSocketAddress getRmAddress(Configuration conf) {
 
   @Override
   protected void serviceInit(Configuration conf) throws Exception {
-    if (this.rmAddress == null) {
-      this.rmAddress = getRmAddress(conf);
-    }
+    this.rmAddress = getRmAddress(conf);
     statePollIntervalMillis = conf.getLong(
         YarnConfiguration.YARN_CLIENT_APP_SUBMISSION_POLL_INTERVAL_MS,
         YarnConfiguration.DEFAULT_YARN_CLIENT_APP_SUBMISSION_POLL_INTERVAL_MS);
@@ -111,12 +101,11 @@ protected void serviceInit(Configuration conf) throws Exception {
 
   @Override
   protected void serviceStart() throws Exception {
-    YarnRPC rpc = YarnRPC.create(getConfig());
-
-    this.rmClient = (ApplicationClientProtocol) rpc.getProxy(
-        ApplicationClientProtocol.class, rmAddress, getConfig());
-    if (LOG.isDebugEnabled()) {
-      LOG.debug(""Connecting to ResourceManager at "" + rmAddress);
+    try {
+      rmClient = ClientRMProxy.createRMProxy(getConfig(),
+            ApplicationClientProtocol.class);
+    } catch (IOException e) {
+      throw new YarnRuntimeException(e);
     }
     super.serviceStart();
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
index 6426fe9dbc77e..11335c0d8f68d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.yarn.client.cli;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 
 import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -31,11 +29,11 @@
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.yarn.client.ClientRMProxy;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.ipc.YarnRPC;
 import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
@@ -164,32 +162,10 @@ private static void printUsage(String cmd) {
     }
   }
 
-  private static UserGroupInformation getUGI(Configuration conf
-  ) throws IOException {
-    return UserGroupInformation.getCurrentUser();
-  }
-
   private ResourceManagerAdministrationProtocol createAdminProtocol() throws IOException {
     // Get the current configuration
     final YarnConfiguration conf = new YarnConfiguration(getConf());
-
-    // Create the client
-    final InetSocketAddress addr = conf.getSocketAddr(
-        YarnConfiguration.RM_ADMIN_ADDRESS,
-        YarnConfiguration.DEFAULT_RM_ADMIN_ADDRESS,
-        YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
-    final YarnRPC rpc = YarnRPC.create(conf);
-    
-    ResourceManagerAdministrationProtocol adminProtocol =
-      getUGI(conf).doAs(new PrivilegedAction<ResourceManagerAdministrationProtocol>() {
-        @Override
-        public ResourceManagerAdministrationProtocol run() {
-          return (ResourceManagerAdministrationProtocol) rpc.getProxy(ResourceManagerAdministrationProtocol.class,
-              addr, conf);
-        }
-      });
-
-    return adminProtocol;
+    return ClientRMProxy.createRMProxy(conf, ResourceManagerAdministrationProtocol.class);
   }
   
   private int refreshQueues() throws IOException, YarnException {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java
new file mode 100644
index 0000000000000..e4493b5a469b9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.client;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.security.PrivilegedAction;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.retry.RetryPolicies;
+import org.apache.hadoop.io.retry.RetryPolicy;
+import org.apache.hadoop.io.retry.RetryProxy;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+import org.apache.hadoop.yarn.ipc.YarnRPC;
+
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
+public class RMProxy<T> {
+
+  private static final Log LOG = LogFactory.getLog(RMProxy.class);
+
+  @SuppressWarnings(""unchecked"")
+  public static <T> T createRMProxy(final Configuration conf,
+      final Class<T> protocol, InetSocketAddress rmAddress) throws IOException {
+    RetryPolicy retryPolicy = createRetryPolicy(conf);
+    T proxy = RMProxy.<T>getProxy(conf, protocol, rmAddress);
+    LOG.info(""Connecting to ResourceManager at "" + rmAddress);
+    return (T) RetryProxy.create(protocol, proxy, retryPolicy);
+  }
+
+  @SuppressWarnings(""unchecked"")
+  protected static <T> T getProxy(final Configuration conf,
+      final Class<T> protocol, final InetSocketAddress rmAddress)
+      throws IOException {
+    return (T) UserGroupInformation.getCurrentUser().doAs(
+      new PrivilegedAction<Object>() {
+
+        @Override
+        public T run() {
+          return (T) YarnRPC.create(conf).getProxy(protocol, rmAddress, conf);
+        }
+      });
+  }
+
+  public static RetryPolicy createRetryPolicy(Configuration conf) {
+    long rmConnectWaitMS =
+        conf.getInt(
+            YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS,
+            YarnConfiguration.DEFAULT_RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS)
+        * 1000;
+    long rmConnectionRetryIntervalMS =
+        conf.getLong(
+            YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS,
+            YarnConfiguration
+            .DEFAULT_RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS)
+        * 1000;
+
+    if (rmConnectionRetryIntervalMS < 0) {
+      throw new YarnRuntimeException(""Invalid Configuration. "" +
+          YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS +
+          "" should not be negative."");
+    }
+
+    boolean waitForEver = (rmConnectWaitMS == -1000);
+
+    if (waitForEver) {
+      return  RetryPolicies.RETRY_FOREVER;
+    } else {
+      if (rmConnectWaitMS < 0) {
+        throw new YarnRuntimeException(""Invalid Configuration. ""
+            + YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS
+            + "" can be -1, but can not be other negative numbers"");
+      }
+
+      // try connect once
+      if (rmConnectWaitMS < rmConnectionRetryIntervalMS) {
+        LOG.warn(YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS
+            + "" is smaller than ""
+            + YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS
+            + "". Only try connect once."");
+        rmConnectWaitMS = 0;
+      }
+    }
+
+    RetryPolicy retryPolicy =
+        RetryPolicies.retryUpToMaximumTimeWithFixedSleep(rmConnectWaitMS,
+            rmConnectionRetryIntervalMS,
+            TimeUnit.MILLISECONDS);
+
+    Map<Class<? extends Exception>, RetryPolicy> exceptionToPolicyMap =
+        new HashMap<Class<? extends Exception>, RetryPolicy>();
+    exceptionToPolicyMap.put(ConnectException.class, retryPolicy);
+    //TO DO: after HADOOP-9576,  IOException can be changed to EOFException
+    exceptionToPolicyMap.put(IOException.class, retryPolicy);
+
+    return RetryPolicies.retryByException(RetryPolicies.TRY_ONCE_THEN_FAIL,
+      exceptionToPolicyMap);
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java
new file mode 100644
index 0000000000000..ef9154fde1b5f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java
@@ -0,0 +1,55 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an ""AS IS"" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.server.api;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.client.RMProxy;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+
+public class ServerRMProxy<T> extends RMProxy<T>{
+
+  private static final Log LOG = LogFactory.getLog(ServerRMProxy.class);
+
+  public static <T> T createRMProxy(final Configuration conf,
+      final Class<T> protocol) throws IOException {
+    InetSocketAddress rmAddress = getRMAddress(conf, protocol);
+    return createRMProxy(conf, protocol, rmAddress);
+  }
+
+  private static InetSocketAddress getRMAddress(Configuration conf, Class<?> protocol) {
+    if (protocol == ResourceTracker.class) {
+      return conf.getSocketAddr(
+        YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
+        YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS,
+        YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_PORT);
+    }
+    else {
+      String message = ""Unsupported protocol found when creating the proxy "" +
+          ""connection to ResourceManager: "" +
+          ((protocol != null) ? protocol.getClass().getName() : ""null"");
+      LOG.error(message);
+      throw new IllegalStateException(message);
+    }
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java
index 396204cf2dbdb..40f6874623fdf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.api.impl.pb.client;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
@@ -41,7 +42,7 @@
 
 import com.google.protobuf.ServiceException;
 
-public class ResourceTrackerPBClientImpl implements ResourceTracker {
+public class ResourceTrackerPBClientImpl implements ResourceTracker, Closeable {
 
 private ResourceTrackerPB proxy;
   
@@ -50,7 +51,14 @@ public ResourceTrackerPBClientImpl(long clientVersion, InetSocketAddress addr, C
     proxy = (ResourceTrackerPB)RPC.getProxy(
         ResourceTrackerPB.class, clientVersion, addr, conf);
   }
-  
+
+  @Override
+  public void close() {
+    if(this.proxy != null) {
+      RPC.stopProxy(this.proxy);
+    }
+  }
+
   @Override
   public RegisterNodeManagerResponse registerNodeManager(
       RegisterNodeManagerRequest request) throws YarnException,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
index 550cdc5a98f4f..b0e71e915633e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.yarn.server.nodemanager;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
+import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -33,6 +33,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -47,9 +48,9 @@
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.ipc.YarnRPC;
 import org.apache.hadoop.yarn.server.api.ResourceManagerConstants;
 import org.apache.hadoop.yarn.server.api.ResourceTracker;
+import org.apache.hadoop.yarn.server.api.ServerRMProxy;
 import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest;
 import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerRequest;
@@ -77,7 +78,6 @@ public class NodeStatusUpdaterImpl extends AbstractService implements
   private NodeId nodeId;
   private long nextHeartBeatInterval;
   private ResourceTracker resourceTracker;
-  private InetSocketAddress rmAddress;
   private Resource totalResource;
   private int httpPort;
   private volatile boolean isStopped;
@@ -91,9 +91,6 @@ public class NodeStatusUpdaterImpl extends AbstractService implements
 
   private final NodeHealthCheckerService healthChecker;
   private final NodeManagerMetrics metrics;
-  private long rmConnectWaitMS;
-  private long rmConnectionRetryIntervalMS;
-  private boolean waitForEver;
 
   private Runnable statusUpdaterRunnable;
   private Thread  statusUpdater;
@@ -110,11 +107,6 @@ public NodeStatusUpdaterImpl(Context context, Dispatcher dispatcher,
 
   @Override
   protected void serviceInit(Configuration conf) throws Exception {
-    this.rmAddress = conf.getSocketAddr(
-        YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
-        YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS,
-        YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_PORT);
-
     int memoryMb = 
         conf.getInt(
             YarnConfiguration.NM_PMEM_MB, YarnConfiguration.DEFAULT_NM_PMEM_MB);
@@ -153,6 +145,7 @@ protected void serviceStart() throws Exception {
     try {
       // Registration has to be in start so that ContainerManager can get the
       // perNM tokens needed to authenticate ContainerTokens.
+      this.resourceTracker = getRMClient();
       registerWithRM();
       super.serviceStart();
       startStatusUpdater();
@@ -167,6 +160,7 @@ protected void serviceStart() throws Exception {
   protected void serviceStop() throws Exception {
     // Interrupt the updater.
     this.isStopped = true;
+    stopRMProxy();
     super.serviceStop();
   }
 
@@ -188,6 +182,13 @@ protected void rebootNodeStatusUpdater() {
     }
   }
 
+  @VisibleForTesting
+  protected void stopRMProxy() {
+    if(this.resourceTracker != null) {
+      RPC.stopProxy(this.resourceTracker);
+    }
+  }
+
   @Private
   protected boolean isTokenKeepAliveEnabled(Configuration conf) {
     return conf.getBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED,
@@ -195,93 +196,22 @@ protected boolean isTokenKeepAliveEnabled(Configuration conf) {
         && UserGroupInformation.isSecurityEnabled();
   }
 
-  protected ResourceTracker getRMClient() {
+  @VisibleForTesting
+  protected ResourceTracker getRMClient() throws IOException {
     Configuration conf = getConfig();
-    YarnRPC rpc = YarnRPC.create(conf);
-    return (ResourceTracker) rpc.getProxy(ResourceTracker.class, rmAddress,
-        conf);
+    return ServerRMProxy.createRMProxy(conf, ResourceTracker.class);
   }
 
   @VisibleForTesting
   protected void registerWithRM() throws YarnException, IOException {
-    Configuration conf = getConfig();
-    rmConnectWaitMS =
-        conf.getInt(
-            YarnConfiguration.RESOURCEMANAGER_CONNECT_WAIT_SECS,
-            YarnConfiguration.DEFAULT_RESOURCEMANAGER_CONNECT_WAIT_SECS)
-        * 1000;
-    rmConnectionRetryIntervalMS =
-        conf.getLong(
-            YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS,
-            YarnConfiguration
-                .DEFAULT_RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS)
-        * 1000;
-
-    if(rmConnectionRetryIntervalMS < 0) {
-      throw new YarnRuntimeException(""Invalid Configuration. "" +
-          YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS +
-          "" should not be negative."");
-    }
-
-    waitForEver = (rmConnectWaitMS == -1000);
-
-    if(! waitForEver) {
-      if(rmConnectWaitMS < 0) {
-          throw new YarnRuntimeException(""Invalid Configuration. "" +
-              YarnConfiguration.RESOURCEMANAGER_CONNECT_WAIT_SECS +
-              "" can be -1, but can not be other negative numbers"");
-      }
-
-      //try connect once
-      if(rmConnectWaitMS < rmConnectionRetryIntervalMS) {
-        LOG.warn(YarnConfiguration.RESOURCEMANAGER_CONNECT_WAIT_SECS
-            + "" is smaller than ""
-            + YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS
-            + "". Only try connect once."");
-        rmConnectWaitMS = 0;
-      }
-    }
-
-    int rmRetryCount = 0;
-    long waitStartTime = System.currentTimeMillis();
-
     RegisterNodeManagerRequest request =
         recordFactory.newRecordInstance(RegisterNodeManagerRequest.class);
     request.setHttpPort(this.httpPort);
     request.setResource(this.totalResource);
     request.setNodeId(this.nodeId);
-    RegisterNodeManagerResponse regNMResponse;
-
-    while(true) {
-      try {
-        rmRetryCount++;
-        LOG.info(""Connecting to ResourceManager at "" + this.rmAddress
-            + "". current no. of attempts is "" + rmRetryCount);
-        this.resourceTracker = getRMClient();
-        regNMResponse =
-            this.resourceTracker.registerNodeManager(request);
-        this.rmIdentifier = regNMResponse.getRMIdentifier();
-        break;
-      } catch(Throwable e) {
-        LOG.warn(""Trying to connect to ResourceManager, "" +
-            ""current no. of failed attempts is ""+rmRetryCount);
-        if(System.currentTimeMillis() - waitStartTime < rmConnectWaitMS
-            || waitForEver) {
-          try {
-            LOG.info(""Sleeping for "" + rmConnectionRetryIntervalMS/1000
-                + "" seconds before next connection retry to RM"");
-            Thread.sleep(rmConnectionRetryIntervalMS);
-          } catch(InterruptedException ex) {
-            //done nothing
-          }
-        } else {
-          String errorMessage = ""Failed to Connect to RM, "" +
-              ""no. of failed attempts is ""+rmRetryCount;
-          LOG.error(errorMessage,e);
-          throw new YarnRuntimeException(errorMessage,e);
-        }
-      }
-    }
+    RegisterNodeManagerResponse regNMResponse =
+        resourceTracker.registerNodeManager(request);
+    this.rmIdentifier = regNMResponse.getRMIdentifier();
     // if the Resourcemanager instructs NM to shutdown.
     if (NodeAction.SHUTDOWN.equals(regNMResponse.getNodeAction())) {
       String message =
@@ -426,8 +356,6 @@ public void run() {
           // Send heartbeat
           try {
             NodeHeartbeatResponse response = null;
-            int rmRetryCount = 0;
-            long waitStartTime = System.currentTimeMillis();
             NodeStatus nodeStatus = getNodeStatusAndUpdateContainersInContext();
             nodeStatus.setResponseId(lastHeartBeatID);
             
@@ -440,31 +368,7 @@ public void run() {
             request
               .setLastKnownNMTokenMasterKey(NodeStatusUpdaterImpl.this.context
                 .getNMTokenSecretManager().getCurrentKey());
-            while (!isStopped) {
-              try {
-                rmRetryCount++;
-                response = resourceTracker.nodeHeartbeat(request);
-                break;
-              } catch (Throwable e) {
-                LOG.warn(""Trying to heartbeat to ResourceManager, ""
-                    + ""current no. of failed attempts is "" + rmRetryCount);
-                if(System.currentTimeMillis() - waitStartTime < rmConnectWaitMS
-                    || waitForEver) {
-                  try {
-                    LOG.info(""Sleeping for "" + rmConnectionRetryIntervalMS/1000
-                        + "" seconds before next heartbeat to RM"");
-                    Thread.sleep(rmConnectionRetryIntervalMS);
-                  } catch(InterruptedException ex) {
-                    //done nothing
-                  }
-                } else {
-                  String errorMessage = ""Failed to heartbeat to RM, "" +
-                      ""no. of failed attempts is ""+rmRetryCount;
-                  LOG.error(errorMessage,e);
-                  throw new YarnRuntimeException(errorMessage,e);
-                }
-              }
-            }
+            response = resourceTracker.nodeHeartbeat(request);
             //get next heartbeat interval from response
             nextHeartBeatInterval = response.getNextHeartBeatInterval();
             updateMasterKeys(response);
@@ -508,11 +412,11 @@ public void run() {
               dispatcher.getEventHandler().handle(
                   new CMgrCompletedAppsEvent(appsToCleanup));
             }
-          } catch (YarnRuntimeException e) {
+          } catch (ConnectException e) {
             //catch and throw the exception if tried MAX wait time to connect RM
             dispatcher.getEventHandler().handle(
                 new NodeManagerEvent(NodeManagerEventType.SHUTDOWN));
-            throw e;
+            throw new YarnRuntimeException(e);
           } catch (Throwable e) {
             // TODO Better error handling. Thread can die with the rest of the
             // NM still running.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/MockNodeStatusUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/MockNodeStatusUpdater.java
index e93778e2987ef..a3e1faf310e54 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/MockNodeStatusUpdater.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/MockNodeStatusUpdater.java
@@ -61,6 +61,10 @@ public MockNodeStatusUpdater(Context context, Dispatcher dispatcher,
   protected ResourceTracker getRMClient() {
     return resourceTracker;
   }
+  @Override
+  protected void stopRMProxy() {
+    return;
+  }
   
   private static class MockResourceTracker implements ResourceTracker {
     private int heartBeatID;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java
index 668b85b6511bd..294c93ed3b84a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java
@@ -107,6 +107,11 @@ protected ResourceTracker getRMClient() {
         return new LocalRMInterface();
       };
 
+          @Override
+          protected void stopRMProxy() {
+            return;
+          }
+
       @Override
       protected void startStatusUpdater() {
         return; // Don't start any updating thread.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
index e17131fd3a1dc..2a3e3d579ca03 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
@@ -41,6 +41,8 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileContext;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.retry.RetryPolicy;
+import org.apache.hadoop.io.retry.RetryProxy;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.service.ServiceOperations;
@@ -53,6 +55,7 @@
 import org.apache.hadoop.yarn.api.records.ContainerStatus;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.client.RMProxy;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.event.Dispatcher;
 import org.apache.hadoop.yarn.event.EventHandler;
@@ -60,9 +63,9 @@
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.ipc.RPCUtil;
 import org.apache.hadoop.yarn.security.ContainerTokenIdentifier;
 import org.apache.hadoop.yarn.server.api.ResourceTracker;
+import org.apache.hadoop.yarn.server.api.ServerRMProxy;
 import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest;
 import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerRequest;
@@ -103,11 +106,17 @@ public class TestNodeStatusUpdater {
   volatile int heartBeatID = 0;
   volatile Throwable nmStartError = null;
   private final List<NodeId> registeredNodes = new ArrayList<NodeId>();
-  private final Configuration conf = createNMConfig();
+  private boolean triggered = false;
+  private Configuration conf;
   private NodeManager nm;
   private boolean containerStatusBackupSuccessfully = true;
   private List<ContainerStatus> completedContainerStatusList = new ArrayList<ContainerStatus>();
 
+  @Before
+  public void setUp() {
+    conf = createNMConfig();
+  }
+
   @After
   public void tearDown() {
     this.registeredNodes.clear();
@@ -274,6 +283,11 @@ public MyNodeStatusUpdater(Context context, Dispatcher dispatcher,
     protected ResourceTracker getRMClient() {
       return resourceTracker;
     }
+
+    @Override
+    protected void stopRMProxy() {
+      return;
+    }
   }
 
   private class MyNodeStatusUpdater2 extends NodeStatusUpdaterImpl {
@@ -290,6 +304,10 @@ protected ResourceTracker getRMClient() {
       return resourceTracker;
     }
 
+    @Override
+    protected void stopRMProxy() {
+      return;
+    }
   }
 
   private class MyNodeStatusUpdater3 extends NodeStatusUpdaterImpl {
@@ -307,7 +325,12 @@ public MyNodeStatusUpdater3(Context context, Dispatcher dispatcher,
     protected ResourceTracker getRMClient() {
       return resourceTracker;
     }
-    
+
+    @Override
+    protected void stopRMProxy() {
+      return;
+    }
+
     @Override
     protected boolean isTokenKeepAliveEnabled(Configuration conf) {
       return true;
@@ -315,21 +338,16 @@ protected boolean isTokenKeepAliveEnabled(Configuration conf) {
   }
 
   private class MyNodeStatusUpdater4 extends NodeStatusUpdaterImpl {
-    public ResourceTracker resourceTracker =
-        new MyResourceTracker(this.context);
+
     private Context context;
-    private long waitStartTime;
     private final long rmStartIntervalMS;
     private final boolean rmNeverStart;
-    private volatile boolean triggered = false;
-    private long durationWhenTriggered = -1;
-
+    public ResourceTracker resourceTracker;
     public MyNodeStatusUpdater4(Context context, Dispatcher dispatcher,
         NodeHealthCheckerService healthChecker, NodeManagerMetrics metrics,
         long rmStartIntervalMS, boolean rmNeverStart) {
       super(context, dispatcher, healthChecker, metrics);
       this.context = context;
-      this.waitStartTime = System.currentTimeMillis();
       this.rmStartIntervalMS = rmStartIntervalMS;
       this.rmNeverStart = rmNeverStart;
     }
@@ -337,25 +355,16 @@ public MyNodeStatusUpdater4(Context context, Dispatcher dispatcher,
     @Override
     protected void serviceStart() throws Exception {
       //record the startup time
-      this.waitStartTime = System.currentTimeMillis();
       super.serviceStart();
     }
 
     @Override
-    protected ResourceTracker getRMClient() {
-      if (!triggered) {
-        long t = System.currentTimeMillis();
-        long duration = t - waitStartTime;
-        if (duration <= rmStartIntervalMS
-            || rmNeverStart) {
-          throw new YarnRuntimeException(""Faking RM start failure as start "" +
-                                  ""delay timer has not expired."");
-        } else {
-          //triggering
-          triggered = true;
-          durationWhenTriggered = duration;
-        }
-      }
+    protected ResourceTracker getRMClient() throws IOException {
+      RetryPolicy retryPolicy = RMProxy.createRetryPolicy(conf);
+      resourceTracker =
+          (ResourceTracker) RetryProxy.create(ResourceTracker.class,
+            new MyResourceTracker6(this.context, rmStartIntervalMS,
+              rmNeverStart), retryPolicy);
       return resourceTracker;
     }
 
@@ -363,37 +372,35 @@ private boolean isTriggered() {
       return triggered;
     }
 
-    private long getWaitStartTime() {
-      return waitStartTime;
-    }
-
-    private long getDurationWhenTriggered() {
-      return durationWhenTriggered;
-    }
-
     @Override
-    public String toString() {
-      return ""MyNodeStatusUpdater4{"" +
-             ""rmNeverStart="" + rmNeverStart +
-             "", triggered="" + triggered +
-             "", duration="" + durationWhenTriggered +
-             "", rmStartIntervalMS="" + rmStartIntervalMS +
-             '}';
+    protected void stopRMProxy() {
+      return;
     }
   }
 
+
+
   private class MyNodeStatusUpdater5 extends NodeStatusUpdaterImpl {
     private ResourceTracker resourceTracker;
+    private Configuration conf;
 
     public MyNodeStatusUpdater5(Context context, Dispatcher dispatcher,
-        NodeHealthCheckerService healthChecker, NodeManagerMetrics metrics) {
+        NodeHealthCheckerService healthChecker, NodeManagerMetrics metrics, Configuration conf) {
       super(context, dispatcher, healthChecker, metrics);
       resourceTracker = new MyResourceTracker5();
+      this.conf = conf;
     }
 
     @Override
     protected ResourceTracker getRMClient() {
-      return resourceTracker;
+      RetryPolicy retryPolicy = RMProxy.createRetryPolicy(conf);
+      return (ResourceTracker) RetryProxy.create(ResourceTracker.class,
+        resourceTracker, retryPolicy);
+    }
+
+    @Override
+    protected void stopRMProxy() {
+      return;
     }
   }
 
@@ -417,15 +424,18 @@ private class MyNodeManager2 extends NodeManager {
     public boolean isStopped = false;
     private NodeStatusUpdater nodeStatusUpdater;
     private CyclicBarrier syncBarrier;
-    public MyNodeManager2 (CyclicBarrier syncBarrier) {
+    private Configuration conf;
+
+    public MyNodeManager2 (CyclicBarrier syncBarrier, Configuration conf) {
       this.syncBarrier = syncBarrier;
+      this.conf = conf;
     }
     @Override
     protected NodeStatusUpdater createNodeStatusUpdater(Context context,
         Dispatcher dispatcher, NodeHealthCheckerService healthChecker) {
       nodeStatusUpdater =
           new MyNodeStatusUpdater5(context, dispatcher, healthChecker,
-                                     metrics);
+                                     metrics, conf);
       return nodeStatusUpdater;
     }
 
@@ -577,7 +587,7 @@ public NodeHeartbeatResponse nodeHeartbeat(NodeHeartbeatRequest request)
               .get(4).getState() == ContainerState.RUNNING
               && request.getNodeStatus().getContainersStatuses().get(4)
                   .getContainerId().getId() == 5);
-          throw new YarnRuntimeException(""Lost the heartbeat response"");
+          throw new java.net.ConnectException(""Lost the heartbeat response"");
         } else if (heartBeatID == 2) {
           Assert.assertEquals(request.getNodeStatus().getContainersStatuses()
               .size(), 7);
@@ -646,7 +656,63 @@ public RegisterNodeManagerResponse registerNodeManager(
     public NodeHeartbeatResponse nodeHeartbeat(NodeHeartbeatRequest request)
         throws YarnException, IOException {
       heartBeatID++;
-      throw RPCUtil.getRemoteException(""NodeHeartbeat exception"");
+      throw new java.net.ConnectException(
+          ""NodeHeartbeat exception"");
+    }
+  }
+
+  private class MyResourceTracker6 implements ResourceTracker {
+
+    private final Context context;
+    private long rmStartIntervalMS;
+    private boolean rmNeverStart;
+    private final long waitStartTime;
+
+    public MyResourceTracker6(Context context, long rmStartIntervalMS,
+        boolean rmNeverStart) {
+      this.context = context;
+      this.rmStartIntervalMS = rmStartIntervalMS;
+      this.rmNeverStart = rmNeverStart;
+      this.waitStartTime = System.currentTimeMillis();
+    }
+
+    @Override
+    public RegisterNodeManagerResponse registerNodeManager(
+        RegisterNodeManagerRequest request) throws YarnException, IOException,
+        IOException {
+      if (System.currentTimeMillis() - waitStartTime <= rmStartIntervalMS
+          || rmNeverStart) {
+        throw new java.net.ConnectException(""Faking RM start failure as start ""
+            + ""delay timer has not expired."");
+      } else {
+        NodeId nodeId = request.getNodeId();
+        Resource resource = request.getResource();
+        LOG.info(""Registering "" + nodeId.toString());
+        // NOTE: this really should be checking against the config value
+        InetSocketAddress expected = NetUtils.getConnectAddress(
+            conf.getSocketAddr(YarnConfiguration.NM_ADDRESS, null, -1));
+        Assert.assertEquals(NetUtils.getHostPortString(expected),
+            nodeId.toString());
+        Assert.assertEquals(5 * 1024, resource.getMemory());
+        registeredNodes.add(nodeId);
+
+        RegisterNodeManagerResponse response = recordFactory
+            .newRecordInstance(RegisterNodeManagerResponse.class);
+        triggered = true;
+        return response;
+      }
+    }
+
+    @Override
+    public NodeHeartbeatResponse nodeHeartbeat(NodeHeartbeatRequest request)
+        throws YarnException, IOException {
+      NodeStatus nodeStatus = request.getNodeStatus();
+      nodeStatus.setResponseId(heartBeatID++);
+
+      NodeHeartbeatResponse nhResponse = YarnServerBuilderUtils.
+          newNodeHeartbeatResponse(heartBeatID, NodeAction.NORMAL, null,
+              null, null, null, 1000L);
+      return nhResponse;
     }
   }
 
@@ -843,8 +909,7 @@ public void testNMConnectionToRM() throws Exception {
     final long connectionRetryIntervalSecs = 1;
     //Waiting for rmStartIntervalMS, RM will be started
     final long rmStartIntervalMS = 2*1000;
-    YarnConfiguration conf = createNMConfig();
-    conf.setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_WAIT_SECS,
+    conf.setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS,
         connectionWaitSecs);
     conf.setLong(YarnConfiguration
         .RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS,
@@ -907,8 +972,6 @@ protected NodeStatusUpdater createUpdater(Context context,
     }
     long duration = System.currentTimeMillis() - waitStartTime;
     MyNodeStatusUpdater4 myUpdater = (MyNodeStatusUpdater4) updater;
-    Assert.assertTrue(""Updater was never started"",
-                      myUpdater.getWaitStartTime()>0);
     Assert.assertTrue(""NM started before updater triggered"",
                       myUpdater.isTriggered());
     Assert.assertTrue(""NM should have connected to RM after ""
@@ -1037,13 +1100,13 @@ public void testNodeStatusUpdaterRetryAndNMShutdown()
     final long connectionWaitSecs = 1;
     final long connectionRetryIntervalSecs = 1;
     YarnConfiguration conf = createNMConfig();
-    conf.setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_WAIT_SECS,
+    conf.setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_SECS,
         connectionWaitSecs);
     conf.setLong(YarnConfiguration
         .RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_SECS,
         connectionRetryIntervalSecs);
     CyclicBarrier syncBarrier = new CyclicBarrier(2);
-    nm = new MyNodeManager2(syncBarrier);
+    nm = new MyNodeManager2(syncBarrier, conf);
     nm.init(conf);
     nm.start();
     try {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
index 83d21e1640721..cfcf7f6445e63 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
@@ -117,6 +117,11 @@ protected ResourceTracker getRMClient() {
       return new LocalRMInterface();
     };
 
+    @Override
+    protected void stopRMProxy() {
+      return;
+    }
+
     @Override
     protected void startStatusUpdater() {
       return; // Don't start any updating thread.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index cc529739dea79..144b111f83072 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -390,6 +390,11 @@ public RegisterNodeManagerResponse registerNodeManager(
             }
           };
         };
+
+        @Override
+        protected void stopRMProxy() {
+          return;
+        }
       };
     };
   }"
83d5b1e6a0280cc78625bacc2d3f7d1676c7385e,kotlin,Supported propagation for subclass of- j.u.Collection and similar classes.--,a,https://github.com/JetBrains/kotlin,"diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java
new file mode 100644
index 0000000000000..cea6587792692
--- /dev/null
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.google.common.collect.*;
+import com.intellij.openapi.util.Pair;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.util.PsiFormatUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.jet.lang.types.JetType;
+import org.jetbrains.jet.lang.types.TypeUtils;
+import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.jet.resolve.DescriptorRenderer;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class JavaToKotlinMethodMap {
+    public static final JavaToKotlinMethodMap INSTANCE = new JavaToKotlinMethodMap();
+
+    private final JavaToKotlinMethodMapGenerated mapContainer = new JavaToKotlinMethodMapGenerated();
+
+    private JavaToKotlinMethodMap() {
+    }
+
+    @NotNull
+    private static Set<ClassDescriptor> getAllSuperClasses(@NotNull ClassDescriptor klass) {
+        Set<JetType> allSupertypes = TypeUtils.getAllSupertypes(klass.getDefaultType());
+        Set<ClassDescriptor> allSuperclasses = Sets.newHashSet();
+        for (JetType supertype : allSupertypes) {
+            ClassDescriptor superclass = TypeUtils.getClassDescriptor(supertype);
+            assert superclass != null;
+            allSuperclasses.add(superclass);
+        }
+        return allSuperclasses;
+    }
+
+    @NotNull
+    public List<FunctionDescriptor> getFunctions(@NotNull PsiMethod psiMethod, @NotNull ClassDescriptor containingClass) {
+        ImmutableCollection<ClassData> classDatas = mapContainer.map.get(psiMethod.getContainingClass().getQualifiedName());
+
+        List<FunctionDescriptor> result = Lists.newArrayList();
+
+        Set<ClassDescriptor> allSuperClasses = getAllSuperClasses(containingClass);
+
+        String serializedPsiMethod = serializePsiMethod(psiMethod);
+        for (ClassData classData : classDatas) {
+            String expectedSerializedFunction = classData.method2Function.get(serializedPsiMethod);
+            if (expectedSerializedFunction == null) continue;
+
+            ClassDescriptor kotlinClass = classData.kotlinClass;
+            if (!allSuperClasses.contains(kotlinClass)) continue;
+
+
+            Collection<FunctionDescriptor> functions =
+                    kotlinClass.getDefaultType().getMemberScope().getFunctions(Name.identifier(psiMethod.getName()));
+
+            for (FunctionDescriptor function : functions) {
+                if (expectedSerializedFunction.equals(serializeFunction(function))) {
+                    result.add(function);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @NotNull
+    public static String serializePsiMethod(@NotNull PsiMethod psiMethod) {
+        String externalName = PsiFormatUtil.getExternalName(psiMethod);
+        assert externalName != null : ""couldn't find external name for "" + psiMethod.getText();
+        return externalName;
+    }
+
+    @NotNull
+    public static String serializeFunction(@NotNull FunctionDescriptor fun) {
+        return DescriptorRenderer.TEXT.render(fun);
+    }
+
+    // used in generated code
+    static Pair<String, String> pair(String a, String b) {
+        return Pair.create(a, b);
+    }
+
+    // used in generated code
+    static void put(
+            ImmutableMultimap.Builder<String, ClassData> builder,
+            String javaFqName,
+            String kotlinQualifiedName,
+            Pair<String, String>... methods2Functions
+    ) {
+        ImmutableMap<String, String> methods2FunctionsMap = pairs2Map(methods2Functions);
+
+        ClassDescriptor kotlinClass;
+        if (kotlinQualifiedName.contains(""."")) { // Map.Entry and MutableMap.MutableEntry
+            String[] kotlinNames = kotlinQualifiedName.split(""\\."");
+            assert kotlinNames.length == 2 : ""unexpected qualified name "" + kotlinQualifiedName;
+
+            ClassDescriptor outerClass = KotlinBuiltIns.getInstance().getBuiltInClassByName(Name.identifier(kotlinNames[0]));
+            kotlinClass = DescriptorUtils.getInnerClassByName(outerClass, kotlinNames[1]);
+            assert kotlinClass != null : ""Class not found: "" + kotlinQualifiedName;
+        }
+        else {
+            kotlinClass = KotlinBuiltIns.getInstance().getBuiltInClassByName(Name.identifier(kotlinQualifiedName));
+        }
+
+        builder.put(javaFqName, new ClassData(kotlinClass, methods2FunctionsMap));
+    }
+
+    private static ImmutableMap<String, String> pairs2Map(Pair<String, String>[] pairs) {
+        ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+        for (Pair<String, String> pair : pairs) {
+            builder.put(pair.first, pair.second);
+        }
+        return builder.build();
+    }
+
+    static class ClassData {
+        @NotNull
+        public final ClassDescriptor kotlinClass;
+        @NotNull
+        public Map<String, String> method2Function;
+
+        public ClassData(@NotNull ClassDescriptor kotlinClass, @NotNull Map<String, String> method2Function) {
+            this.kotlinClass = kotlinClass;
+            this.method2Function = method2Function;
+        }
+    }
+}
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMapGenerated.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMapGenerated.java
new file mode 100644
index 0000000000000..70de02d0f8a10
--- /dev/null
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMapGenerated.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.google.common.collect.ImmutableMultimap;
+
+import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.*;
+
+/* This file is generated by org.jetbrains.jet.generators.GenerateJavaToKotlinMethodMap. DO NOT EDIT! */
+@SuppressWarnings(""unchecked"")
+class JavaToKotlinMethodMapGenerated {
+    final ImmutableMultimap<String, JavaToKotlinMethodMap.ClassData> map;
+    
+    JavaToKotlinMethodMapGenerated() {
+        ImmutableMultimap.Builder<String, JavaToKotlinMethodMap.ClassData> b = ImmutableMultimap.builder();
+        
+        put(b, ""java.lang.String"", ""String"",
+            pair(""java.lang.String int compareTo(java.lang.String)"", ""public open fun compareTo(that : jet.String) : jet.Int defined in jet.String""),            
+            pair(""java.lang.String boolean equals(java.lang.Object)"", ""public final fun equals(other : jet.Any?) : jet.Boolean defined in jet.String""),            
+            pair(""java.lang.String java.lang.String toString()"", ""public open fun toString() : jet.String defined in jet.String"")            
+        );
+        
+        put(b, ""java.lang.CharSequence"", ""CharSequence"",
+            pair(""java.lang.CharSequence java.lang.String toString()"", ""public abstract fun toString() : jet.String defined in jet.CharSequence"")            
+        );
+        
+        put(b, ""java.lang.Throwable"", ""Throwable"",
+            pair(""java.lang.Throwable java.lang.Throwable getCause()"", ""public final fun getCause() : jet.Throwable? defined in jet.Throwable""),            
+            pair(""java.lang.Throwable java.lang.String getMessage()"", ""public final fun getMessage() : jet.String? defined in jet.Throwable""),            
+            pair(""java.lang.Throwable void printStackTrace()"", ""public final fun printStackTrace() : Unit defined in jet.Throwable"")            
+        );
+        
+        put(b, ""java.lang.Comparable"", ""Comparable"",
+            pair(""java.lang.Comparable int compareTo(T)"", ""public abstract fun compareTo(other : T) : jet.Int defined in jet.Comparable"")            
+        );
+        
+        put(b, ""java.lang.Enum"", ""Enum"",
+            pair(""java.lang.Enum java.lang.String name()"", ""public final fun name() : jet.String defined in jet.Enum""),            
+            pair(""java.lang.Enum int ordinal()"", ""public final fun ordinal() : jet.Int defined in jet.Enum"")            
+        );
+        
+        put(b, ""java.lang.Iterable"", ""Iterable"",
+            pair(""java.lang.Iterable java.util.Iterator<T> iterator()"", ""public abstract fun iterator() : jet.Iterator<T> defined in jet.Iterable"")            
+        );
+        
+        put(b, ""java.lang.Iterable"", ""MutableIterable"",
+            pair(""java.lang.Iterable java.util.Iterator<T> iterator()"", ""public abstract fun iterator() : jet.MutableIterator<T> defined in jet.MutableIterable"")            
+        );
+        
+        put(b, ""java.util.Iterator"", ""Iterator"",
+            pair(""java.util.Iterator boolean hasNext()"", ""public abstract fun hasNext() : jet.Boolean defined in jet.Iterator""),            
+            pair(""java.util.Iterator E next()"", ""public abstract fun next() : T defined in jet.Iterator"")            
+        );
+        
+        put(b, ""java.util.Iterator"", ""MutableIterator"",
+            pair(""java.util.Iterator boolean hasNext()"", ""public abstract fun hasNext() : jet.Boolean defined in jet.MutableIterator""),            
+            pair(""java.util.Iterator E next()"", ""public abstract fun next() : T defined in jet.MutableIterator""),            
+            pair(""java.util.Iterator void remove()"", ""public abstract fun remove() : Unit defined in jet.MutableIterator"")            
+        );
+        
+        put(b, ""java.util.Collection"", ""Collection"",
+            pair(""java.util.Collection boolean contains(java.lang.Object)"", ""public abstract fun contains(o : jet.Any?) : jet.Boolean defined in jet.Collection""),            
+            pair(""java.util.Collection boolean containsAll(java.util.Collection<?>)"", ""public abstract fun containsAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.Collection""),            
+            pair(""java.util.Collection boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.Collection""),            
+            pair(""java.util.Collection int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.Collection""),            
+            pair(""java.util.Collection boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.Collection""),            
+            pair(""java.util.Collection java.util.Iterator<E> iterator()"", ""public abstract fun iterator() : jet.Iterator<E> defined in jet.Collection""),            
+            pair(""java.util.Collection int size()"", ""public abstract fun size() : jet.Int defined in jet.Collection""),            
+            pair(""java.util.Collection T[] toArray(T[])"", ""public abstract fun <T> toArray(a : jet.Array<out T>) : jet.Array<T> defined in jet.Collection""),            
+            pair(""java.util.Collection java.lang.Object[] toArray()"", ""public abstract fun toArray() : jet.Array<jet.Any?> defined in jet.Collection"")            
+        );
+        
+        put(b, ""java.util.Collection"", ""MutableCollection"",
+            pair(""java.util.Collection boolean add(E)"", ""public abstract fun add(e : E) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean addAll(java.util.Collection<? extends E>)"", ""public abstract fun addAll(c : jet.Collection<E>) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection void clear()"", ""public abstract fun clear() : Unit defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean contains(java.lang.Object)"", ""public abstract fun contains(o : jet.Any?) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean containsAll(java.util.Collection<?>)"", ""public abstract fun containsAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection java.util.Iterator<E> iterator()"", ""public abstract fun iterator() : jet.MutableIterator<E> defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean remove(java.lang.Object)"", ""public abstract fun remove(o : jet.Any?) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean removeAll(java.util.Collection<?>)"", ""public abstract fun removeAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection boolean retainAll(java.util.Collection<?>)"", ""public abstract fun retainAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableCollection""),            
+            pair(""java.util.Collection int size()"", ""public abstract fun size() : jet.Int defined in jet.MutableCollection""),            
+            pair(""java.util.Collection T[] toArray(T[])"", ""public abstract fun <T> toArray(a : jet.Array<out T>) : jet.Array<T> defined in jet.MutableCollection""),            
+            pair(""java.util.Collection java.lang.Object[] toArray()"", ""public abstract fun toArray() : jet.Array<jet.Any?> defined in jet.MutableCollection"")            
+        );
+        
+        put(b, ""java.util.List"", ""List"",
+            pair(""java.util.List boolean contains(java.lang.Object)"", ""public abstract fun contains(o : jet.Any?) : jet.Boolean defined in jet.List""),            
+            pair(""java.util.List boolean containsAll(java.util.Collection<?>)"", ""public abstract fun containsAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.List""),            
+            pair(""java.util.List boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.List""),            
+            pair(""java.util.List E get(int)"", ""public abstract fun get(index : jet.Int) : E defined in jet.List""),            
+            pair(""java.util.List int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.List""),            
+            pair(""java.util.List int indexOf(java.lang.Object)"", ""public abstract fun indexOf(o : jet.Any?) : jet.Int defined in jet.List""),            
+            pair(""java.util.List boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.List""),            
+            pair(""java.util.List java.util.Iterator<E> iterator()"", ""public abstract fun iterator() : jet.Iterator<E> defined in jet.List""),            
+            pair(""java.util.List int lastIndexOf(java.lang.Object)"", ""public abstract fun lastIndexOf(o : jet.Any?) : jet.Int defined in jet.List""),            
+            pair(""java.util.List java.util.ListIterator<E> listIterator()"", ""public abstract fun listIterator() : jet.ListIterator<E> defined in jet.List""),            
+            pair(""java.util.List java.util.ListIterator<E> listIterator(int)"", ""public abstract fun listIterator(index : jet.Int) : jet.ListIterator<E> defined in jet.List""),            
+            pair(""java.util.List int size()"", ""public abstract fun size() : jet.Int defined in jet.List""),            
+            pair(""java.util.List java.util.List<E> subList(int, int)"", ""public abstract fun subList(fromIndex : jet.Int, toIndex : jet.Int) : jet.List<E> defined in jet.List""),            
+            pair(""java.util.List T[] toArray(T[])"", ""public abstract fun <T> toArray(a : jet.Array<out T>) : jet.Array<T> defined in jet.List""),            
+            pair(""java.util.List java.lang.Object[] toArray()"", ""public abstract fun toArray() : jet.Array<jet.Any?> defined in jet.List"")            
+        );
+        
+        put(b, ""java.util.List"", ""MutableList"",
+            pair(""java.util.List boolean add(E)"", ""public abstract fun add(e : E) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List void add(int, E)"", ""public abstract fun add(index : jet.Int, element : E) : Unit defined in jet.MutableList""),            
+            pair(""java.util.List boolean addAll(int, java.util.Collection<? extends E>)"", ""public abstract fun addAll(index : jet.Int, c : jet.Collection<E>) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List boolean addAll(java.util.Collection<? extends E>)"", ""public abstract fun addAll(c : jet.Collection<E>) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List void clear()"", ""public abstract fun clear() : Unit defined in jet.MutableList""),            
+            pair(""java.util.List boolean contains(java.lang.Object)"", ""public abstract fun contains(o : jet.Any?) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List boolean containsAll(java.util.Collection<?>)"", ""public abstract fun containsAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List E get(int)"", ""public abstract fun get(index : jet.Int) : E defined in jet.MutableList""),            
+            pair(""java.util.List int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.MutableList""),            
+            pair(""java.util.List int indexOf(java.lang.Object)"", ""public abstract fun indexOf(o : jet.Any?) : jet.Int defined in jet.MutableList""),            
+            pair(""java.util.List boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List java.util.Iterator<E> iterator()"", ""public abstract fun iterator() : jet.Iterator<E> defined in jet.MutableList""),            
+            pair(""java.util.List int lastIndexOf(java.lang.Object)"", ""public abstract fun lastIndexOf(o : jet.Any?) : jet.Int defined in jet.MutableList""),            
+            pair(""java.util.List java.util.ListIterator<E> listIterator()"", ""public abstract fun listIterator() : jet.MutableListIterator<E> defined in jet.MutableList""),            
+            pair(""java.util.List java.util.ListIterator<E> listIterator(int)"", ""public abstract fun listIterator(index : jet.Int) : jet.MutableListIterator<E> defined in jet.MutableList""),            
+            pair(""java.util.List E remove(int)"", ""public abstract fun remove(index : jet.Int) : E defined in jet.MutableList""),            
+            pair(""java.util.List boolean remove(java.lang.Object)"", ""public abstract fun remove(o : jet.Any?) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List boolean removeAll(java.util.Collection<?>)"", ""public abstract fun removeAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List boolean retainAll(java.util.Collection<?>)"", ""public abstract fun retainAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableList""),            
+            pair(""java.util.List E set(int, E)"", ""public abstract fun set(index : jet.Int, element : E) : E defined in jet.MutableList""),            
+            pair(""java.util.List int size()"", ""public abstract fun size() : jet.Int defined in jet.MutableList""),            
+            pair(""java.util.List java.util.List<E> subList(int, int)"", ""public abstract fun subList(fromIndex : jet.Int, toIndex : jet.Int) : jet.MutableList<E> defined in jet.MutableList""),            
+            pair(""java.util.List T[] toArray(T[])"", ""public abstract fun <T> toArray(a : jet.Array<out T>) : jet.Array<T> defined in jet.MutableList""),            
+            pair(""java.util.List java.lang.Object[] toArray()"", ""public abstract fun toArray() : jet.Array<jet.Any?> defined in jet.MutableList"")            
+        );
+        
+        put(b, ""java.util.Set"", ""Set"",
+            pair(""java.util.Set boolean contains(java.lang.Object)"", ""public abstract fun contains(o : jet.Any?) : jet.Boolean defined in jet.Set""),            
+            pair(""java.util.Set boolean containsAll(java.util.Collection<?>)"", ""public abstract fun containsAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.Set""),            
+            pair(""java.util.Set boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.Set""),            
+            pair(""java.util.Set int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.Set""),            
+            pair(""java.util.Set boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.Set""),            
+            pair(""java.util.Set java.util.Iterator<E> iterator()"", ""public abstract fun iterator() : jet.Iterator<E> defined in jet.Set""),            
+            pair(""java.util.Set int size()"", ""public abstract fun size() : jet.Int defined in jet.Set""),            
+            pair(""java.util.Set T[] toArray(T[])"", ""public abstract fun <T> toArray(a : jet.Array<out T>) : jet.Array<T> defined in jet.Set""),            
+            pair(""java.util.Set java.lang.Object[] toArray()"", ""public abstract fun toArray() : jet.Array<jet.Any?> defined in jet.Set"")            
+        );
+        
+        put(b, ""java.util.Set"", ""MutableSet"",
+            pair(""java.util.Set boolean add(E)"", ""public abstract fun add(e : E) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean addAll(java.util.Collection<? extends E>)"", ""public abstract fun addAll(c : jet.Collection<E>) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set void clear()"", ""public abstract fun clear() : Unit defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean contains(java.lang.Object)"", ""public abstract fun contains(o : jet.Any?) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean containsAll(java.util.Collection<?>)"", ""public abstract fun containsAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set java.util.Iterator<E> iterator()"", ""public abstract fun iterator() : jet.MutableIterator<E> defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean remove(java.lang.Object)"", ""public abstract fun remove(o : jet.Any?) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean removeAll(java.util.Collection<?>)"", ""public abstract fun removeAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set boolean retainAll(java.util.Collection<?>)"", ""public abstract fun retainAll(c : jet.Collection<jet.Any?>) : jet.Boolean defined in jet.MutableSet""),            
+            pair(""java.util.Set int size()"", ""public abstract fun size() : jet.Int defined in jet.MutableSet""),            
+            pair(""java.util.Set T[] toArray(T[])"", ""public abstract fun <T> toArray(a : jet.Array<out T>) : jet.Array<T> defined in jet.MutableSet""),            
+            pair(""java.util.Set java.lang.Object[] toArray()"", ""public abstract fun toArray() : jet.Array<jet.Any?> defined in jet.MutableSet"")            
+        );
+        
+        put(b, ""java.util.Map"", ""Map"",
+            pair(""java.util.Map boolean containsKey(java.lang.Object)"", ""public abstract fun containsKey(key : jet.Any?) : jet.Boolean defined in jet.Map""),            
+            pair(""java.util.Map boolean containsValue(java.lang.Object)"", ""public abstract fun containsValue(value : jet.Any?) : jet.Boolean defined in jet.Map""),            
+            pair(""java.util.Map java.util.Set<java.util.Map.Entry<K,V>> entrySet()"", ""public abstract fun entrySet() : jet.Set<jet.Map.Entry<K, V>> defined in jet.Map""),            
+            pair(""java.util.Map V get(java.lang.Object)"", ""public abstract fun get(key : jet.Any?) : V? defined in jet.Map""),            
+            pair(""java.util.Map boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.Map""),            
+            pair(""java.util.Map java.util.Set<K> keySet()"", ""public abstract fun keySet() : jet.Set<K> defined in jet.Map""),            
+            pair(""java.util.Map int size()"", ""public abstract fun size() : jet.Int defined in jet.Map""),            
+            pair(""java.util.Map java.util.Collection<V> values()"", ""public abstract fun values() : jet.Collection<V> defined in jet.Map"")            
+        );
+        
+        put(b, ""java.util.Map"", ""MutableMap"",
+            pair(""java.util.Map void clear()"", ""public abstract fun clear() : Unit defined in jet.MutableMap""),            
+            pair(""java.util.Map boolean containsKey(java.lang.Object)"", ""public abstract fun containsKey(key : jet.Any?) : jet.Boolean defined in jet.MutableMap""),            
+            pair(""java.util.Map boolean containsValue(java.lang.Object)"", ""public abstract fun containsValue(value : jet.Any?) : jet.Boolean defined in jet.MutableMap""),            
+            pair(""java.util.Map java.util.Set<java.util.Map.Entry<K,V>> entrySet()"", ""public abstract fun entrySet() : jet.MutableSet<jet.MutableMap.MutableEntry<K, V>> defined in jet.MutableMap""),            
+            pair(""java.util.Map V get(java.lang.Object)"", ""public abstract fun get(key : jet.Any?) : V? defined in jet.MutableMap""),            
+            pair(""java.util.Map boolean isEmpty()"", ""public abstract fun isEmpty() : jet.Boolean defined in jet.MutableMap""),            
+            pair(""java.util.Map java.util.Set<K> keySet()"", ""public abstract fun keySet() : jet.MutableSet<K> defined in jet.MutableMap""),            
+            pair(""java.util.Map V put(K, V)"", ""public abstract fun put(key : K, value : V) : V? defined in jet.MutableMap""),            
+            pair(""java.util.Map void putAll(java.util.Map<? extends K,? extends V>)"", ""public abstract fun putAll(m : jet.Map<out K, out V>) : Unit defined in jet.MutableMap""),            
+            pair(""java.util.Map V remove(java.lang.Object)"", ""public abstract fun remove(key : jet.Any?) : V? defined in jet.MutableMap""),            
+            pair(""java.util.Map int size()"", ""public abstract fun size() : jet.Int defined in jet.MutableMap""),            
+            pair(""java.util.Map java.util.Collection<V> values()"", ""public abstract fun values() : jet.MutableCollection<V> defined in jet.MutableMap"")            
+        );
+        
+        put(b, ""java.util.Map.Entry"", ""Map.Entry"",
+            pair(""java.util.Map.Entry boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.Map.Entry""),            
+            pair(""java.util.Map.Entry K getKey()"", ""public abstract fun getKey() : K defined in jet.Map.Entry""),            
+            pair(""java.util.Map.Entry V getValue()"", ""public abstract fun getValue() : V defined in jet.Map.Entry""),            
+            pair(""java.util.Map.Entry int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.Map.Entry"")            
+        );
+        
+        put(b, ""java.util.Map.Entry"", ""MutableMap.MutableEntry"",
+            pair(""java.util.Map.Entry boolean equals(java.lang.Object)"", ""public abstract fun equals(other : jet.Any?) : jet.Boolean defined in jet.MutableMap.MutableEntry""),            
+            pair(""java.util.Map.Entry K getKey()"", ""public abstract fun getKey() : K defined in jet.MutableMap.MutableEntry""),            
+            pair(""java.util.Map.Entry V getValue()"", ""public abstract fun getValue() : V defined in jet.MutableMap.MutableEntry""),            
+            pair(""java.util.Map.Entry int hashCode()"", ""public abstract fun hashCode() : jet.Int defined in jet.MutableMap.MutableEntry""),            
+            pair(""java.util.Map.Entry V setValue(V)"", ""public abstract fun setValue(value : V) : V defined in jet.MutableMap.MutableEntry"")            
+        );
+        
+        put(b, ""java.util.ListIterator"", ""ListIterator"",
+            pair(""java.util.ListIterator boolean hasNext()"", ""public abstract fun hasNext() : jet.Boolean defined in jet.ListIterator""),            
+            pair(""java.util.ListIterator boolean hasPrevious()"", ""public abstract fun hasPrevious() : jet.Boolean defined in jet.ListIterator""),            
+            pair(""java.util.ListIterator E next()"", ""public abstract fun next() : T defined in jet.ListIterator""),            
+            pair(""java.util.ListIterator int nextIndex()"", ""public abstract fun nextIndex() : jet.Int defined in jet.ListIterator""),            
+            pair(""java.util.ListIterator E previous()"", ""public abstract fun previous() : T defined in jet.ListIterator""),            
+            pair(""java.util.ListIterator int previousIndex()"", ""public abstract fun previousIndex() : jet.Int defined in jet.ListIterator"")            
+        );
+        
+        put(b, ""java.util.ListIterator"", ""MutableListIterator"",
+            pair(""java.util.ListIterator void add(E)"", ""public abstract fun add(e : T) : Unit defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator boolean hasNext()"", ""public abstract fun hasNext() : jet.Boolean defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator boolean hasPrevious()"", ""public abstract fun hasPrevious() : jet.Boolean defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator E next()"", ""public abstract fun next() : T defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator int nextIndex()"", ""public abstract fun nextIndex() : jet.Int defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator E previous()"", ""public abstract fun previous() : T defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator int previousIndex()"", ""public abstract fun previousIndex() : jet.Int defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator void remove()"", ""public abstract fun remove() : Unit defined in jet.MutableListIterator""),            
+            pair(""java.util.ListIterator void set(E)"", ""public abstract fun set(e : T) : Unit defined in jet.MutableListIterator"")            
+        );
+        
+        map = b.build();
+    }
+}
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
index 4eecef9f415d4..238e5343ed568 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
@@ -28,7 +28,10 @@
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.java.CollectionClassMapping;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
+import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap;
+import org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap;
 import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.*;
@@ -50,13 +53,14 @@ public class SignaturesPropagationData {
     private final Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> autoTypeParameterToModified;
 
     public SignaturesPropagationData(
+            @NotNull ClassDescriptor containingClass,
             @NotNull JetType autoReturnType, // type built by JavaTypeTransformer from Java signature and @NotNull annotations
             @NotNull JavaDescriptorResolver.ValueParameterDescriptors autoValueParameters, // descriptors built by parameters resolver
             @NotNull List<TypeParameterDescriptor> autoTypeParameters, // descriptors built by signature resolver
             @NotNull PsiMethodWrapper method,
             @NotNull BindingTrace trace
     ) {
-        superFunctions = getSuperFunctionsForMethod(method, trace);
+        superFunctions = getSuperFunctionsForMethod(method, trace, containingClass);
 
         autoTypeParameterToModified = SignaturesUtil.recreateTypeParametersAndReturnMapping(autoTypeParameters);
 
@@ -187,7 +191,8 @@ public JetType fun(FunctionDescriptor superFunction) {
 
     private static List<FunctionDescriptor> getSuperFunctionsForMethod(
             @NotNull PsiMethodWrapper method,
-            @NotNull BindingTrace trace
+            @NotNull BindingTrace trace,
+            @NotNull ClassDescriptor containingClass
     ) {
         List<FunctionDescriptor> superFunctions = Lists.newArrayList();
         for (HierarchicalMethodSignature superSignature : method.getPsiMethod().getHierarchicalMethodSignature().getSuperSignatures()) {
@@ -196,15 +201,22 @@ private static List<FunctionDescriptor> getSuperFunctionsForMethod(
                 superFunctions.add(((FunctionDescriptor) superFun));
             }
             else {
-                // TODO assert is temporarily disabled
-                // It fails because of bug in IDEA on Mac: it adds invalid roots to JDK classpath and it leads to the problem that
-                // getHierarchicalMethodSignature() returns elements from invalid virtual files
-
-                // Function descriptor can't be find iff superclass is java.lang.Collection or similar (translated to jet.* collections)
-                //assert !JavaToKotlinClassMap.getInstance().mapPlatformClass(
-                //        new FqName(superSignature.getMethod().getContainingClass().getQualifiedName())).isEmpty():
-                //        ""Can't find super function for "" + method.getPsiMethod() + "" defined in ""
-                //        +  method.getPsiMethod().getContainingClass();
+                String fqName = superSignature.getMethod().getContainingClass().getQualifiedName();
+                assert fqName != null;
+                Collection<ClassDescriptor> platformClasses = JavaToKotlinClassMap.getInstance().mapPlatformClass(new FqName(fqName));
+                if (platformClasses.isEmpty()) {
+                    // TODO assert is temporarily disabled
+                    // It fails because of bug in IDEA on Mac: it adds invalid roots to JDK classpath and it leads to the problem that
+                    // getHierarchicalMethodSignature() returns elements from invalid virtual files
+
+                    //assert false : ""Can't find super function for "" + method.getPsiMethod() +
+                    //               "" defined in "" +  method.getPsiMethod().getContainingClass()
+                }
+                else {
+                    List<FunctionDescriptor> funsFromMap =
+                            JavaToKotlinMethodMap.INSTANCE.getFunctions(superSignature.getMethod(), containingClass);
+                    superFunctions.addAll(funsFromMap);
+                }
             }
         }
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index fb1c73aca457c..a528a0577ec0c 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -144,8 +144,8 @@ private SimpleFunctionDescriptor resolveMethodToFunctionDescriptor(
 
         List<FunctionDescriptor> superFunctions;
         if (ownerDescriptor instanceof ClassDescriptor) {
-            SignaturesPropagationData signaturesPropagationData =
-                    new SignaturesPropagationData(returnType, valueParameterDescriptors, methodTypeParameters, method, trace);
+            SignaturesPropagationData signaturesPropagationData = new SignaturesPropagationData(
+                    (ClassDescriptor) ownerDescriptor, returnType, valueParameterDescriptors, methodTypeParameters, method, trace);
             superFunctions = signaturesPropagationData.getSuperFunctions();
 
             returnType = signaturesPropagationData.getModifiedReturnType();
@@ -214,6 +214,9 @@ private static void checkFunctionsOverrideCorrectly(
                     ((ClassDescriptor) functionDescriptor.getContainingDeclaration()).getDefaultType());
             FunctionDescriptor superFunctionSubstituted = superFunction.substitute(substitutor);
 
+            assert superFunctionSubstituted != null :
+                    ""Couldn't substitute super function: "" + superFunction + "", substitutor = "" + substitutor;
+
             OverrideCompatibilityInfo.Result overridableResult =
                     isOverridableBy(superFunctionSubstituted, functionDescriptor).getResult();
             boolean paramsOk = overridableResult == OverrideCompatibilityInfo.Result.OVERRIDABLE;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
index 75e97187252d0..c8d2153ce2534 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
@@ -334,12 +334,17 @@ public JetScope getBuiltInsScope() {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     @NotNull
-    private ClassDescriptor getBuiltInClassByName(@NotNull String simpleName) {
-        ClassifierDescriptor classifier = getBuiltInsScope().getClassifier(Name.identifier(simpleName));
+    public ClassDescriptor getBuiltInClassByName(@NotNull Name simpleName) {
+        ClassifierDescriptor classifier = getBuiltInsScope().getClassifier(simpleName);
         assert classifier instanceof ClassDescriptor : ""Must be a class descriptor "" + simpleName + "", but was "" + classifier;
         return (ClassDescriptor) classifier;
     }
 
+    @NotNull
+    private ClassDescriptor getBuiltInClassByName(@NotNull String simpleName) {
+        return getBuiltInClassByName(Name.identifier(simpleName));
+    }
+
     // Special
 
     @NotNull
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.java b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.java
new file mode 100644
index 0000000000000..d5e36c9d1635b
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.java
@@ -0,0 +1,8 @@
+package test;
+
+import java.util.*;
+
+public interface SubclassOfCollection<E> extends Collection<E> {
+    Iterator<E> iterator();
+
+}
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt
new file mode 100644
index 0000000000000..d4159b0dd5dc3
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt
@@ -0,0 +1,5 @@
+package test
+
+public trait SubclassOfCollection<E>: MutableCollection<E> {
+    override fun iterator() : MutableIterator<E>
+}
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
new file mode 100644
index 0000000000000..c5005631e02fd
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -0,0 +1,17 @@
+namespace test
+
+public abstract trait test.SubclassOfCollection</*0*/ E : jet.Any?> : jet.MutableCollection<E> {
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
+    public abstract override /*1*/ fun iterator(): jet.MutableIterator<E>
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
+    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+}
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java
new file mode 100644
index 0000000000000..0924783402ae3
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java
@@ -0,0 +1,7 @@
+package test;
+
+import java.util.*;
+
+public interface SubclassOfMapEntry<K, V> extends Map.Entry<K, V> {
+    V setValue(V v);
+}
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt
new file mode 100644
index 0000000000000..73127c5cab896
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt
@@ -0,0 +1,5 @@
+package test
+
+public trait SubclassOfMapEntry<K, V>: MutableMap.MutableEntry<K, V> {
+    override fun setValue(p0: V) : V
+}
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
new file mode 100644
index 0000000000000..0c728cfaf3dc9
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -0,0 +1,7 @@
+namespace test
+
+public abstract trait test.SubclassOfMapEntry</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.MutableMap.MutableEntry<K, V> {
+    public abstract override /*1*/ /*fake_override*/ fun getKey(): K
+    public abstract override /*1*/ /*fake_override*/ fun getValue(): V
+    public abstract override /*1*/ fun setValue(/*0*/ p0: V): V
+}
diff --git a/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
index 0f79be88c2f99..aaf74fc13a53b 100644
--- a/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
@@ -18,7 +18,7 @@ public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.Stri
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0: jet.Int): jet.MutableListIterator<jet.String>
     protected final override /*1*/ /*fake_override*/ var modCount: jet.Int
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Int): jet.String?
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Int): jet.String
     public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ p0: jet.Collection<jet.Any?>): jet.Boolean
     protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
     public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0: jet.Collection<jet.Any?>): jet.Boolean
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index 09f489924fed1..cd3dd08bbb775 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -649,6 +649,16 @@ public void testSameProjectionKind() throws Exception {
                     doTest(""compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.java"");
                 }
                 
+                @TestMetadata(""SubclassOfCollection.java"")
+                public void testSubclassOfCollection() throws Exception {
+                    doTest(""compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.java"");
+                }
+                
+                @TestMetadata(""SubclassOfMapEntry.java"")
+                public void testSubclassOfMapEntry() throws Exception {
+                    doTest(""compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java"");
+                }
+                
                 @TestMetadata(""TwoSuperclassesConflictingProjectionKinds.java"")
                 public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
                     doTest(""compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java"");
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index c22111f4f4093..736054fa0d33d 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1539,6 +1539,16 @@ public void testSameProjectionKind() throws Exception {
                         doTestSinglePackage(""compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"");
                     }
                     
+                    @TestMetadata(""SubclassOfCollection.kt"")
+                    public void testSubclassOfCollection() throws Exception {
+                        doTestSinglePackage(""compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"");
+                    }
+                    
+                    @TestMetadata(""SubclassOfMapEntry.kt"")
+                    public void testSubclassOfMapEntry() throws Exception {
+                        doTestSinglePackage(""compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"");
+                    }
+                    
                     @TestMetadata(""TwoSuperclassesConflictingProjectionKinds.kt"")
                     public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
                         doTestSinglePackage(""compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"");
diff --git a/generators/generators.iml b/generators/generators.iml
index a02cc242438e9..06ad1f8bf7f10 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -14,6 +14,7 @@
     <orderEntry type=""module"" module-name=""frontend"" scope=""TEST"" />
     <orderEntry type=""module"" module-name=""frontend.java"" scope=""TEST"" />
     <orderEntry type=""module"" module-name=""injector-generator"" scope=""TEST"" />
+    <orderEntry type=""module"" module-name=""cli"" scope=""TEST"" />
   </component>
 </module>
 
diff --git a/generators/org/jetbrains/jet/generators/GenerateJavaToKotlinMethodMap.java b/generators/org/jetbrains/jet/generators/GenerateJavaToKotlinMethodMap.java
new file mode 100644
index 0000000000000..7cfbc1d08c962
--- /dev/null
+++ b/generators/org/jetbrains/jet/generators/GenerateJavaToKotlinMethodMap.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.generators;
+
+import com.google.common.collect.Lists;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.impl.file.impl.JavaFileManager;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.CompileCompilerDependenciesTest;
+import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.TestJdkKind;
+import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
+import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMapBuilder;
+import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.jet.resolve.DescriptorRenderer;
+import org.jetbrains.jet.utils.Printer;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.serializeFunction;
+import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.serializePsiMethod;
+
+public class GenerateJavaToKotlinMethodMap {
+
+    public static final String BUILTINS_FQNAME_PREFIX = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.getFqName() + ""."";
+
+    public static void main(String[] args) throws IOException {
+        JetCoreEnvironment coreEnvironment = new JetCoreEnvironment(
+                CompileEnvironmentUtil.createMockDisposable(),
+                CompileCompilerDependenciesTest.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK));
+
+        StringBuilder buf = new StringBuilder();
+        Printer printer = new Printer(buf);
+
+        printer.print(FileUtil.loadFile(new File(""injector-generator/copyright.txt"")))
+                .println()
+                .println(""package org.jetbrains.jet.lang.resolve.java;"")
+                .println()
+                .println(""import com.google.common.collect.ImmutableMultimap;"")
+                .println()
+                .println(""import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.*;"")
+                .println()
+                .println(""/* This file is generated by "", GenerateJavaToKotlinMethodMap.class.getName(), "". DO NOT EDIT! */"")
+                .println(""@SuppressWarnings(\""unchecked\"")"")
+                .println(""class JavaToKotlinMethodMapGenerated {"").pushIndent()
+                .println(""final ImmutableMultimap<String, JavaToKotlinMethodMap.ClassData> map;"")
+                .println()
+                .println(""JavaToKotlinMethodMapGenerated() {"").pushIndent()
+                .println(""ImmutableMultimap.Builder<String, JavaToKotlinMethodMap.ClassData> b = ImmutableMultimap.builder();"")
+                .println();
+
+        MyMapBuilder builder = new MyMapBuilder(coreEnvironment.getProject());
+        printer.printWithNoIndent(builder.toString());
+
+        printer.println(""map = b.build();"");
+        printer.popIndent().println(""}"");
+        printer.popIndent().println(""}"");
+
+        //noinspection IOResourceOpenedButNotSafelyClosed
+        FileWriter out =
+                new FileWriter(""compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMapGenerated.java"");
+
+        out.write(buf.toString());
+        out.close();
+    }
+
+    private static class MyMapBuilder extends JavaToKotlinClassMapBuilder {
+        private final Project project;
+        private final StringBuilder buf = new StringBuilder();
+        private final Printer printer = new Printer(buf).pushIndent().pushIndent();
+
+        public MyMapBuilder(@NotNull Project project) {
+            this.project = project;
+            init();
+        }
+
+        @Override
+        protected void register(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) {
+            processClass(javaClass, kotlinDescriptor);
+        }
+
+        @Override
+        protected void register(@NotNull Class<?> javaClass,
+                @NotNull ClassDescriptor kotlinDescriptor,
+                @NotNull ClassDescriptor kotlinMutableDescriptor,
+                @NotNull Direction direction) {
+            processClass(javaClass, kotlinDescriptor);
+            processClass(javaClass, kotlinMutableDescriptor);
+        }
+
+        private void processClass(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinClass) {
+            JavaFileManager javaFileManager = ServiceManager.getService(project, JavaFileManager.class);
+            PsiClass psiClass = javaFileManager.findClass(javaClass.getCanonicalName(), GlobalSearchScope.allScope(project));
+            assert psiClass != null;
+
+            List<Pair<PsiMethod, FunctionDescriptor>> methods2Functions = getClassMethods2Functions(kotlinClass, psiClass);
+            if (!methods2Functions.isEmpty()) {
+                appendBeforeClass(kotlinClass, psiClass);
+                appendClass(methods2Functions);
+                appendAfterClass();
+            }
+        }
+
+        private static List<Pair<PsiMethod, FunctionDescriptor>> getClassMethods2Functions(
+                @NotNull ClassDescriptor kotlinClass,
+                @NotNull PsiClass psiClass
+        ) {
+            PsiMethod[] methods = psiClass.getMethods();
+
+            List<Pair<PsiMethod, FunctionDescriptor>> result = Lists.newArrayList();
+
+            for (DeclarationDescriptor member : kotlinClass.getDefaultType().getMemberScope().getAllDescriptors()) {
+                if (!(member instanceof FunctionDescriptor) || member.getContainingDeclaration() != kotlinClass) {
+                    continue;
+                }
+
+                FunctionDescriptor fun = (FunctionDescriptor) member;
+                PsiMethod foundMethod = findMethod(methods, fun);
+                if (foundMethod != null) {
+                    result.add(Pair.create(foundMethod, fun));
+                }
+            }
+
+            Collections.sort(result, new Comparator<Pair<PsiMethod, FunctionDescriptor>>() {
+                @Override
+                public int compare(Pair<PsiMethod, FunctionDescriptor> pair1, Pair<PsiMethod, FunctionDescriptor> pair2) {
+                    PsiMethod method1 = pair1.first;
+                    PsiMethod method2 = pair2.first;
+
+                    String name1 = method1.getName();
+                    String name2 = method2.getName();
+                    if (!name1.equals(name2)) {
+                        return name1.compareTo(name2);
+                    }
+
+                    String serialized1 = serializePsiMethod(method1);
+                    String serialized2 = serializePsiMethod(method2);
+                    return serialized1.compareTo(serialized2);
+                }
+            });
+            return result;
+        }
+
+        private static boolean match(@NotNull PsiMethod method, @NotNull FunctionDescriptor fun) {
+            // Compare method an function by name and parameters count. For all methods except one (List.remove) it is enough.
+            // If this changes, there will be assertion error in findMethod()
+            if (method.getName().equals(fun.getName().getIdentifier())
+                && method.getParameterList().getParametersCount() == fun.getValueParameters().size()) {
+
+                // ""special case"": remove(Int) and remove(Any?) in MutableList
+                if (method.getName().equals(""remove"") && method.getContainingClass().getName().equals(""List"")) {
+                    String psiType = method.getParameterList().getParameters()[0].getType().getPresentableText();
+                    String jetType = DescriptorRenderer.TEXT.renderTypeWithShortNames(fun.getValueParameters().get(0).getType());
+                    String string = psiType + ""|"" + jetType;
+
+                    return ""int|Int"".equals(string) || ""Object|Any?"".equals(string);
+                }
+
+                return true;
+            }
+            return false;
+        }
+
+        @Nullable
+        private static PsiMethod findMethod(@NotNull PsiMethod[] methods, @NotNull FunctionDescriptor fun) {
+            PsiMethod found = null;
+            for (PsiMethod method : methods) {
+                if (match(method, fun)) {
+                    if (found != null) {
+                        throw new AssertionError(""Duplicate for "" + fun);
+                    }
+
+                    found = method;
+                }
+            }
+
+            return found;
+        }
+
+        private void appendBeforeClass(@NotNull ClassDescriptor kotlinClass, @NotNull PsiClass psiClass) {
+            String psiFqName = psiClass.getQualifiedName();
+            String kotlinFqName = DescriptorUtils.getFQName(kotlinClass).toSafe().getFqName();
+
+            assert kotlinFqName.startsWith(BUILTINS_FQNAME_PREFIX);
+            String kotlinSubQualifiedName = kotlinFqName.substring(BUILTINS_FQNAME_PREFIX.length());
+            printer.println(""put(b, \"""", psiFqName, ""\"", \"""", kotlinSubQualifiedName, ""\"","").pushIndent();
+        }
+
+        private void appendClass(@NotNull List<Pair<PsiMethod, FunctionDescriptor>> methods2Functions) {
+            int index = 0;
+            for (Pair<PsiMethod, FunctionDescriptor> method2Function : methods2Functions) {
+                printer.print(""pair(\"""", serializePsiMethod(method2Function.first), ""\"", \"""", serializeFunction(method2Function.second),
+                              ""\"")"");
+
+                if (index != methods2Functions.size() - 1) {
+                    printer.printWithNoIndent("","");
+                }
+
+                printer.println();
+
+                index++;
+            }
+        }
+
+        private void appendAfterClass() {
+            printer.popIndent().println("");"").println();
+        }
+
+
+        public String toString() {
+            return buf.toString();
+        }
+    }
+
+    private GenerateJavaToKotlinMethodMap() {
+    }
+}
diff --git a/jdk-annotations/java/util/annotations.xml b/jdk-annotations/java/util/annotations.xml
index 3251649264e78..c1f62eced16e3 100644
--- a/jdk-annotations/java/util/annotations.xml
+++ b/jdk-annotations/java/util/annotations.xml
@@ -1,4 +1,10 @@
 <root>
+  <item name='java.util.Dictionary V put(K, V)'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name=""value"" val=""&quot;fun put(key : K, value : V) : V?&quot;""/>
+    </annotation>
+  </item>
+
   <item name='java.util.AbstractList boolean add(E)'>
     <annotation name='jet.runtime.typeinfo.KotlinSignature'>
       <val name=""value"" val=""&quot;fun add(e : E) : Boolean&quot;""/>
@@ -679,12 +685,12 @@
   </item>
   <item name='java.util.AbstractMap java.util.Set<java.util.Map.Entry<K,V>> entrySet()'>
     <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name=""value"" val=""&quot;fun entrySet() : Set&lt;Map.Entry&lt;K, V&gt;&gt;&quot;""/>
+      <val name=""value"" val=""&quot;fun entrySet() : MutableSet&lt;MutableMap.MutableEntry&lt;K, V&gt;&gt;&quot;""/>
     </annotation>
   </item>
   <item name='java.util.AbstractMap java.util.Set<K> keySet()'>
     <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name=""value"" val=""&quot;fun keySet() : Set&lt;K&gt;&quot;""/>
+      <val name=""value"" val=""&quot;fun keySet() : MutableSet&lt;K&gt;&quot;""/>
     </annotation>
   </item>
   <item name='java.util.AbstractMap V put(K, V)'>
@@ -699,7 +705,7 @@
   </item>
   <item name='java.util.AbstractMap java.util.Collection<V> values()'>
     <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name=""value"" val=""&quot;fun values() : Collection&lt;V&gt;&quot;""/>
+      <val name=""value"" val=""&quot;fun values() : MutableCollection&lt;V&gt;&quot;""/>
     </annotation>
   </item>
   <item name='java.util.AbstractSequentialList void add(int, E)'>"
614faccf1d353c3b4835e6df0e6902839d54b5f6,hadoop,YARN-1910. Fixed a race condition in TestAMRMTokens- that causes the test to fail more often on Windows. Contributed by Xuan Gong.- svn merge --ignore-ancestry -c 1586192 ../../trunk/--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586193 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2abb35dfa9b02..188a80035ac85 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -79,6 +79,9 @@ Release 2.4.1 - UNRELEASED
     YARN-1908. Fixed DistributedShell to not fail in secure clusters. (Vinod
     Kumar Vavilapalli and Jian He via vinodkv)
 
+    YARN-1910. Fixed a race condition in TestAMRMTokens that causes the test to
+    fail more often on Windows. (Xuan Gong via vinodkv)
+
 Release 2.4.0 - 2014-04-07 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java
index aa894c5f6a920..64602bd888e27 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java
@@ -48,6 +48,7 @@
 import org.apache.hadoop.yarn.server.resourcemanager.TestAMAuthorization.MyContainerManager;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptContainerFinishedEvent;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.Records;
@@ -63,6 +64,7 @@ public class TestAMRMTokens {
   private static final Log LOG = LogFactory.getLog(TestAMRMTokens.class);
 
   private final Configuration conf;
+  private static final int maxWaitAttempts = 50;
 
   @Parameters
   public static Collection<Object[]> configs() {
@@ -153,6 +155,16 @@ public void testTokenExpiry() throws Exception {
               new RMAppAttemptContainerFinishedEvent(applicationAttemptId,
                   containerStatus));
 
+      // Make sure the RMAppAttempt is at Finished State.
+      // Both AMRMToken and ClientToAMToken have been removed.
+      int count = 0;
+      while (attempt.getState() != RMAppAttemptState.FINISHED
+          && count < maxWaitAttempts) {
+        Thread.sleep(100);
+        count++;
+      }
+      Assert.assertTrue(attempt.getState() == RMAppAttemptState.FINISHED);
+
       // Now simulate trying to allocate. RPC call itself should throw auth
       // exception.
       rpc.stopProxy(rmClient, conf); // To avoid using cached client"
649a65fae047377bf52978ef47f3d50020f1c048,Delta Spike,"DELTASPIKE-277 create a proper unit test and remove unused imports
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
index 2a26c82d4..ca5fca5d6 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
@@ -26,7 +26,6 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import org.apache.deltaspike.core.util.ReflectionUtils;
 import org.apache.deltaspike.jsf.message.JsfMessage;
 
 /**
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
index c01ff4d7d..2e1767ad1 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
@@ -34,9 +34,13 @@
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
+import org.junit.Assert;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 
 
 /**
@@ -76,15 +80,27 @@ public void testViewScopedContext() throws Exception
         //X TODO remove, it's just for debugging the server side:
         //X Thread.sleep(600000L);
 
-/*X
-        WebElement inputField = driver.findElement(By.id(""test:valueInput""));
-        inputField.sendKeys(""23"");
 
-        WebElement button = driver.findElement(By.id(""test:saveButton""));
-        button.click();
+        // check the JSF FacesMessages
+
+        Assert.assertNotNull(ExpectedConditions.presenceOfElementLocated(By.xpath(""id('messages')"")).apply(driver));
+
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+                By.xpath(""id('messages')/ul/li[1]""), ""message with details warnInfo!"").apply(driver));
+
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+                By.xpath(""id('messages')/ul/li[2]""), ""message without detail but parameter errorInfo."").apply(driver));
+
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+                By.xpath(""id('messages')/ul/li[3]""), ""a simple message without a param."").apply(driver));
+
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+                By.xpath(""id('messages')/ul/li[4]""), ""simple message with a string param fatalInfo."").apply(driver));
+
+        // check the free message usage
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+                By.id(""test:valueOutput""), ""a simple message without a param."").apply(driver));
 
-        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""test:valueOutput""), ""23"").apply(driver));
-*/
     }
 
 }"
7b22bc146b318790552aa8ec1ece25a3a06d1316,Valadoc,"Add support for cgraphs

Based on patch by Richard Schwarting

Fixes bug 703688.
",a,https://github.com/GNOME/vala/,"diff --git a/configure.ac b/configure.ac
index 79aa766f38..d4d639055b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,35 @@ AC_SUBST(LIBGEE_LIBS)
 
 
 
+AC_MSG_CHECKING([for CGRAPH])
+valadoc_tmp_LIBADD=""$LIBADD""
+valadoc_tmp_CFLAGS=""$CFLAGGS""
+LIBADD=""$LIBADD $LIBGVC_LIBS""
+CFLAGS=""$CFLAGS $LIBGVC_CFLAGS""
+AC_RUN_IFELSE(
+	[AC_LANG_SOURCE([
+		#include <gvc.h>
+
+		int main(void) {
+			#ifdef WITH_CGRAPH
+				return 0;
+			#else
+				return -1;
+			#endif
+		}
+	])], [
+		AC_MSG_RESULT([yes])
+		VALAFLAGS=""$VALAFLAGS -D WITH_CGRAPH""
+		have_cgraph=yes
+	], [
+		AC_MSG_RESULT([no])
+		have_cgraph=no
+	]
+)
+LIBADD=""$valadoc_tmp_LIBADD""
+CFLAGS=""$valadoc_tmp_CFLAGS""
+AM_CONDITIONAL(HAVE_CGRAPH, test ""$have_cgraph"" = ""yes"")
+
 
 ##
 ## Drivers:
diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index e7c2446290..de82ec1ed2 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -4,6 +4,7 @@ NULL =
 AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\""$(datadir)/valadoc/icons/\"" \
 	-I ../../libvaladoc/ \
+	$(LIBGVC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(NULL)
diff --git a/src/doclets/gtkdoc/Makefile.am b/src/doclets/gtkdoc/Makefile.am
index 66dcc5576f..81e3607533 100644
--- a/src/doclets/gtkdoc/Makefile.am
+++ b/src/doclets/gtkdoc/Makefile.am
@@ -5,6 +5,7 @@ AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\""$(datadir)/valadoc/icons/\"" \
 	-I ../../libvaladoc/ \
 	$(GLIB_CFLAGS) \
+	$(LIBGVC_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(NULL)
 
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 5f3be836e2..7127e1d350 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -4,10 +4,21 @@ NULL =
 AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\""$(datadir)/valadoc/icons/\"" \
 	-I ../../libvaladoc/ \
+	$(LIBGVC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(NULL)
 
+# Without the LIBGVC_CFLAGS, we get 
+# make[5]: Entering directory `/home/richard/.local/src/valadoc/src/doclets/devhelp'
+#  CC       doclet.lo
+# In file included from /usr/include/graphviz/gvc.h:17:0,
+#                  from ../../libvaladoc/valadoc-1.0.h:15,
+#                  from doclet.c:28:
+# /usr/include/graphviz/types.h:49:20: fatal error: cgraph.h: No such file or directory
+#  #include <cgraph.h>
+#                     ^
+# compilation terminated.
 
 
 BUILT_SOURCES = libdoclet.vala.stamp
diff --git a/src/libvaladoc/charts/chart.vala b/src/libvaladoc/charts/chart.vala
index f4b99088c3..03dab30f75 100644
--- a/src/libvaladoc/charts/chart.vala
+++ b/src/libvaladoc/charts/chart.vala
@@ -27,7 +27,9 @@ public class Valadoc.Charts.Chart : Api.Visitor {
 	protected Factory factory;
 
 	static construct {
+		#if !WITH_CGRAPH
 		Gvc.init ();
+		#endif
 	}
 
 	public Chart (Factory factory, Api.Node node) {
diff --git a/src/libvaladoc/charts/chartfactory.vala b/src/libvaladoc/charts/chartfactory.vala
index 6a3351a7c0..c2582ab9f3 100644
--- a/src/libvaladoc/charts/chartfactory.vala
+++ b/src/libvaladoc/charts/chartfactory.vala
@@ -23,7 +23,11 @@
 
 public abstract class Valadoc.Charts.Factory : Object {
 	protected Gvc.Node create_type (Gvc.Graph graph, Api.Node item) {
+		#if WITH_CGRAPH
+		return graph.create_node (item.get_full_name (), 1);
+		#else
 		return graph.create_node (item.get_full_name ());
+		#endif
 	}
 
 	public abstract Gvc.Graph create_graph (Api.Node item);
diff --git a/src/libvaladoc/charts/simplechartfactory.vala b/src/libvaladoc/charts/simplechartfactory.vala
index a1f09fbaae..06da97e133 100644
--- a/src/libvaladoc/charts/simplechartfactory.vala
+++ b/src/libvaladoc/charts/simplechartfactory.vala
@@ -31,7 +31,11 @@ public class Valadoc.Charts.SimpleFactory : Charts.Factory {
 	}
 
 	public override Gvc.Graph create_graph (Api.Node item) {
+		#if WITH_CGRAPH
+		var graph = new Gvc.Graph (item.get_full_name (), Gvc.Agdirected, 0);
+		#else
 		var graph = new Gvc.Graph (item.get_full_name (), Gvc.GraphKind.AGDIGRAPH);
+		#endif
 		return graph;
 	}"
c9a360e36059aa46d7090e879762d44d54fa2782,hbase,HBASE-7197. Add multi get to RemoteHTable- (Elliott Clark)--git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1422143 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hbase,"diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
index beebe960b05b..92fe09202f61 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
@@ -148,6 +148,29 @@ protected String buildRowSpec(final byte[] row, final Map familyMap,
     return sb.toString();
   }
 
+  protected String buildMultiRowSpec(final byte[][] rows, int maxVersions) {
+    StringBuilder sb = new StringBuilder();
+    sb.append('/');
+    sb.append(Bytes.toStringBinary(name));
+    sb.append(""/multiget/"");
+    if (rows == null || rows.length == 0) {
+      return sb.toString();
+    }
+    sb.append(""?"");
+    for(int i=0; i<rows.length; i++) {
+      byte[] rk = rows[i];
+      if (i != 0) {
+        sb.append('&');
+      }
+      sb.append(""row="");
+      sb.append(Bytes.toStringBinary(rk));
+    }
+    sb.append(""&v="");
+    sb.append(maxVersions);
+
+    return sb.toString();
+  }
+
   protected Result[] buildResultFromModel(final CellSetModel model) {
     List<Result> results = new ArrayList<Result>();
     for (RowModel row: model.getRows()) {
@@ -273,31 +296,66 @@ public Result get(Get get) throws IOException {
     if (get.getFilter() != null) {
       LOG.warn(""filters not supported on gets"");
     }
+    Result[] results = getResults(spec);
+    if (results.length > 0) {
+      if (results.length > 1) {
+        LOG.warn(""too many results for get ("" + results.length + "")"");
+      }
+      return results[0];
+    } else {
+      return new Result();
+    }
+  }
+
+  public Result[] get(List<Get> gets) throws IOException {
+    byte[][] rows = new byte[gets.size()][];
+    int maxVersions = 1;
+    int count = 0;
+
+    for(Get g:gets) {
+
+      if ( count == 0 ) {
+        maxVersions = g.getMaxVersions();
+      } else if (g.getMaxVersions() != maxVersions) {
+        LOG.warn(""MaxVersions on Gets do not match, using the first in the list (""+maxVersions+"")"");
+      }
+
+      if (g.getFilter() != null) {
+        LOG.warn(""filters not supported on gets"");
+      }
+
+      rows[count] = g.getRow();
+      count ++;
+    }
+
+    String spec = buildMultiRowSpec(rows, maxVersions);
+
+    return getResults(spec);
+  }
+
+  private Result[] getResults(String spec) throws IOException {
     for (int i = 0; i < maxRetries; i++) {
       Response response = client.get(spec, Constants.MIMETYPE_PROTOBUF);
       int code = response.getCode();
       switch (code) {
-      case 200:
-        CellSetModel model = new CellSetModel();
-        model.getObjectFromMessage(response.getBody());
-        Result[] results = buildResultFromModel(model);
-        if (results.length > 0) {
-          if (results.length > 1) {
-            LOG.warn(""too many results for get ("" + results.length + "")"");
+        case 200:
+          CellSetModel model = new CellSetModel();
+          model.getObjectFromMessage(response.getBody());
+          Result[] results = buildResultFromModel(model);
+          if ( results.length > 0) {
+            return results;
           }
-          return results[0];
-        }
-        // fall through
-      case 404:
-        return new Result();
+          // fall through
+        case 404:
+          return new Result[0];
 
-      case 509:
-        try {
-          Thread.sleep(sleepTime);
-        } catch (InterruptedException e) { }
-        break;
-      default:
-        throw new IOException(""get request returned "" + code);
+        case 509:
+          try {
+            Thread.sleep(sleepTime);
+          } catch (InterruptedException e) { }
+          break;
+        default:
+          throw new IOException(""get request returned "" + code);
       }
     }
     throw new IOException(""get request timed out"");
@@ -708,11 +766,6 @@ public <R> Object[] batchCallback(List<? extends Row> actions, Batch.Callback<R>
     throw new IOException(""batchCallback not supported"");
   }
 
-  @Override
-  public Result[] get(List<Get> gets) throws IOException {
-    throw new IOException(""get(List<Get>) not supported"");
-  }
-
   @Override
   public <T extends CoprocessorProtocol> T coprocessorProxy(Class<T> protocol,
       byte[] row) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
index 01e23d99a0ed..b52a167fbbc9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
@@ -216,6 +216,45 @@ public void testGet() throws IOException {
     assertEquals(2, count);
   }
 
+  @Test
+  public void testMultiGet() throws Exception {
+    ArrayList<Get> gets = new ArrayList<Get>();
+    gets.add(new Get(ROW_1));
+    gets.add(new Get(ROW_2));
+    Result[] results = remoteTable.get(gets);
+    assertNotNull(results);
+    assertEquals(2, results.length);
+    assertEquals(1, results[0].size());
+    assertEquals(2, results[1].size());
+
+    //Test Versions
+    gets = new ArrayList<Get>();
+    Get g = new Get(ROW_1);
+    g.setMaxVersions(3);
+    gets.add(g);
+    gets.add(new Get(ROW_2));
+    results = remoteTable.get(gets);
+    assertNotNull(results);
+    assertEquals(2, results.length);
+    assertEquals(1, results[0].size());
+    assertEquals(3, results[1].size());
+
+    //404
+    gets = new ArrayList<Get>();
+    gets.add(new Get(Bytes.toBytes(""RESALLYREALLYNOTTHERE"")));
+    results = remoteTable.get(gets);
+    assertNotNull(results);
+    assertEquals(0, results.length);
+
+    gets = new ArrayList<Get>();
+    gets.add(new Get(Bytes.toBytes(""RESALLYREALLYNOTTHERE"")));
+    gets.add(new Get(ROW_1));
+    gets.add(new Get(ROW_2));
+    results = remoteTable.get(gets);
+    assertNotNull(results);
+    assertEquals(0, results.length);
+  }
+
   @Test
   public void testPut() throws IOException {
     Put put = new Put(ROW_3);"
5bc30fcc6c587c5b4581fbcc772cb4625edf2d4c,Mylyn Reviews,"Merge branch 'master' of git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.reviews
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java b/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
index 32074577..133e1cd0 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
+++ b/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
@@ -10,6 +10,7 @@
  *********************************************************************/
 package org.eclipse.mylyn.internal.gerrit.ui.wizards;
 
+import org.eclipse.jface.wizard.IWizardContainer;
 import org.eclipse.mylyn.internal.gerrit.core.GerritQuery;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -122,7 +123,10 @@ public void keyReleased(KeyEvent e) {
 		SelectionListener buttonSelectionListener = new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
 				projectText.setEnabled(byProjectButton.getSelection());
-				getContainer().updateButtons();
+				IWizardContainer c = getContainer();
+				if (c.getCurrentPage() != null) {
+					c.updateButtons();
+				}
 			}
 
 			public void widgetDefaultSelected(SelectionEvent e) {"
fcfbdf64406ac44b771a3c1b91b95d9d9a465391,hadoop,YARN-3181. FairScheduler: Fix up outdated findbugs- issues. (kasha)--(cherry picked from commit c2b185def846f5577a130003a533b9c377b58fab)-,p,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6d27c85bf5be8..87524586bf320 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -243,6 +243,8 @@ Release 2.7.0 - UNRELEASED
     YARN-2079. Recover NonAggregatingLogHandler state upon nodemanager
     restart. (Jason Lowe via junping_du) 
 
+    YARN-3181. FairScheduler: Fix up outdated findbugs issues. (kasha)
+
     YARN-3124. Fixed CS LeafQueue/ParentQueue to use QueueCapacities to track
     capacities-by-label. (Wangda Tan via jianhe)
 
diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
index c45634e1be07b..70f1a71fbcb74 100644
--- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
+++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
@@ -142,22 +142,12 @@
     <Class name=""org.apache.hadoop.yarn.server.nodemanager.containermanager.logaggregation.LogAggregationService"" />
     <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
   </Match>
-  <Match>
-    <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.AllocationFileLoaderService"" />
-    <Field name=""allocFile"" />
-    <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
-  </Match>
   <!-- Inconsistent sync warning - minimumAllocation is only initialized once and never changed -->
   <Match>
     <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler"" />
     <Field name=""minimumAllocation"" />
     <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
   </Match>
-  <Match>
-    <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSSchedulerNode"" />
-    <Method name=""reserveResource"" />
-    <Bug pattern=""BC_UNCONFIRMED_CAST"" /> 
-  </Match>
   <!-- Inconsistent sync warning - reinitialize read from other queue does not need sync-->
   <Match>
     <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue"" />
@@ -215,18 +205,6 @@
     <Field name=""scheduleAsynchronously"" />
     <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
   </Match>
-  <!-- Inconsistent sync warning - updateInterval is only initialized once and never changed -->
-  <Match>
-    <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"" />
-    <Field name=""updateInterval"" />
-    <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
-  </Match>
-  <!-- Inconsistent sync warning - callDurationMetrics is only initialized once and never changed -->
-  <Match>
-    <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"" />
-    <Field name=""fsOpDurations"" />
-    <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
-  </Match>
 
   <!-- Inconsistent sync warning - numRetries is only initialized once and never changed -->
   <Match>
@@ -426,11 +404,6 @@
     <Field name=""queue"" />
     <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
   </Match>
-  <Match>
-    <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"" />
-    <Field name=""allocConf"" />
-    <Bug pattern=""IS2_INCONSISTENT_SYNC"" />
-  </Match>
   <Match>
     <Class name=""org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode"" />
     <Field name=""numContainers"" />
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java
index 0ea731403029e..9cb767d38a5d5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java
@@ -33,6 +33,9 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
+import javax.annotation.concurrent.ThreadSafe;
+
+@ThreadSafe
 public class AllocationConfiguration extends ReservationSchedulerConfiguration {
   private static final AccessControlList EVERYBODY_ACL = new AccessControlList(""*"");
   private static final AccessControlList NOBODY_ACL = new AccessControlList("" "");
@@ -204,12 +207,16 @@ public float getFairSharePreemptionThreshold(String queueName) {
   }
 
   public ResourceWeights getQueueWeight(String queue) {
-    ResourceWeights weight = queueWeights.get(queue);
-    return (weight == null) ? ResourceWeights.NEUTRAL : weight;
+    synchronized (queueWeights) {
+      ResourceWeights weight = queueWeights.get(queue);
+      return (weight == null) ? ResourceWeights.NEUTRAL : weight;
+    }
   }
 
   public void setQueueWeight(String queue, ResourceWeights weight) {
-    queueWeights.put(queue, weight);
+    synchronized (queueWeights) {
+      queueWeights.put(queue, weight);
+    }
   }
   
   public int getUserMaxApps(String user) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
index 76fa588fc767f..c19aa513e1c1d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
@@ -201,7 +201,7 @@ public synchronized void setReloadListener(Listener reloadListener) {
    * @throws ParserConfigurationException if XML parser is misconfigured.
    * @throws SAXException if config file is malformed.
    */
-  public synchronized void reloadAllocations() throws IOException,
+  public void reloadAllocations() throws IOException,
       ParserConfigurationException, SAXException, AllocationConfigurationException {
     if (allocFile == null) {
       return;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java
index c2282fdb736ca..c50f281cb6645 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java
@@ -31,6 +31,8 @@
 import static org.apache.hadoop.metrics2.lib.Interns.info;
 import org.apache.hadoop.metrics2.lib.MutableRate;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Class to capture the performance metrics of FairScheduler.
  * This should be a singleton.
@@ -38,6 +40,7 @@
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 @Metrics(context=""fairscheduler-op-durations"")
+@ThreadSafe
 public class FSOpDurations implements MetricsSource {
 
   @Metric(""Duration for a continuous scheduling run"")"
c8dec345b6e2ad04ffcede24779dd75efd25d599,Vala,"Add used DBus attribute and fix UnixMountEntry lower_case_cprefix

Fixes bug 741089
",a,https://github.com/GNOME/vala/,"diff --git a/vala/valausedattr.vala b/vala/valausedattr.vala
index 793c5bc23b..4a17562848 100644
--- a/vala/valausedattr.vala
+++ b/vala/valausedattr.vala
@@ -67,6 +67,8 @@ public class Vala.UsedAttr : CodeVisitor {
 		""GtkChild"", ""name"", ""internal"", """",
 		""GtkTemplate"", ""ui"", """",
 		""GtkCallback"", ""name"", """",
+
+		""DBus"", ""name"", ""no_reply"", ""result"", ""use_string_marshalling"", ""value"", ""signature"", """",
 		
 		""GIR"", ""name"", """"
 
diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi
index c426491346..c662002dfb 100644
--- a/vapi/gio-unix-2.0.vapi
+++ b/vapi/gio-unix-2.0.vapi
@@ -73,34 +73,23 @@ namespace GLib {
 		public bool close_fd { get; set; }
 		public int fd { get; construct; }
 	}
-	[CCode (cheader_filename = ""gio/gunixmounts.h"", cname = ""GUnixMountEntry"", free_function = ""g_unix_mount_free"", lower_case_prefix = ""g_unix_mount_"")]
+	[CCode (cheader_filename = ""gio/gunixmounts.h"", cname = ""GUnixMountEntry"", free_function = ""g_unix_mount_free"", lower_case_cprefix = ""g_unix_mount_"")]
 	[Compact]
 	public class UnixMountEntry {
 		[CCode (cname = ""g_unix_mount_at"")]
 		public UnixMountEntry (string mount_path, uint64 time_read);
-		[CCode (cname = ""g_unix_mount_compare"")]
 		public int compare (GLib.UnixMountEntry mount);
 		[CCode (cheader_filename = ""gio/gunixmounts.h"", cname = ""g_unix_mounts_get"")]
 		public static GLib.List<GLib.UnixMountEntry> @get (out uint64 time_read = null);
-		[CCode (cname = ""g_unix_mount_get_device_path"")]
 		public unowned string get_device_path ();
-		[CCode (cname = ""g_unix_mount_get_fs_type"")]
 		public unowned string get_fs_type ();
-		[CCode (cname = ""g_unix_mount_get_mount_path"")]
 		public unowned string get_mount_path ();
-		[CCode (cname = ""g_unix_mount_guess_can_eject"")]
 		public bool guess_can_eject ();
-		[CCode (cname = ""g_unix_mount_guess_icon"")]
 		public GLib.Icon guess_icon ();
-		[CCode (cname = ""g_unix_mount_guess_name"")]
 		public string guess_name ();
-		[CCode (cname = ""g_unix_mount_guess_should_display"")]
 		public bool guess_should_display ();
-		[CCode (cname = ""g_unix_mount_guess_symbolic_icon"")]
 		public GLib.Icon guess_symbolic_icon ();
-		[CCode (cname = ""g_unix_mount_is_readonly"")]
 		public bool is_readonly ();
-		[CCode (cname = ""g_unix_mount_is_system_internal"")]
 		public bool is_system_internal ();
 	}
 	[CCode (cheader_filename = ""gio/gunixmounts.h"")]
diff --git a/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala b/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala
index 4b2b8741f6..424e2ec29c 100644
--- a/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala
+++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0-custom.vala
@@ -22,31 +22,20 @@
 
 namespace GLib {
 	[Compact]
-	[CCode (cname = ""GUnixMountEntry"", cheader_filename = ""gio/gunixmounts.h"", lower_case_prefix = ""g_unix_mount_"", free_function = ""g_unix_mount_free"")]
+	[CCode (cname = ""GUnixMountEntry"", cheader_filename = ""gio/gunixmounts.h"", lower_case_cprefix = ""g_unix_mount_"", free_function = ""g_unix_mount_free"")]
 	public class UnixMountEntry {
 		[CCode (cname = ""g_unix_mount_at"")]
 		public UnixMountEntry (string mount_path, uint64 time_read);
-		[CCode (cname = ""g_unix_mount_compare"")]
 		public int compare (GLib.UnixMountEntry mount);
-		[CCode (cname = ""g_unix_mount_get_device_path"")]
 		public unowned string get_device_path ();
-		[CCode (cname = ""g_unix_mount_get_fs_type"")]
 		public unowned string get_fs_type ();
-		[CCode (cname = ""g_unix_mount_get_mount_path"")]
 		public unowned string get_mount_path ();
-		[CCode (cname = ""g_unix_mount_guess_can_eject"")]
 		public bool guess_can_eject ();
-		[CCode (cname = ""g_unix_mount_guess_icon"")]
 		public GLib.Icon guess_icon ();
-		[CCode (cname = ""g_unix_mount_guess_name"")]
 		public string guess_name ();
-		[CCode (cname = ""g_unix_mount_guess_should_display"")]
 		public bool guess_should_display ();
-		[CCode (cname = ""g_unix_mount_guess_symbolic_icon"")]
 		public GLib.Icon guess_symbolic_icon ();
-		[CCode (cname = ""g_unix_mount_is_readonly"")]
 		public bool is_readonly ();
-		[CCode (cname = ""g_unix_mount_is_system_internal"")]
 		public bool is_system_internal ();
 
 		[CCode (cname = ""g_unix_mounts_get"", cheader_filename = ""gio/gunixmounts.h"")]"
9c301fc289a15a84552950737df03f9d0487150f,Delta Spike,"DELTASPIKE-382 add ConfigFilter mechanism

This allows to filter DeltaSpike configuration values,
e.g. for applying decryption of secure configuration values
on the fly.
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
index b7802a38b..4cd956e33 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
@@ -32,6 +32,7 @@
 import javax.enterprise.inject.Typed;
 
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.spi.config.ConfigFilter;
 import org.apache.deltaspike.core.spi.config.ConfigSource;
 import org.apache.deltaspike.core.spi.config.ConfigSourceProvider;
 import org.apache.deltaspike.core.util.ClassUtils;
@@ -58,6 +59,13 @@ public final class ConfigResolver
     private static Map<ClassLoader, ConfigSource[]> configSources
         = new ConcurrentHashMap<ClassLoader, ConfigSource[]>();
 
+    /**
+     * The content of this map will hold the List of ConfigFilters
+     * for each WebApp/EAR, etc (thus the ClassLoader).
+     */
+    private static Map<ClassLoader, List<ConfigFilter>> configFilters
+        = new ConcurrentHashMap<ClassLoader, List<ConfigFilter>>();
+
     private static volatile ProjectStage projectStage = null;
 
     private ConfigResolver()
@@ -96,6 +104,35 @@ public static synchronized void freeConfigSources()
         configSources.remove(ClassUtils.getClassLoader(null));
     }
 
+    /**
+     * Add a {@link ConfigFilter} to the ConfigResolver.
+     * This will only affect the current WebApp
+     * (or more precisely the current ClassLoader and it's children).
+     * @param configFilter
+     */
+    public static void addConfigFilter(ConfigFilter configFilter)
+    {
+
+        List<ConfigFilter> currentConfigFilters = getConfigFilters();
+        currentConfigFilters.add(configFilter);
+    }
+
+    /**
+     * @return the {@link ConfigFilter}s for the current application.
+     */
+    public static List<ConfigFilter> getConfigFilters()
+    {
+        ClassLoader cl = ClassUtils.getClassLoader(null);
+        List<ConfigFilter> currentConfigFilters = configFilters.get(cl);
+        if (currentConfigFilters == null)
+        {
+            currentConfigFilters = new ArrayList<ConfigFilter>();
+            configFilters.put(cl, currentConfigFilters);
+        }
+
+        return currentConfigFilters;
+    }
+
     /**
      * Resolve the property value by going through the list of configured {@link ConfigSource}s
      * and use the one with the highest priority. If no configured value has been found that
@@ -133,8 +170,8 @@ public static String getPropertyValue(String key)
             if (value != null)
             {
                 LOG.log(Level.FINE, ""found value {0} for key {1} in ConfigSource {2}."",
-                        new Object[]{value, key, configSource.getConfigName()});
-                return value;
+                        new Object[]{filterConfigValueForLog(key, value), key, configSource.getConfigName()});
+                return filterConfigValue(key, value);
             }
 
             LOG.log(Level.FINER, ""NO value found for key {0} in ConfigSource {1}."",
@@ -275,9 +312,13 @@ public static List<String> getAllPropertyValues(String key)
         {
             value = configSource.getPropertyValue(key);
 
-            if (value != null && !result.contains(value))
+            if (value != null)
             {
-                result.add(value);
+                value = filterConfigValue(key, value);
+                if (!result.contains(value))
+                {
+                    result.add(value);
+                }
             }
         }
 
@@ -399,5 +440,31 @@ private static String fallbackToDefaultIfEmpty(String key, String value, String
         return value;
     }
 
+    private static String filterConfigValue(String key, String value)
+    {
+        List<ConfigFilter> currentConfigFilters = getConfigFilters();
+
+        String filteredValue = value;
+
+        for (ConfigFilter filter : currentConfigFilters)
+        {
+            filteredValue = filter.filterValue(key, filteredValue);
+        }
+        return filteredValue;
+    }
+
+    private static String filterConfigValueForLog(String key, String value)
+    {
+        List<ConfigFilter> currentConfigFilters = getConfigFilters();
+
+        String logValue = value;
+
+        for (ConfigFilter filter : currentConfigFilters)
+        {
+            logValue = filter.filterValueForLog(key, logValue);
+        }
+        return logValue;
+    }
+
 
 }
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigFilter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigFilter.java
new file mode 100644
index 000000000..5f851e2c6
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigFilter.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.spi.config;
+
+/**
+ * A filter which can be added to the
+ * {@link org.apache.deltaspike.core.api.config.ConfigResolver}.
+ * The filter can be used to decrypt config values or prepare
+ * values for logging.
+ */
+public interface ConfigFilter
+{
+    /**
+     * Filter the given configuration value
+     * @param key
+     * @param value
+     * @return the filtered value or the original input String if no filter shall be applied
+     */
+    String filterValue(String key, String value);
+
+    /**
+     * Filter the given configuration value for usage in logs.
+     * This might be used to mask out passwords, etc.
+     * @param key
+     * @param value
+     * @return the filtered value or the original input String if no filter shall be applied
+     */
+    String filterValueForLog(String key, String value);
+}
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java
index d30e7de52..6aa81dae6 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java
+++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/ConfigResolverTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.deltaspike.core.api.config.ConfigResolver;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.spi.config.ConfigFilter;
 import org.apache.deltaspike.core.util.ProjectStageProducer;
 import org.junit.Assert;
 import org.junit.Test;
@@ -74,7 +75,8 @@ public void testGetProjectStageAwarePropertyValue()
     }
 
     @Test
-    public void testGetPropertyAwarePropertyValue() {
+    public void testGetPropertyAwarePropertyValue()
+    {
         ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
 
         Assert.assertNull(ConfigResolver.getPropertyAwarePropertyValue(""notexisting"", null));
@@ -100,4 +102,51 @@ public void testGetPropertyAwarePropertyValue() {
         Assert.assertEquals(""DefaultDataSource"", ConfigResolver.getPropertyAwarePropertyValue(""dataSource"", ""dbvendorX"", null));
         Assert.assertEquals(DEFAULT_VALUE, ConfigResolver.getPropertyAwarePropertyValue(""dataSourceX"", ""dbvendorX"", DEFAULT_VALUE));
     }
+
+    @Test
+    public void testConfigFilter()
+    {
+
+        ConfigFilter configFilter = new TestConfigFilter();
+
+        Assert.assertEquals(""shouldGetDecrypted: value"", configFilter.filterValue(""somekey.encrypted"", ""value""));
+        Assert.assertEquals(""**********"", configFilter.filterValueForLog(""somekey.password"", ""value""));
+
+        ConfigResolver.addConfigFilter(configFilter);
+
+        Assert.assertEquals(""shouldGetDecrypted: value"", ConfigResolver.getPropertyValue(""testkey4.encrypted""));
+        Assert.assertEquals(""shouldGetDecrypted: value"", ConfigResolver.getProjectStageAwarePropertyValue(""testkey4.encrypted""));
+        Assert.assertEquals(""shouldGetDecrypted: value"", ConfigResolver.getProjectStageAwarePropertyValue(""testkey4.encrypted"", null));
+        Assert.assertEquals(""shouldGetDecrypted: value"", ConfigResolver.getPropertyAwarePropertyValue(""testkey4.encrypted"", ""dbvendor""));
+        Assert.assertEquals(""shouldGetDecrypted: value"", ConfigResolver.getPropertyAwarePropertyValue(""testkey4.encrypted"", ""dbvendor"", null));
+
+        List<String> allPropertyValues = ConfigResolver.getAllPropertyValues(""testkey4.encrypted"");
+        Assert.assertNotNull(allPropertyValues);
+        Assert.assertEquals(1, allPropertyValues.size());
+        Assert.assertEquals(""shouldGetDecrypted: value"", allPropertyValues.get(0));
+
+    }
+
+    public static class TestConfigFilter implements ConfigFilter
+    {
+        @Override
+        public String filterValue(String key, String value)
+        {
+            if (key.contains(""encrypted""))
+            {
+                return ""shouldGetDecrypted: "" + value;
+            }
+            return value;
+        }
+
+        @Override
+        public String filterValueForLog(String key, String value)
+        {
+            if (key.contains(""password""))
+            {
+                return ""**********"";
+            }
+            return value;
+        }
+    }
 }
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java
index d0f2c938b..3b073a9b2 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java
+++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/config/TestConfigSource.java
@@ -62,6 +62,9 @@ public TestConfigSource()
         props.put(""dbvendor2.Production"", ""mysql"");
         props.put(""dbvendor2"", ""postgresql"");
 
+        props.put(""testkey4.encrypted"", ""value"");
+        props.put(""testkey4.password"", ""mysecretvalue"");
+
     }
 
     @Override"
e98541030c5e0aadfdb194dbb55254f404219600,orientdb,Huge refactoring on GraphDB: - changed class- names in vertex and edge - Optimized memory consumption by removing nested- records - Optimized speed in ORecord.equals() and hashCode(): now avoid field- checks (experimental)--,p,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/ORecordAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/record/ORecordAbstract.java
index cd054ea61c5..cc4674f4842 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/record/ORecordAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/record/ORecordAbstract.java
@@ -185,6 +185,8 @@ public ORecordAbstract<T> save() {
 		OSerializationThreadLocal.INSTANCE.get().clear();
 
 		_database.save(this);
+
+		OSerializationThreadLocal.INSTANCE.get().clear();
 		return this;
 	}
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/ORecordVirtualAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/record/ORecordVirtualAbstract.java
index 91a40883f02..6ea13c242fc 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/record/ORecordVirtualAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/record/ORecordVirtualAbstract.java
@@ -15,10 +15,8 @@
  */
 package com.orientechnologies.orient.core.record;
 
-import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import com.orientechnologies.orient.core.db.record.ODatabaseRecord;
 import com.orientechnologies.orient.core.metadata.schema.OType;
@@ -73,22 +71,22 @@ public ORecordSchemaAwareAbstract<T> reset() {
 	@Override
 	public int hashCode() {
 		int result = super.hashCode();
-
-		if (!_recordId.isValid() && _fieldValues != null)
-			for (Entry<String, T> field : _fieldValues.entrySet()) {
-				if (field.getKey() != null)
-					result += field.getKey().hashCode();
-
-				if (field.getValue() != null)
-					if (field.getValue() instanceof ORecord<?>)
-						// AVOID TO GET THE HASH-CODE OF THE VALUE TO AVOID STACK OVERFLOW FOR CIRCULAR REFS
-						result += 31 * ((ORecord<T>) field.getValue()).getIdentity().hashCode();
-					else if (field.getValue() instanceof Collection<?>)
-						// AVOID TO GET THE HASH-CODE OF THE VALUE TO AVOID STACK OVERFLOW FOR CIRCULAR REFS
-						result += ((Collection<?>) field.getValue()).size() * 31;
-					else
-						result += field.getValue().hashCode();
-			}
+		//
+		// if (!_recordId.isValid() && _fieldValues != null)
+		// for (Entry<String, T> field : _fieldValues.entrySet()) {
+		// if (field.getKey() != null)
+		// result += field.getKey().hashCode();
+		//
+		// if (field.getValue() != null)
+		// if (field.getValue() instanceof ORecord<?>)
+		// // AVOID TO GET THE HASH-CODE OF THE VALUE TO AVOID STACK OVERFLOW FOR CIRCULAR REFS
+		// result += 31 * ((ORecord<T>) field.getValue()).getIdentity().hashCode();
+		// else if (field.getValue() instanceof Collection<?>)
+		// // AVOID TO GET THE HASH-CODE OF THE VALUE TO AVOID STACK OVERFLOW FOR CIRCULAR REFS
+		// result += ((Collection<?>) field.getValue()).size() * 31;
+		// else
+		// result += field.getValue().hashCode();
+		// }
 
 		return result;
 	}
@@ -99,37 +97,39 @@ public boolean equals(Object obj) {
 			return false;
 
 		if (!_recordId.isValid()) {
-			final ORecordVirtualAbstract<?> other = (ORecordVirtualAbstract<?>) obj;
-
-			// NO PERSISTENT OBJECT: COMPARE EACH FIELDS
-			if (_fieldValues == null || other._fieldValues == null)
-				// CAN'T COMPARE FIELDS: RETURN FALSE
-				return false;
-
-			if (_fieldValues.size() != other._fieldValues.size())
-				// FIELD SIZES ARE DIFFERENTS
-				return false;
-
-			String k;
-			Object v;
-			Object otherV;
-			for (Entry<String, T> field : _fieldValues.entrySet()) {
-				k = field.getKey();
-				if (k != null && !other.containsField(k))
-					// FIELD NOT PRESENT IN THE OTHER RECORD
-					return false;
-
-				v = _fieldValues.get(k);
-				otherV = other._fieldValues.get(k);
-				if (v == null && otherV == null)
-					continue;
-
-				if (v == null && otherV != null || otherV == null && v != null)
-					return false;
-
-				if (!v.equals(otherV))
-					return false;
-			}
+			//
+			// final ORecordVirtualAbstract<?> other = (ORecordVirtualAbstract<?>) obj;
+			//
+			// // NO PERSISTENT OBJECT: COMPARE EACH FIELDS
+			// if (_fieldValues == null || other._fieldValues == null)
+			// // CAN'T COMPARE FIELDS: RETURN FALSE
+			// return false;
+			//
+			// if (_fieldValues.size() != other._fieldValues.size())
+			// // FIELD SIZES ARE DIFFERENTS
+			// return false;
+			//
+			// String k;
+			// Object v;
+			// Object otherV;
+			// for (Entry<String, T> field : _fieldValues.entrySet()) {
+			// k = field.getKey();
+			// if (k != null && !other.containsField(k))
+			// // FIELD NOT PRESENT IN THE OTHER RECORD
+			// return false;
+			//
+			// v = _fieldValues.get(k);
+			// otherV = other._fieldValues.get(k);
+			// if (v == null && otherV == null)
+			// continue;
+			//
+			// if (v == null && otherV != null || otherV == null && v != null)
+			// return false;
+			//
+			// if (!v.equals(otherV))
+			// return false;
+			// }
+			return false;
 		}
 
 		return true;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/OSerializationThreadLocal.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/OSerializationThreadLocal.java
index 4faafab4991..b37dfb62aaa 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/OSerializationThreadLocal.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/OSerializationThreadLocal.java
@@ -15,7 +15,7 @@
  */
 package com.orientechnologies.orient.core.serialization.serializer.record;
 
-import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 
 import com.orientechnologies.orient.core.id.ORecordId;
@@ -26,6 +26,6 @@ public class OSerializationThreadLocal extends ThreadLocal<Map<ORecordInternal<?
 
 	@Override
 	protected Map<ORecordInternal<?>, ORecordId> initialValue() {
-		return new HashMap<ORecordInternal<?>, ORecordId>();
+		return new IdentityHashMap<ORecordInternal<?>, ORecordId>();
 	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
index 3c99ffa202c..d172294974b 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
@@ -202,6 +202,8 @@ protected String toString(ORecordInternal<?> iRecord, final String iFormat, fina
 
 			i++;
 		}
+		
+		iMarshalledRecords.remove(record);
 
 		return buffer.toString();
 	}"
b753b88a432fca3a8947a1ea0743e44f626e23a2,Valadoc,"Add warning & note tags
",a,https://github.com/GNOME/vala/,"diff --git a/icons/Makefile.am b/icons/Makefile.am
index 5869bff058..4859e248bd 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -5,6 +5,7 @@ iconsdir = $(datadir)/valadoc/icons
 
 
 dist_icons_DATA =        \
+	tip.png              \
 	warning.png          \
 	abstractclass.png    \
 	abstractmethod.png   \
diff --git a/icons/tip.png b/icons/tip.png
new file mode 100644
index 0000000000..6ccf512f3d
Binary files /dev/null and b/icons/tip.png differ
diff --git a/src/doclets/gtkdoc/commentconverter.vala b/src/doclets/gtkdoc/commentconverter.vala
index a0c3372ce3..e10b8aa3a5 100755
--- a/src/doclets/gtkdoc/commentconverter.vala
+++ b/src/doclets/gtkdoc/commentconverter.vala
@@ -172,7 +172,19 @@ public class Gtkdoc.CommentConverter : ContentVisitor {
 			current_builder.append (""</para>"");
 		}
 	}
-  
+
+	public override void visit_warning (Warning element) {
+		current_builder.append (""<warning>"");
+		element.accept_children (this);
+		current_builder.append (""</warning>"");
+	}
+
+	public override void visit_note (Note element) {
+		current_builder.append (""<note>"");
+		element.accept_children (this);
+		current_builder.append (""</note>"");
+	}
+
 	public override void visit_page (Page page) {
 		page.accept_children (this);
 	}
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 310a3dbd13..fe3115c8e1 100755
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -26,11 +26,13 @@ libvaladoc_la_VALASOURCES = \
 	moduleloader.vala \
 	settings.vala \
 	markupwriter.vala \
+	gtkdocmarkupwriter.vala \
 	devhelp-markupwriter.vala \
 	ctyperesolver.vala \
 	markupsourcelocation.vala \
 	markuptokentype.vala \
 	markupreader.vala \
+	gtkdocrenderer.vala \
 	documentation/commentscanner.vala \
 	documentation/documentation.vala \
 	documentation/documentationparser.vala \
@@ -103,6 +105,8 @@ libvaladoc_la_VALASOURCES = \
 	content/listitem.vala \
 	content/page.vala \
 	content/paragraph.vala \
+	content/warning.vala \
+	content/note.vala \
 	content/resourcelocator.vala \
 	content/run.vala \
 	content/sourcecode.vala \
diff --git a/src/libvaladoc/content/contentfactory.vala b/src/libvaladoc/content/contentfactory.vala
index 55c44f7ac0..19cf41be21 100755
--- a/src/libvaladoc/content/contentfactory.vala
+++ b/src/libvaladoc/content/contentfactory.vala
@@ -76,6 +76,13 @@ public class Valadoc.Content.ContentFactory : Object {
 		return (Paragraph) configure (new Paragraph ());
 	}
 
+	public Warning create_warning () {
+		return (Warning) configure (new Warning ());
+	}
+	public Note create_note () {
+		return (Note) configure (new Note ());
+	}
+
 	public Run create_run (Run.Style style) {
 		return (Run) configure (new Run (style));
 	}
diff --git a/src/libvaladoc/content/contentvisitor.vala b/src/libvaladoc/content/contentvisitor.vala
index bacffc3ddf..3eb3a4b3d4 100755
--- a/src/libvaladoc/content/contentvisitor.vala
+++ b/src/libvaladoc/content/contentvisitor.vala
@@ -52,6 +52,12 @@ public abstract class Valadoc.Content.ContentVisitor : Object {
 	public virtual void visit_paragraph (Paragraph element) {
 	}
 
+	public virtual void visit_warning (Warning element) {
+	}
+
+	public virtual void visit_note (Note element) {
+	}
+
 	public virtual void visit_page (Page element) {
 	}
 
diff --git a/src/libvaladoc/content/note.vala b/src/libvaladoc/content/note.vala
new file mode 100755
index 0000000000..d2b16c557c
--- /dev/null
+++ b/src/libvaladoc/content/note.vala
@@ -0,0 +1,40 @@
+/* note.vala
+ *
+ * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Didier 'Ptitjes Villevalois <ptitjes@free.fr>
+ */
+
+using Gee;
+
+
+public class Valadoc.Content.Note : BlockContent, Block {
+	internal Note () {
+		base ();
+	}
+
+	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+		// Check inline content
+		base.check (api_root, container, reporter, settings);
+	}
+
+	public override void accept (ContentVisitor visitor) {
+		visitor.visit_note (this);
+	}
+}
+
diff --git a/src/libvaladoc/content/warning.vala b/src/libvaladoc/content/warning.vala
new file mode 100755
index 0000000000..e848c43f30
--- /dev/null
+++ b/src/libvaladoc/content/warning.vala
@@ -0,0 +1,40 @@
+/* warning.vala
+ *
+ * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Didier 'Ptitjes Villevalois <ptitjes@free.fr>
+ */
+
+using Gee;
+
+
+public class Valadoc.Content.Warning : BlockContent, Block {
+	internal Warning () {
+		base ();
+	}
+
+	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
+		// Check inline content
+		base.check (api_root, container, reporter, settings);
+	}
+
+	public override void accept (ContentVisitor visitor) {
+		visitor.visit_warning (this);
+	}
+}
+
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index b2a96f0252..1b29698dd4 100755
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -499,6 +499,50 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 				}
 			});
 
+		Rule warning =
+			Rule.seq ({
+				TokenType.str (""Warning:""),
+				optional_invisible_spaces,
+				Rule.many ({
+					Rule.seq({optional_invisible_spaces, run}),
+					TokenType.EOL.action (() => { add_content_space (); })
+				})
+			})
+			.set_name (""Warning"")
+			.set_start (() => { push (_factory.create_paragraph ()); })
+			.set_reduce (() => {
+				var head = _factory.create_warning ();
+				head.content.add ((Paragraph) pop ());
+				((BlockContent) peek ()).content.add (head);
+
+				Text last_element = head.content.last () as Text;
+				if (last_element != null) {
+					last_element.content._chomp ();
+				}
+			});
+
+		Rule note =
+			Rule.seq ({
+				TokenType.str (""Note:""),
+				optional_invisible_spaces,
+				Rule.many ({
+					Rule.seq({optional_invisible_spaces, run}),
+					TokenType.EOL.action (() => { add_content_space (); })
+				})
+			})
+			.set_name (""Note"")
+			.set_start (() => { push (_factory.create_paragraph ()); })
+			.set_reduce (() => {
+				var head = _factory.create_note ();
+				head.content.add ((Paragraph) pop ());
+				((BlockContent) peek ()).content.add (head);
+
+				Text last_element = head.content.last () as Text;
+				if (last_element != null) {
+					last_element.content._chomp ();
+				}
+			});
+
 		Rule indented_item =
 			Rule.seq ({
 				Rule.many ({
@@ -667,6 +711,8 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 				indented_blocks,
 				table,
 				headline,
+				warning,
+				note,
 				paragraph
 			})
 			.set_name (""Blocks"");
diff --git a/src/libvaladoc/html/htmlmarkupwriter.vala b/src/libvaladoc/html/htmlmarkupwriter.vala
index 7599d18510..13e6cd0ebd 100755
--- a/src/libvaladoc/html/htmlmarkupwriter.vala
+++ b/src/libvaladoc/html/htmlmarkupwriter.vala
@@ -24,8 +24,14 @@ using GLib;
 using Valadoc.Content;
 
 public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
+	private unowned FileStream stream;
+
 	public MarkupWriter (FileStream stream, bool xml_declaration = true) {
-		base (stream, xml_declaration);
+		// avoid broken implicit copy
+		unowned FileStream _stream = stream;
+
+		base ((str) => { _stream.printf (str); }, xml_declaration);
+		this.stream = stream;
 	}
 
 	public MarkupWriter add_usemap (Charts.Chart chart) {
diff --git a/src/libvaladoc/html/htmlrenderer.vala b/src/libvaladoc/html/htmlrenderer.vala
index 7c79047d52..c6148ae6db 100755
--- a/src/libvaladoc/html/htmlrenderer.vala
+++ b/src/libvaladoc/html/htmlrenderer.vala
@@ -341,6 +341,23 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
 		writer.end_tag (""p"");
 	}
 
+	private void visit_notification_block (BlockContent element, string headline) {
+		writer.start_tag (""div"", {""class"", ""main_notification_block""});
+		writer.start_tag (""span"", {""class"", ""main_block_headline""}).text (headline).end_tag (""span"").text ("" "");
+		writer.start_tag (""span"", {""class"", ""main_block_content""});
+		element.accept_children (this);
+		writer.end_tag (""span"");
+		writer.end_tag (""div"");
+	}
+
+	public override void visit_warning (Warning element) {
+		visit_notification_block (element, ""Warning:"");
+	}
+
+	public override void visit_note (Note element) {
+		visit_notification_block (element, ""Note:"");
+	}
+
 	public override void visit_run (Run element) {
 		string tag = null;
 		string css_type = null;"
296212eab186b860fd9494db9ed238b341fc2975,kotlin,Merge two JetTypeMapper-mapToCallableMethod- methods--,p,https://github.com/JetBrains/kotlin,"diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 2be9032ebddaa..896f430d59004 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -1472,7 +1472,7 @@ public Unit invoke(InstructionAdapter v) {
                     ConstructorDescriptor constructorToCall = SamCodegenUtil.resolveSamAdapter(superConstructor);
                     List<ValueParameterDescriptor> superValueParameters = superConstructor.getValueParameters();
                     int params = superValueParameters.size();
-                    List<Type> superMappedTypes = typeMapper.mapToCallableMethod(constructorToCall).getValueParameterTypes();
+                    List<Type> superMappedTypes = typeMapper.mapToCallableMethod(constructorToCall, false).getValueParameterTypes();
                     assert superMappedTypes.size() >= params : String
                             .format(""Incorrect number of mapped parameters vs arguments: %d < %d for %s"",
                                     superMappedTypes.size(), params, classDescriptor);
@@ -3414,7 +3414,7 @@ public Unit invoke(InstructionAdapter v) {
                 pushClosureOnStack(constructor.getContainingDeclaration(), dispatchReceiver == null, defaultCallGenerator);
 
                 constructor = SamCodegenUtil.resolveSamAdapter(constructor);
-                CallableMethod method = typeMapper.mapToCallableMethod(constructor);
+                CallableMethod method = typeMapper.mapToCallableMethod(constructor, false);
                 invokeMethodWithArguments(method, resolvedCall, StackValue.none());
 
                 return Unit.INSTANCE$;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
index 43c94286739ef..b1c257a942940 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
@@ -664,13 +664,7 @@ public static void generateDefaultImplBody(
             generator.putValueIfNeeded(parameterDescriptor, type, StackValue.local(parameterIndex, type));
         }
 
-        CallableMethod method;
-        if (functionDescriptor instanceof ConstructorDescriptor) {
-            method = state.getTypeMapper().mapToCallableMethod((ConstructorDescriptor) functionDescriptor);
-        }
-        else {
-            method = state.getTypeMapper().mapToCallableMethod(functionDescriptor, false);
-        }
+        CallableMethod method = state.getTypeMapper().mapToCallableMethod(functionDescriptor, false);
 
         generator.genCallWithoutAssertions(method, codegen);
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index dbd04bd4121ca..da405f940ff91 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -937,17 +937,16 @@ private void generateMethodCallTo(
             @Nullable FunctionDescriptor accessorDescriptor,
             @NotNull InstructionAdapter iv
     ) {
-        boolean isConstructor = functionDescriptor instanceof ConstructorDescriptor;
-        boolean accessorIsConstructor = accessorDescriptor instanceof AccessorForConstructorDescriptor;
-
-        boolean superCall = accessorDescriptor instanceof AccessorForCallableDescriptor &&
-                            ((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallExpression() != null;
-        CallableMethod callableMethod = isConstructor ?
-                                        typeMapper.mapToCallableMethod((ConstructorDescriptor) functionDescriptor) :
-                                        typeMapper.mapToCallableMethod(functionDescriptor, superCall);
+        CallableMethod callableMethod = typeMapper.mapToCallableMethod(
+                functionDescriptor,
+                accessorDescriptor instanceof AccessorForCallableDescriptor &&
+                ((AccessorForCallableDescriptor) accessorDescriptor).getSuperCallExpression() != null
+        );
 
         int reg = 1;
-        if (isConstructor && !accessorIsConstructor) {
+
+        boolean accessorIsConstructor = accessorDescriptor instanceof AccessorForConstructorDescriptor;
+        if (!accessorIsConstructor && functionDescriptor instanceof ConstructorDescriptor) {
             iv.anew(callableMethod.getOwner());
             iv.dup();
             reg = 0;
@@ -1496,8 +1495,8 @@ private void generateDelegatorToConstructorCall(
         iv.load(0, OBJECT_TYPE);
         ConstructorDescriptor delegateConstructor = SamCodegenUtil.resolveSamAdapter(codegen.getConstructorDescriptor(delegationConstructorCall));
 
-        CallableMethod delegateConstructorCallable = typeMapper.mapToCallableMethod(delegateConstructor);
-        CallableMethod callable = typeMapper.mapToCallableMethod(constructorDescriptor);
+        CallableMethod delegateConstructorCallable = typeMapper.mapToCallableMethod(delegateConstructor, false);
+        CallableMethod callable = typeMapper.mapToCallableMethod(constructorDescriptor, false);
 
         List<JvmMethodParameterSignature> delegatingParameters = delegateConstructorCallable.getValueParameters();
         List<JvmMethodParameterSignature> parameters = callable.getValueParameters();
@@ -1711,7 +1710,7 @@ private void initializeEnumConstant(@NotNull List<JetEnumEntry> enumEntries, int
         if (delegationSpecifiers.size() == 1 && !enumEntryNeedSubclass(bindingContext, enumEntry)) {
             ResolvedCall<?> resolvedCall = CallUtilPackage.getResolvedCallWithAssert(delegationSpecifiers.get(0), bindingContext);
 
-            CallableMethod method = typeMapper.mapToCallableMethod((ConstructorDescriptor) resolvedCall.getResultingDescriptor());
+            CallableMethod method = typeMapper.mapToCallableMethod((ConstructorDescriptor) resolvedCall.getResultingDescriptor(), false);
 
             codegen.invokeMethodWithArguments(method, resolvedCall, StackValue.none());
         }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
index dc57b4ac65db6..bf1c4772a95d8 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
@@ -593,6 +593,12 @@ private Type mapKnownAsmType(
 
     @NotNull
     public CallableMethod mapToCallableMethod(@NotNull FunctionDescriptor descriptor, boolean superCall) {
+        if (descriptor instanceof ConstructorDescriptor) {
+            JvmMethodSignature method = mapSignature(descriptor);
+            Type owner = mapClass(((ConstructorDescriptor) descriptor).getContainingDeclaration());
+            return new CallableMethod(owner, owner, owner, method, INVOKESPECIAL, null, null, null);
+        }
+
         DeclarationDescriptor functionParent = descriptor.getOriginal().getContainingDeclaration();
 
         FunctionDescriptor functionDescriptor = unwrapFakeOverride(descriptor.getOriginal());
@@ -1113,17 +1119,6 @@ public JvmMethodSignature mapScriptSignature(@NotNull ScriptDescriptor script, @
         return sw.makeJvmMethodSignature(""<init>"");
     }
 
-    @NotNull
-    public CallableMethod mapToCallableMethod(@NotNull ConstructorDescriptor descriptor) {
-        JvmMethodSignature method = mapSignature(descriptor);
-        ClassDescriptor container = descriptor.getContainingDeclaration();
-        Type owner = mapClass(container);
-        if (owner.getSort() != Type.OBJECT) {
-            throw new IllegalStateException(""type must have been mapped to object: "" + container.getDefaultType() + "", actual: "" + owner);
-        }
-        return new CallableMethod(owner, owner, owner, method, INVOKESPECIAL, null, null, null);
-    }
-
     public Type getSharedVarType(DeclarationDescriptor descriptor) {
         if (descriptor instanceof SimpleFunctionDescriptor && descriptor.getContainingDeclaration() instanceof FunctionDescriptor) {
             return asmTypeForAnonymousClass(bindingContext, (FunctionDescriptor) descriptor);"
77f1f5cd336bbd3c7b9d548a4916084bc1e56dc3,orientdb,Console: fixed jdk6 problem in more elegant way- (thanks to Andrey's suggestion)--,p,https://github.com/orientechnologies/orientdb,"diff --git a/commons/src/main/java/com/orientechnologies/common/console/ODFACommandStream.java b/commons/src/main/java/com/orientechnologies/common/console/ODFACommandStream.java
index aaeb27f7b7d..804182cb751 100755
--- a/commons/src/main/java/com/orientechnologies/common/console/ODFACommandStream.java
+++ b/commons/src/main/java/com/orientechnologies/common/console/ODFACommandStream.java
@@ -107,11 +107,10 @@ public String nextCommand() {
           result = partialResult.toString();
         }
       } else {
-        try {
-          result = buffer.subSequence(start, end + 1).toString();
-        } catch (NoSuchMethodError e) {
-          result = buffer.toString().substring(start, end + 1);
-        }
+        // DON'T PUT THIS ON ONE LINE ONLY BECAUSE WITH JDK6 subSequence() RETURNS A CHAR CharSequence while JDK7+ RETURNS
+        // CharBuffer
+        final CharSequence cs = buffer.subSequence(start, end + 1);
+        result = cs.toString();
       }
 
       buffer.position(buffer.position() + position);"
51b603c850765b2734549a1962581ebe5f5f2125,restlet-framework-java,JAX-RS extension continued: - Added an- ObjectFactory to the JAX-RS extension for customized root resource class and- provider instantiation. Contributed by Bruno Dumon.--,a,https://github.com/restlet/restlet-framework-java,"diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
index 050ac19537..ee28f2d5a0 100644
--- a/build/tmpl/text/changes.txt
+++ b/build/tmpl/text/changes.txt
@@ -66,6 +66,8 @@ Changes log
           parsing and formatting into three new classes: 
           MessageRepresentation, MessagesRepresentation and 
           RepresentationMessage. Suggested by Matthieu Hug.
+        - Added an ObjectFactory to the JAX-RS extension for customized root
+          resource class and provider instantiation. Contributed by Bruno Dumon. 
     - Misc
     	- Updated Grizzly to 1.7.3.
     	- Improved logging consistency.
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsApplication.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsApplication.java
index d3c2a84bc5..0a304ee739 100644
--- a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsApplication.java
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsApplication.java
@@ -73,7 +73,10 @@
  */
 public class JaxRsApplication extends Application {
 
-    /** the {@link Guard} to use. May be null. */
+    /** Indicates if any {@link ApplicationConfig} is attached yet */
+    private volatile boolean appConfigAttached = false;
+
+    /** The {@link Guard} to use. May be null. */
     private volatile Guard guard;
 
     /** The {@link JaxRsRouter} to use. */
@@ -82,9 +85,6 @@ public class JaxRsApplication extends Application {
     /** Indicates, if an {@link HtmlPreferer} should be used or not. */
     private volatile boolean preferHtml = true;
 
-    /** indicates if any {@link ApplicationConfig} is attached yet */
-    private volatile boolean appConfigAttached = false;
-
     /**
      * Creates an new JaxRsApplication. You should typically use one of the
      * other constructors, see {@link Restlet#Restlet()}.
@@ -248,6 +248,17 @@ public Guard getGuard() {
         return this.guard;
     }
 
+    /**
+     * Returns the ObjectFactory for root resource class and provider
+     * instantiation, if given.
+     * 
+     * @return the ObjectFactory for root resource class and provider
+     *         instantiation, if given.
+     */
+    public ObjectFactory getObjectFactory() {
+        return this.jaxRsRouter.getObjectFactory();
+    }
+
     /**
      * Returns the current RoleChecker
      * 
@@ -337,6 +348,18 @@ public void setGuard(Guard guard) {
         this.guard = guard;
     }
 
+    /**
+     * Sets the ObjectFactory for root resource class and provider
+     * instantiation.
+     * 
+     * @param objectFactory
+     *                the ObjectFactory for root resource class and provider
+     *                instantiation.
+     */
+    public void setObjectFactory(ObjectFactory objectFactory) {
+        this.jaxRsRouter.setObjectFactory(objectFactory);
+    }
+
     /**
      * Some browsers (e.g. Internet Explorer 7.0 and Firefox 2.0) sends as
      * accepted media type XML with a higher quality than HTML. The consequence
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsRouter.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsRouter.java
index 44ce111066..e0249faad5 100644
--- a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsRouter.java
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/JaxRsRouter.java
@@ -166,6 +166,8 @@ public class JaxRsRouter extends Restlet {
     @SuppressWarnings(""unchecked"")
     private final ThreadLocalizedContext tlContext = new ThreadLocalizedContext();
 
+    private volatile ObjectFactory objectFactory;
+
     /**
      * Creates a new JaxRsRouter with the given Context. Only the default
      * providers are loaded. If a resource class later wants to check if a user
@@ -330,8 +332,9 @@ private boolean addProvider(Class<?> jaxRsProviderClass,
         }
         Provider<?> provider;
         try {
-            provider = new Provider<Object>(jaxRsProviderClass, tlContext,
-                    this.entityProviders, contextResolvers, getLogger());
+            provider = new Provider<Object>(jaxRsProviderClass, objectFactory,
+                    tlContext, this.entityProviders, contextResolvers,
+                    getLogger());
         } catch (InstantiateException e) {
             String msg = ""Ignore provider "" + jaxRsProviderClass.getName()
                     + ""Could not instantiate the Provider, class ""
@@ -507,7 +510,7 @@ private ResourceObject instantiateRrc(RootResourceClass rrc)
             throws WebApplicationException, RequestHandledException {
         ResourceObject o;
         try {
-            o = rrc.createInstance();
+            o = rrc.createInstance(this.objectFactory);
         } catch (WebApplicationException e) {
             throw e;
         } catch (RuntimeException e) {
@@ -1078,4 +1081,27 @@ public Collection<String> getRootUris() {
             uris.add(rrc.getPathRegExp().getPathPattern());
         return Collections.unmodifiableCollection(uris);
     }
+
+    /**
+     * Returns the ObjectFactory for root resource class and provider
+     * instantiation, if given.
+     * 
+     * @return the ObjectFactory for root resource class and provider
+     *         instantiation, if given.
+     */
+    public ObjectFactory getObjectFactory() {
+        return this.objectFactory;
+    }
+
+    /**
+     * Sets the ObjectFactory for root resource class and provider
+     * instantiation.
+     * 
+     * @param objectFactory
+     *                the ObjectFactory for root resource class and provider
+     *                instantiation.
+     */
+    public void setObjectFactory(ObjectFactory objectFactory) {
+        this.objectFactory = objectFactory;
+    }
 }
\ No newline at end of file
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/ObjectFactory.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/ObjectFactory.java
new file mode 100644
index 0000000000..dc4e8134a4
--- /dev/null
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/ObjectFactory.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2005-2008 Noelios Consulting.
+ * 
+ * The contents of this file are subject to the terms of the Common Development
+ * and Distribution License (the ""License""). You may not use this file except in
+ * compliance with the License.
+ * 
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.txt See the License for the specific
+ * language governing permissions and limitations under the License.
+ * 
+ * When distributing Covered Code, include this CDDL HEADER in each file and
+ * include the License file at http://www.opensource.org/licenses/cddl1.txt If
+ * applicable, add the following below this CDDL HEADER, with the fields
+ * enclosed by brackets ""[]"" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ */
+package org.restlet.ext.jaxrs;
+
+import org.restlet.ext.jaxrs.internal.exceptions.InstantiateException;
+
+/**
+ * <p>
+ * Implement this interface to instantiate JAX-RS root resource classes and
+ * providers yourself and register it by
+ * {@link JaxRsApplication#setObjectFactory(ObjectFactory)}.
+ * </p>
+ * 
+ * <p>
+ * When using a ObjectFactory, no JAX-RS constructor dependency injection will
+ * be performed, but instance variable and bean setter injection will still be
+ * done.
+ * </p>
+ * 
+ * @author Bruno Dumon
+ * @see JaxRsApplication#setObjectFactory(ObjectFactory)
+ * @see JaxRsRouter#setObjectFactory(ObjectFactory)
+ */
+public interface ObjectFactory {
+    /**
+     * Creates an instance of the given class.<br>
+     * If the concrete instance could not instantiate the given class, it could
+     * return null. Than the constructor specified by the JAX-RS specification
+     * (section 4.2) is used.
+     * 
+     * @param <T>
+     * @param jaxRsClass
+     *                the root resource class or provider class.
+     * @return
+     * @throws InstantiateException
+     */
+    public <T> T getInstance(Class<T> jaxRsClass) throws InstantiateException;
+}
\ No newline at end of file
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/RootResourceClass.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/RootResourceClass.java
index 2957fc6c68..08dd0ae0dc 100644
--- a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/RootResourceClass.java
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/RootResourceClass.java
@@ -28,6 +28,7 @@
 import javax.ws.rs.ext.ContextResolver;
 
 import org.restlet.ext.jaxrs.JaxRsRouter;
+import org.restlet.ext.jaxrs.ObjectFactory;
 import org.restlet.ext.jaxrs.internal.core.ThreadLocalizedContext;
 import org.restlet.ext.jaxrs.internal.exceptions.ConvertRepresentationException;
 import org.restlet.ext.jaxrs.internal.exceptions.IllegalPathOnClassException;
@@ -122,22 +123,28 @@ private static void checkClassForPathAnnot(Class<?> jaxRsClass,
     /**
      * Creates an instance of the root resource class.
      * 
+     * @param objectFactory
+     *                object responsible for instantiating the root resource
+     *                class. Optional, thus can be null.
      * @return
      * @throws InvocationTargetException
      * @throws InstantiateException
      * @throws MissingAnnotationException
      * @throws WebApplicationException
      */
-    public ResourceObject createInstance() throws InstantiateException,
-            InvocationTargetException {
-        Constructor<?> constructor = this.constructor;
-        Object instance;
-        try {
-            instance = WrapperUtil.createInstance(constructor,
-                    constructorParameters.get());
-        } catch (ConvertRepresentationException e) {
-            // is not possible
-            throw new ImplementationException(""Must not be possible"", e);
+    public ResourceObject createInstance(ObjectFactory objectFactory)
+            throws InstantiateException, InvocationTargetException {
+        Object instance = null;
+        if (objectFactory != null)
+            instance = objectFactory.getInstance(jaxRsClass);
+        if (instance == null) {
+            try {
+                Object[] args = constructorParameters.get();
+                instance = WrapperUtil.createInstance(constructor, args);
+            } catch (ConvertRepresentationException e) {
+                // is not possible
+                throw new ImplementationException(""Must not be possible"", e);
+            }
         }
         ResourceObject rootResourceObject = new ResourceObject(instance, this);
         try {
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/provider/Provider.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/provider/Provider.java
index 1fa634f510..b42e36bc61 100644
--- a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/provider/Provider.java
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/provider/Provider.java
@@ -40,6 +40,7 @@
 import javax.ws.rs.ext.MessageBodyWorkers;
 
 import org.restlet.data.MediaType;
+import org.restlet.ext.jaxrs.ObjectFactory;
 import org.restlet.ext.jaxrs.internal.core.CallContext;
 import org.restlet.ext.jaxrs.internal.core.ThreadLocalizedContext;
 import org.restlet.ext.jaxrs.internal.exceptions.ConvertCookieParamException;
@@ -101,6 +102,9 @@ public class Provider<T> implements MessageBodyReader<T>, MessageBodyWriter<T>,
      * 
      * @param jaxRsProviderClass
      *                the JAX-RS provider class.
+     * @param objectFactory
+     *                The object factory is responsible for the provider
+     *                instantiation, if given.
      * @param tlContext
      *                The tread local wrapped call context
      * @param mbWorkers
@@ -124,7 +128,7 @@ public class Provider<T> implements MessageBodyReader<T>, MessageBodyWriter<T>,
      * @see javax.ws.rs.ext.ContextResolver
      */
     @SuppressWarnings(""unchecked"")
-    public Provider(Class<?> jaxRsProviderClass,
+    public Provider(Class<?> jaxRsProviderClass, ObjectFactory objectFactory,
             ThreadLocalizedContext tlContext, EntityProviders mbWorkers,
             Collection<ContextResolver<?>> allResolvers, Logger logger)
             throws IllegalArgumentException, InvocationTargetException,
@@ -134,10 +138,15 @@ public Provider(Class<?> jaxRsProviderClass,
             throw new IllegalArgumentException(
                     ""The JAX-RS provider class must not be null"");
         Util.checkClassConcrete(jaxRsProviderClass, ""provider"");
-        Constructor<?> providerConstructor = WrapperUtil.findJaxRsConstructor(
-                jaxRsProviderClass, ""provider"");
-        this.jaxRsProvider = createInstance(providerConstructor,
-                jaxRsProviderClass, tlContext, mbWorkers, allResolvers, logger);
+        if (objectFactory != null)
+            this.jaxRsProvider = objectFactory.getInstance(jaxRsProviderClass);
+        if (this.jaxRsProvider == null) {
+            Constructor<?> providerConstructor = WrapperUtil
+                    .findJaxRsConstructor(jaxRsProviderClass, ""provider"");
+            this.jaxRsProvider = createInstance(providerConstructor,
+                    jaxRsProviderClass, tlContext, mbWorkers, allResolvers,
+                    logger);
+        }
         boolean isProvider = false;
         if (jaxRsProvider instanceof javax.ws.rs.ext.MessageBodyWriter) {
             this.writer = (javax.ws.rs.ext.MessageBodyWriter<T>) jaxRsProvider;"
e54358472c94d63c66ad607be256f94378e8ff16,orientdb,Issue -2900,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseBinary.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseBinary.java
deleted file mode 100644
index 2ec9a2144fb..00000000000
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseBinary.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  *
-  *  *  Copyright 2014 Orient Technologies LTD (info(at)orientechnologies.com)
-  *  *
-  *  *  Licensed under the Apache License, Version 2.0 (the ""License"");
-  *  *  you may not use this file except in compliance with the License.
-  *  *  You may obtain a copy of the License at
-  *  *
-  *  *       http://www.apache.org/licenses/LICENSE-2.0
-  *  *
-  *  *  Unless required by applicable law or agreed to in writing, software
-  *  *  distributed under the License is distributed on an ""AS IS"" BASIS,
-  *  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  *  *  See the License for the specific language governing permissions and
-  *  *  limitations under the License.
-  *  *
-  *  * For more information: http://www.orientechnologies.com
-  *
-  */
-package com.orientechnologies.orient.core.db.record;
-
-import com.orientechnologies.orient.core.record.impl.ORecordBytes;
-
-/**
- * Binary specialization of transactional database.
- * 
- */
-public class ODatabaseBinary extends ODatabaseRecordTx {
-
-	public ODatabaseBinary(String iURL) {
-		super(iURL, ORecordBytes.RECORD_TYPE);
-	}
-}
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseFlat.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseFlat.java
deleted file mode 100755
index 09bc14dfc99..00000000000
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseFlat.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  *
-  *  *  Copyright 2014 Orient Technologies LTD (info(at)orientechnologies.com)
-  *  *
-  *  *  Licensed under the Apache License, Version 2.0 (the ""License"");
-  *  *  you may not use this file except in compliance with the License.
-  *  *  You may obtain a copy of the License at
-  *  *
-  *  *       http://www.apache.org/licenses/LICENSE-2.0
-  *  *
-  *  *  Unless required by applicable law or agreed to in writing, software
-  *  *  distributed under the License is distributed on an ""AS IS"" BASIS,
-  *  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  *  *  See the License for the specific language governing permissions and
-  *  *  limitations under the License.
-  *  *
-  *  * For more information: http://www.orientechnologies.com
-  *
-  */
-package com.orientechnologies.orient.core.db.record;
-
-import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-import com.orientechnologies.orient.core.iterator.ORecordIteratorCluster;
-import com.orientechnologies.orient.core.record.impl.ORecordFlat;
-
-/**
- * Delegates all the CRUD operations to the current transaction.
- * 
- */
-public class ODatabaseFlat extends ODatabaseRecordTx {
-
-  public ODatabaseFlat(String iURL) {
-    super(iURL, ORecordFlat.RECORD_TYPE);
-    serializer = ODatabaseDocumentTx.getDefaultSerializer();
-  }
-
-  @SuppressWarnings(""unchecked"")
-  @Override
-  public ORecordIteratorCluster<ORecordFlat> browseCluster(final String iClusterName) {
-    return super.browseCluster(iClusterName, ORecordFlat.class);
-  }
-
-  @Override
-  public ORecordIteratorCluster<ORecordFlat> browseCluster(String iClusterName, long startClusterPosition,
-      long endClusterPosition, boolean loadTombstones) {
-    return super.browseCluster(iClusterName, ORecordFlat.class, startClusterPosition, endClusterPosition, loadTombstones);
-  }
-
-  @SuppressWarnings(""unchecked"")
-  @Override
-  public ORecordFlat newInstance() {
-    return new ORecordFlat();
-  }
-}
diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/impl/ORecordFlat.java b/core/src/main/java/com/orientechnologies/orient/core/record/impl/ORecordFlat.java
index 6db8b2e689b..b4701b13e49 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/record/impl/ORecordFlat.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/record/impl/ORecordFlat.java
@@ -20,7 +20,7 @@
 package com.orientechnologies.orient.core.record.impl;
 
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.db.record.ODatabaseRecord;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.id.ORecordId;
@@ -39,7 +39,7 @@ public class ORecordFlat extends ORecordAbstract implements ORecordStringable {
   public static final byte  RECORD_TYPE      = 'f';
   protected String          value;
 
-  public ORecordFlat(ODatabaseFlat iDatabase) {
+  public ORecordFlat(ODatabaseDocumentTx iDatabase) {
     this();
     ODatabaseRecordThreadLocal.INSTANCE.set(iDatabase);
   }
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/CRUDFlatPhysicalTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/CRUDFlatPhysicalTest.java
index 4bd522343d3..7e413faab08 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/CRUDFlatPhysicalTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/CRUDFlatPhysicalTest.java
@@ -18,18 +18,18 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.orientechnologies.orient.core.storage.OStorage;
+import com.orientechnologies.orient.core.db.record.ODatabaseRecordAbstract;
+import com.orientechnologies.orient.core.iterator.ORecordIteratorCluster;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 
 @Test(groups = { ""crud"", ""record-csv"" }, sequential = true)
-public class CRUDFlatPhysicalTest extends FlatDBBaseTest {
+public class CRUDFlatPhysicalTest extends DocumentDBBaseTest {
   private static final String CLUSTER_NAME = ""binary"";
   protected static final int  TOT_RECORDS  = 100;
 
@@ -41,16 +41,16 @@ public CRUDFlatPhysicalTest(@Optional String url) {
     super(url);
   }
 
-	@BeforeClass
-	@Override
-	public void beforeClass() throws Exception {
-		super.beforeClass();
-		record = database.newInstance();
-	}
+  @BeforeClass
+  @Override
+  public void beforeClass() throws Exception {
+    super.beforeClass();
+    record = new ORecordFlat();
+  }
 
-	public void createRaw() {
-		if (database.getClusterIdByName(CLUSTER_NAME) < 0)
-			database.addCluster(CLUSTER_NAME);
+  public void createRaw() {
+    if (database.getClusterIdByName(CLUSTER_NAME) < 0)
+      database.addCluster(CLUSTER_NAME);
 
     startRecordNumber = database.countClusterElements(CLUSTER_NAME);
 
@@ -73,7 +73,8 @@ public void readRawWithExpressiveForwardIterator() {
     for (int i = 0; i < TOT_RECORDS; i++)
       ids.add(i);
 
-    for (ORecordFlat rec : database.browseCluster(CLUSTER_NAME)) {
+    for (ORecordFlat rec : new ORecordIteratorCluster<ORecordFlat>(database, (ODatabaseRecordAbstract) database.getUnderlying(),
+        database.getClusterIdByName(CLUSTER_NAME), true)) {
       fields = rec.value().split(""-"");
 
       int i = Integer.parseInt(fields[0]);
@@ -87,7 +88,8 @@ public void readRawWithExpressiveForwardIterator() {
   public void updateRaw() {
     String[] fields;
 
-    for (ORecordFlat rec : database.browseCluster(CLUSTER_NAME)) {
+    for (ORecordFlat rec : new ORecordIteratorCluster<ORecordFlat>(database, (ODatabaseRecordAbstract) database.getUnderlying(),
+        database.getClusterIdByName(CLUSTER_NAME), true)) {
       fields = rec.value().split(""-"");
       int i = Integer.parseInt(fields[0]);
       if (i % 2 == 0) {
@@ -105,7 +107,8 @@ public void testUpdateRaw() {
     for (int i = 0; i < TOT_RECORDS; i++)
       ids.add(i);
 
-    for (ORecordFlat rec : database.browseCluster(CLUSTER_NAME)) {
+    for (ORecordFlat rec : new ORecordIteratorCluster<ORecordFlat>(database, (ODatabaseRecordAbstract) database.getUnderlying(),
+        database.getClusterIdByName(CLUSTER_NAME), true)) {
       fields = rec.value().split(""-"");
 
       int i = Integer.parseInt(fields[0]);
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DictionaryTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DictionaryTest.java
index a4c3c2ad1a4..54383db3c65 100755
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DictionaryTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DictionaryTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.record.ORecord;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
@@ -40,49 +39,32 @@ public DictionaryTest(@Optional String url) {
 	}
 
 	public void testDictionaryCreate() throws IOException {
-    ODatabaseFlat database = new ODatabaseFlat(url);
-    database.open(""admin"", ""admin"");
-    ORecordFlat record = database.newInstance();
+    ORecordFlat record = new ORecordFlat();
 
     database.getDictionary().put(""key1"", record.value(""Dictionary test!""));
-
-    database.close();
   }
 
   @Test(dependsOnMethods = ""testDictionaryCreate"")
   public void testDictionaryLookup() throws IOException {
-    ODatabaseFlat database = new ODatabaseFlat(url);
-    database.open(""admin"", ""admin"");
-
     Assert.assertNotNull(database.getDictionary().get(""key1""));
     Assert.assertTrue(((ORecordFlat) database.getDictionary().get(""key1"")).value().equals(""Dictionary test!""));
-
-    database.close();
   }
 
   @Test(dependsOnMethods = ""testDictionaryLookup"")
   public void testDictionaryUpdate() throws IOException {
-    ODatabaseFlat database = new ODatabaseFlat(url);
-    database.open(""admin"", ""admin"");
-
     final long originalSize = database.getDictionary().size();
 
-    database.getDictionary().put(""key1"", database.newInstance().value(""Text changed""));
+    database.getDictionary().put(""key1"", new ORecordFlat().value(""Text changed""));
 
     database.close();
     database.open(""admin"", ""admin"");
 
     Assert.assertEquals(((ORecordFlat) database.getDictionary().get(""key1"")).value(), ""Text changed"");
     Assert.assertEquals(database.getDictionary().size(), originalSize);
-
-    database.close();
   }
 
   @Test(dependsOnMethods = ""testDictionaryUpdate"")
   public void testDictionaryDelete() throws IOException {
-    ODatabaseFlat database = new ODatabaseFlat(url);
-    database.open(""admin"", ""admin"");
-
     final long originalSize = database.getDictionary().size();
     Assert.assertNotNull(database.getDictionary().remove(""key1""));
 
@@ -90,22 +72,17 @@ public void testDictionaryDelete() throws IOException {
     database.open(""admin"", ""admin"");
 
     Assert.assertEquals(database.getDictionary().size(), originalSize - 1);
-
-    database.close();
   }
 
   @Test(dependsOnMethods = ""testDictionaryDelete"")
   public void testDictionaryMassiveCreate() throws IOException {
-    ODatabaseFlat database = new ODatabaseFlat(url);
-    database.open(""admin"", ""admin"");
-
     final long originalSize = database.getDictionary().size();
 
     // ASSURE TO STORE THE PAGE-SIZE + 3 FORCING THE CREATION OF LEFT AND RIGHT
     final int total = 1000;
 
     for (int i = total; i > 0; --i) {
-      database.getDictionary().put(""key-"" + (originalSize + i), database.newInstance().value(""test-dictionary-"" + i));
+      database.getDictionary().put(""key-"" + (originalSize + i), new ORecordFlat().value(""test-dictionary-"" + i));
     }
 
     for (int i = total; i > 0; --i) {
@@ -114,22 +91,15 @@ public void testDictionaryMassiveCreate() throws IOException {
     }
 
     Assert.assertEquals(database.getDictionary().size(), originalSize + total);
-
-    database.close();
   }
 
   @Test(dependsOnMethods = ""testDictionaryMassiveCreate"")
   public void testDictionaryInTx() throws IOException {
-    ODatabaseFlat database = new ODatabaseFlat(url);
-    database.open(""admin"", ""admin"");
-
     database.begin();
-    database.getDictionary().put(""tx-key"", database.newInstance().value(""tx-test-dictionary""));
+    database.getDictionary().put(""tx-key"", new ORecordFlat().value(""tx-test-dictionary""));
     database.commit();
 
     Assert.assertNotNull(database.getDictionary().get(""tx-key""));
-
-    database.close();
   }
 
   public class ObjectDictionaryTest {
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/FlatDBBaseTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/FlatDBBaseTest.java
deleted file mode 100644
index fe45fa706d6..00000000000
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/FlatDBBaseTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.orientechnologies.orient.test.database.auto;
-
-import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
-
-/**
- * @author Andrey Lomakin <a href=""mailto:lomakin.andrey@gmail.com"">Andrey Lomakin</a>
- * @since 7/10/14
- */
-public abstract class FlatDBBaseTest extends BaseTest<ODatabaseFlat> {
-	@Parameters(value = ""url"")
-  protected FlatDBBaseTest(@Optional String url) {
-    super(url);
-  }
-
-  @Override
-  protected ODatabaseFlat createDatabaseInstance(String url) {
-    return new ODatabaseFlat(url);
-  }
-
-	@Override
-	protected void createDatabase() {
-		ODatabaseDocumentTx db = new ODatabaseDocumentTx(database.getURL());
-		db.create();
-		db.close();
-
-		database.open(""admin"", ""admin"");
-	}
-}
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java
index 391133364b1..e06eef77857 100755
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java
@@ -25,7 +25,6 @@
 import com.orientechnologies.orient.core.db.ODatabase;
 import com.orientechnologies.orient.core.db.ODatabaseListener;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.exception.OConcurrentModificationException;
 import com.orientechnologies.orient.core.exception.OTransactionException;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
@@ -45,13 +44,13 @@ public TransactionAtomicTest(@Optional String url) {
 
   @Test
   public void testTransactionAtomic() throws IOException {
-    ODatabaseFlat db1 = new ODatabaseFlat(url);
+    ODatabaseDocumentTx db1 = new ODatabaseDocumentTx(url);
     db1.open(""admin"", ""admin"");
 
-    ODatabaseFlat db2 = new ODatabaseFlat(url);
+    ODatabaseDocumentTx db2 = new ODatabaseDocumentTx(url);
     db2.open(""admin"", ""admin"");
 
-    ORecordFlat record1 = new ORecordFlat(db1);
+    ORecordFlat record1 = new ORecordFlat();
     record1.value(""This is the first version"").save();
 
     // RE-READ THE RECORD
@@ -91,7 +90,7 @@ public void testMVCC() throws IOException {
 
   @Test(expectedExceptions = OTransactionException.class)
   public void testTransactionPreListenerRollback() throws IOException {
-    ODatabaseFlat db = new ODatabaseFlat(url);
+    ODatabaseDocumentTx db = new ODatabaseDocumentTx(url);
     db.open(""admin"", ""admin"");
 
     ORecordFlat record1 = new ORecordFlat(db);
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/CreateRelationshipsSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/CreateRelationshipsSpeedTest.java
index 080197a4492..5c9b0944325 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/CreateRelationshipsSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/CreateRelationshipsSpeedTest.java
@@ -19,12 +19,11 @@
 import java.io.UnsupportedEncodingException;
 
 import com.orientechnologies.common.test.SpeedTestMonoThread;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
-import com.orientechnologies.orient.core.storage.OStorage;
 
 public class CreateRelationshipsSpeedTest extends SpeedTestMonoThread {
-	private ODatabaseFlat	database;
+	private ODatabaseDocumentTx database;
 	private ORecordFlat		record;
 
 	public CreateRelationshipsSpeedTest() {
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupInverseSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupInverseSpeedTest.java
index 095137fffe6..a94eddda3a0 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupInverseSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupInverseSpeedTest.java
@@ -17,17 +17,17 @@
 
 import java.io.UnsupportedEncodingException;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.Orient;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
 
 @Test(enabled = false)
 public class DictionaryLookupInverseSpeedTest extends OrientMonoThreadTest {
-	private ODatabaseFlat	database;
+	private ODatabaseDocumentTx database;
 
 	public static void main(String[] iArgs) throws InstantiationException, IllegalAccessException {
 		DictionaryLookupInverseSpeedTest test = new DictionaryLookupInverseSpeedTest();
@@ -37,7 +37,7 @@ public static void main(String[] iArgs) throws InstantiationException, IllegalAc
 	public DictionaryLookupInverseSpeedTest() {
 		super(100000);
 		Orient.instance().getProfiler().startRecording();
-		database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
+		database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
 	}
 
 	@Override
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupSpeedTest.java
index 8a660404859..fd1b3dd6610 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryLookupSpeedTest.java
@@ -17,17 +17,17 @@
 
 import java.io.UnsupportedEncodingException;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.Orient;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
 
 @Test(enabled = false)
 public class DictionaryLookupSpeedTest extends OrientMonoThreadTest {
-	private ODatabaseFlat	database;
+	private ODatabaseDocumentTx database;
 
 	public static void main(String[] iArgs) throws InstantiationException, IllegalAccessException {
 		DictionaryLookupSpeedTest test = new DictionaryLookupSpeedTest();
@@ -37,7 +37,7 @@ public static void main(String[] iArgs) throws InstantiationException, IllegalAc
 	public DictionaryLookupSpeedTest() {
 		super(100000);
 		Orient.instance().getProfiler().startRecording();
-		database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
+		database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
 	}
 
 	@Override
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryPutSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryPutSpeedTest.java
index ab7d510ef1e..684a385244a 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryPutSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/DictionaryPutSpeedTest.java
@@ -15,10 +15,10 @@
  */
 package com.orientechnologies.orient.test.database.speed;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.Orient;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.intent.OIntentMassiveInsert;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
@@ -26,7 +26,7 @@
 
 @Test(enabled = false)
 public class DictionaryPutSpeedTest extends OrientMonoThreadTest {
-	private ODatabaseFlat	database;
+	private ODatabaseDocumentTx database;
 	private ORecordFlat		record;
 	private long					startNum;
 
@@ -40,10 +40,10 @@ public DictionaryPutSpeedTest() throws InstantiationException, IllegalAccessExce
 		super(1000000);
 
 		String url = System.getProperty(""url"");
-		database = new ODatabaseFlat(url).open(""admin"", ""admin"");
+		database = new ODatabaseDocumentTx(url).open(""admin"", ""admin"");
 		database.declareIntent(new OIntentMassiveInsert());
 
-		record = database.newInstance();
+		record = new ORecordFlat();
 		startNum = 0;// database.countClusterElements(""Animal"");
 
 		 Orient.instance().getProfiler().startRecording();
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateBinarySpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateBinarySpeedTest.java
index 7c2c3de9567..711877b3895 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateBinarySpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateBinarySpeedTest.java
@@ -17,10 +17,10 @@
 
 import java.util.Random;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.Orient;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.intent.OIntentMassiveInsert;
 import com.orientechnologies.orient.core.record.impl.ORecordBytes;
 import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
@@ -28,7 +28,7 @@
 
 @Test(enabled = false)
 public class LocalCreateBinarySpeedTest extends OrientMonoThreadTest {
-  private ODatabaseFlat    database;
+  private ODatabaseDocumentTx database;
   private ORecordBytes     record;
   private final static int RECORD_SIZE = 512;
   private byte[]           recordContent;
@@ -46,7 +46,7 @@ public LocalCreateBinarySpeedTest() throws InstantiationException, IllegalAccess
   public void init() {
     Orient.instance().getProfiler().startRecording();
 
-    database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
+    database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
     record = new ORecordBytes();
 
     database.declareIntent(new OIntentMassiveInsert());
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatMultiThreadSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatMultiThreadSpeedTest.java
index 80196ce13b2..36d663b78f8 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatMultiThreadSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatMultiThreadSpeedTest.java
@@ -15,11 +15,11 @@
  */
 package com.orientechnologies.orient.test.database.speed;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.common.test.SpeedTestMultiThreads;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.intent.OIntentMassiveInsert;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
@@ -28,12 +28,12 @@
 
 @Test(enabled = false)
 public class LocalCreateFlatMultiThreadSpeedTest extends OrientMultiThreadTest {
-  protected ODatabaseFlat database;
+  protected ODatabaseDocumentTx database;
   private long            foundObjects;
 
   @Test(enabled = false)
   public static class CreateObjectsThread extends OrientThreadTest {
-    protected ODatabaseFlat database;
+    protected ODatabaseDocumentTx database;
     protected ORecordFlat   record;
 
     public CreateObjectsThread(final SpeedTestMultiThreads parent, final int threadId) {
@@ -42,8 +42,8 @@ public CreateObjectsThread(final SpeedTestMultiThreads parent, final int threadI
 
     @Override
     public void init() {
-      database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
-      record = database.newInstance();
+      database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
+      record = new ORecordFlat();
       database.declareIntent(new OIntentMassiveInsert());
       database.begin(TXTYPE.NOTX);
     }
@@ -75,7 +75,7 @@ public static void main(String[] iArgs) throws InstantiationException, IllegalAc
 
   @Override
   public void init() {
-    database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
+    database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
     foundObjects = database.countClusterElements(""flat"");
 
     System.out.println(""\nTotal objects in Animal cluster before the test: "" + foundObjects);
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatSpeedTest.java
index 11efd77aefa..800a7eaa423 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/LocalCreateFlatSpeedTest.java
@@ -15,11 +15,11 @@
  */
 package com.orientechnologies.orient.test.database.speed;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.intent.OIntentMassiveInsert;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
@@ -27,7 +27,7 @@
 
 @Test(enabled = false)
 public class LocalCreateFlatSpeedTest extends OrientMonoThreadTest {
-  private ODatabaseFlat database;
+  private ODatabaseDocumentTx database;
   private ORecordFlat   record;
   private long          date = System.currentTimeMillis();
 
@@ -45,13 +45,13 @@ public LocalCreateFlatSpeedTest() throws InstantiationException, IllegalAccessEx
   public void init() {
     Orient.instance().getProfiler().startRecording();
 
-    database = new ODatabaseFlat(System.getProperty(""url""));
+    database = new ODatabaseDocumentTx(System.getProperty(""url""));
     if (database.exists())
       database.open(""admin"", ""admin"");
     else
       database.create();
 
-    record = database.newInstance();
+    record = new ORecordFlat();
 
     database.declareIntent(new OIntentMassiveInsert());
     database.begin(TXTYPE.NOTX);
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateFlatSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateFlatSpeedTest.java
index 3d843ccf822..ff0cbd611ab 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateFlatSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateFlatSpeedTest.java
@@ -15,16 +15,16 @@
  */
 package com.orientechnologies.orient.test.database.speed;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.annotations.Test;
 
 import com.orientechnologies.orient.core.Orient;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
 
 @Test(enabled = false)
 public class TxRemoteCreateFlatSpeedTest extends OrientMonoThreadTest {
-  private ODatabaseFlat database;
+  private ODatabaseDocumentTx database;
   private ORecordFlat   record;
 
   public static void main(String[] iArgs) throws InstantiationException, IllegalAccessException {
@@ -40,8 +40,8 @@ public TxRemoteCreateFlatSpeedTest() throws InstantiationException, IllegalAcces
   public void init() {
     Orient.instance().getProfiler().startRecording();
 
-    database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
-    record = database.newInstance();
+    database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
+    record = new ORecordFlat();
 
     database.begin();
   }
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateObjectsMultiThreadSpeedTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateObjectsMultiThreadSpeedTest.java
index a041b4f5281..3d3c316871c 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateObjectsMultiThreadSpeedTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxRemoteCreateObjectsMultiThreadSpeedTest.java
@@ -16,20 +16,19 @@
 package com.orientechnologies.orient.test.database.speed;
 
 import com.orientechnologies.common.test.SpeedTestMultiThreads;
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
-import com.orientechnologies.orient.core.storage.OStorage;
 import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
 import com.orientechnologies.orient.test.database.base.OrientMultiThreadTest;
 import com.orientechnologies.orient.test.database.base.OrientThreadTest;
 
 public class TxRemoteCreateObjectsMultiThreadSpeedTest extends OrientMultiThreadTest {
-  protected ODatabaseFlat database;
-  protected long          foundObjects;
+  protected ODatabaseDocumentTx database;
+  protected long                foundObjects;
 
   public static class CreateObjectsThread extends OrientThreadTest {
-    protected ODatabaseFlat database;
-    protected ORecordFlat   record = new ORecordFlat();
+    protected ODatabaseDocumentTx database;
+    protected ORecordFlat         record = new ORecordFlat();
 
     public CreateObjectsThread(final SpeedTestMultiThreads parent, final int threadId) {
       super(parent, threadId);
@@ -37,8 +36,8 @@ public CreateObjectsThread(final SpeedTestMultiThreads parent, final int threadI
 
     @Override
     public void init() {
-      database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
-      record = database.newInstance();
+      database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
+      record = new ORecordFlat();
 
       database.begin(TXTYPE.NOTX);
     }
@@ -69,7 +68,7 @@ public static void main(String[] iArgs) throws InstantiationException, IllegalAc
 
   @Override
   public void init() {
-    database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
+    database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
 
     if (!database.getStorage().getClusterNames().contains(""Animal""))
       database.addCluster(""Animal"");
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxTest.java
index 151dad1d413..1a5ec437302 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/speed/TxTest.java
@@ -17,22 +17,22 @@
 
 import java.io.UnsupportedEncodingException;
 
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import org.testng.annotations.Test;
 
-import com.orientechnologies.orient.core.db.record.ODatabaseFlat;
 import com.orientechnologies.orient.core.record.impl.ORecordFlat;
 import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
 import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
 
 @Test(enabled = false)
 public class TxTest extends OrientMonoThreadTest {
-	private ODatabaseFlat	database;
+	private ODatabaseDocumentTx database;
 	private ORecordFlat					record;
 
 	public TxTest() throws InstantiationException, IllegalAccessException {
 		super(10);
-		database = new ODatabaseFlat(System.getProperty(""url"")).open(""admin"", ""admin"");
-		record = database.newInstance();
+		database = new ODatabaseDocumentTx(System.getProperty(""url"")).open(""admin"", ""admin"");
+		record = new ORecordFlat();
 
 		database.begin(TXTYPE.OPTIMISTIC);
 	}"
c3b4d70410f2acd2a7d6f3ef9fbcd2a156fe9f30,coremedia$jangaroo-tools,"Submit last night's results:
* Correct handling of newlines inside generated strings (e.g. modifiers rendered inside string for the runtime to interpret).
* Support *-imports. Not recommended, since it disables automatic class loading, but good for reusing existing ActionScript 3 libraries.
* FlexUnit now compiles and runs with minimal changes:
- added some missing semicolons
- static members of super classes are not in scope
- the super class and package-scoped methods still have to be
imported explicitly
- ArrayCollection not yet implemented
- special case when subclassing native class Error
[git-p4: depot-paths = ""//coremedia/jangaroo/"": change = 146563]
",a,https://github.com/coremedia/jangaroo-tools,"diff --git a/jooc/src/main/cup/net/jangaroo/jooc/joo.cup b/jooc/src/main/cup/net/jangaroo/jooc/joo.cup
index e1169a5f1..5b504c150 100644
--- a/jooc/src/main/cup/net/jangaroo/jooc/joo.cup
+++ b/jooc/src/main/cup/net/jangaroo/jooc/joo.cup
@@ -229,6 +229,8 @@ classBody ::=
 
 classBodyDeclarations ::=
     {: RESULT = new ArrayList(); :}
+  | classBodyDeclarations:list directive:d
+    {: RESULT = list; :}
   | classBodyDeclarations:list	classBodyDeclaration:decl
     {: RESULT = list; list.add(decl); :}
   ;
@@ -269,6 +271,8 @@ constOrVar ::=
 directive ::=
     IMPORT:i qualifiedIde:ide SEMICOLON:s
     {: RESULT = new ImportDirective(i,new IdeType(ide), s); :}
+  | IMPORT:i qualifiedIde:ide DOT:dot MUL:all SEMICOLON:s
+    {: RESULT = new ImportDirective(i,new IdeType(new QualifiedIde(ide,dot,all)), s); :}
   | LBRACK:lb ide:ide RBRACK:rb
     {: RESULT = new Annotation(lb, ide, rb); :}
   | LBRACK:lb ide:ide LPAREN:lb2 annotationFields:af RPAREN:rb2 RBRACK:rb
@@ -286,7 +290,7 @@ annotationField ::=
     ide:name EQ:eq expr:value
     {: RESULT = new ObjectField(new IdeExpr(name),eq,value); :}
   | expr:value
-    {: RESULT = new ObjectField(new IdeExpr(new Ide(new JooSymbol(""""))),null,value); :}
+    {: RESULT = new ObjectField(null,null,value); :}
   ;
 
 annotationFields ::=
diff --git a/jooc/src/main/java/net/jangaroo/jooc/ApplyExpr.java b/jooc/src/main/java/net/jangaroo/jooc/ApplyExpr.java
index 39e17a443..857549d14 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/ApplyExpr.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/ApplyExpr.java
@@ -22,6 +22,9 @@
  */
 class ApplyExpr extends Expr {
 
+  // TODO: add a compiler option for this:
+  public static final boolean ASSUME_UNDECLARED_UPPER_CASE_FUNCTIONS_CALLS_ARE_TYPE_CASTS = Boolean.valueOf(""true"");
+
   Expr fun;
   boolean isType;
   JooSymbol lParen;
@@ -63,9 +66,9 @@ public void analyze(Node parentNode, AnalyzeContext context) {
       // otherwise, it is most likely an imported package-namespaced function.
       if (Character.isUpperCase(funIde.getName().charAt(0))) {
         Scope scope = context.getScope().findScopeThatDeclares(funIde);
-        if (scope!=null) {
-          isType = scope.getDeclaration()==context.getScope().getPackageDeclaration();
-        }
+        isType = scope == null
+          ? ASSUME_UNDECLARED_UPPER_CASE_FUNCTIONS_CALLS_ARE_TYPE_CASTS
+          : scope.getDeclaration() == context.getScope().getPackageDeclaration();
       }
     }
     fun.analyze(this, context);
diff --git a/jooc/src/main/java/net/jangaroo/jooc/ClassDeclaration.java b/jooc/src/main/java/net/jangaroo/jooc/ClassDeclaration.java
index 9797a8188..a2d5f048d 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/ClassDeclaration.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/ClassDeclaration.java
@@ -28,6 +28,7 @@ public class ClassDeclaration extends IdeDeclaration {
   private Map<String,MemberDeclaration> members = new LinkedHashMap<String,MemberDeclaration>();
   private Set<String> boundMethodCandidates = new HashSet<String>();
   private Set<String> classInit = new HashSet<String>();
+  private List<String> packageImports;
 
   public Extends getOptExtends() {
     return optExtends;
@@ -88,15 +89,14 @@ public void setConstructor(MethodDeclaration methodDeclaration) {
   }
 
   public void generateCode(JsWriter out) throws IOException {
-    out.writeSymbolWhitespace(symClass);
-    if (!writeRuntimeModifiersUnclosed(out)) {
-      out.write(""\"""");
-    }
-    out.writeSymbolToken(symClass);
+    out.beginString();
+    writeModifiers(out);
+    out.writeSymbol(symClass);
     ide.generateCode(out);
     if (optExtends != null) optExtends.generateCode(out);
     if (optImplements != null) optImplements.generateCode(out);
-    out.write(""\"",["");
+    out.endString();
+    out.write("",["");
     boolean isFirst = true;
     for (MemberDeclaration memberDeclaration : members.values()) {
       if (memberDeclaration.isMethod() && memberDeclaration.isPublic() && memberDeclaration.isStatic()) {
@@ -111,7 +111,12 @@ public void generateCode(JsWriter out) throws IOException {
       }
     }
     out.write(""],"");
-    out.write(""function($jooPublic,$jooPrivate){with($jooPublic)with($jooPrivate)return["");
+    String packageName = QualifiedIde.constructQualifiedNameStr(getPackageDeclaration().getQualifiedName());
+    out.write(""function($jooPublic,$jooPrivate){"");
+    for (String importedPackage : packageImports) {
+      out.write(""with(""+importedPackage+"")"");
+    }
+    out.write(""with(""+ packageName +"")with($jooPublic)with($jooPrivate)return["");
     if (!classInit.isEmpty()) {
       out.write(""function(){joo.Class.init("");
       for (Iterator<String> iterator = classInit.iterator(); iterator.hasNext();) {
@@ -129,6 +134,7 @@ public void generateCode(JsWriter out) throws IOException {
   public void analyze(Node parentNode, AnalyzeContext context) {
     // do *not* call super!
     this.parentNode = parentNode;
+    packageImports = context.getCurrentPackage().getPackageImports();
     context.getScope().declareIde(getName(), this);
     parentDeclaration = context.getScope().getPackageDeclaration();
     context.enterScope(this);
diff --git a/jooc/src/main/java/net/jangaroo/jooc/Declaration.java b/jooc/src/main/java/net/jangaroo/jooc/Declaration.java
index e5f11d767..05e4edefb 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/Declaration.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/Declaration.java
@@ -120,28 +120,6 @@ protected void writeModifiers(JsWriter out) throws IOException {
     }
   }
 
-  protected void writeRuntimeModifiers(JsWriter out) throws IOException {
-    if (writeRuntimeModifiersUnclosed(out)) {
-      out.write(""\"","");
-    }
-  }
-
-  protected boolean writeRuntimeModifiersUnclosed(JsWriter out) throws IOException {
-    if (symModifiers.length>0) {
-      out.writeSymbolWhitespace(symModifiers[0]);
-      out.write('""');
-      for (int i = 0; i < symModifiers.length; i++) {
-        JooSymbol modifier = symModifiers[i];
-        if (i==0)
-          out.writeSymbolToken(modifier);
-        else
-          out.writeSymbol(modifier);
-      }
-      return true;
-    }
-    return false;
-  }
-
   public void analyze(Node parentNode, AnalyzeContext context) {
     super.analyze(parentNode, context);
     parentDeclaration = context.getScope().getDeclaration();
diff --git a/jooc/src/main/java/net/jangaroo/jooc/DotExpr.java b/jooc/src/main/java/net/jangaroo/jooc/DotExpr.java
index d0374a329..cd92f9407 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/DotExpr.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/DotExpr.java
@@ -48,10 +48,11 @@ public void analyze(Node parentNode, AnalyzeContext context) {
       if (!(parentNode instanceof ApplyExpr)) {
         String[] qualifiedName = getQualifiedName(arg1);
         if (qualifiedName!=null) {
-          String qulifiedNameStr = QualifiedIde.constructQualifiedNameStr(qualifiedName);
-          Scope declaringScope = context.getScope().findScopeThatDeclares(qulifiedNameStr);
-          if (declaringScope!=null && declaringScope.getDeclaration().equals(context.getCurrentPackage())) {
-            this.classDeclaration.addClassInit(qulifiedNameStr);
+          String qualifiedNameStr = QualifiedIde.constructQualifiedNameStr(qualifiedName);
+          Scope declaringScope = context.getScope().findScopeThatDeclares(qualifiedNameStr);
+          if (declaringScope==null && qualifiedNameStr.indexOf('.')==-1 && Character.isUpperCase(qualifiedNameStr.charAt(0))
+            || declaringScope!=null && declaringScope.getDeclaration().equals(context.getCurrentPackage())) {
+            this.classDeclaration.addClassInit(qualifiedNameStr);
           }
         }
       }
diff --git a/jooc/src/main/java/net/jangaroo/jooc/FieldDeclaration.java b/jooc/src/main/java/net/jangaroo/jooc/FieldDeclaration.java
index 18d789af3..dc7db6fca 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/FieldDeclaration.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/FieldDeclaration.java
@@ -35,13 +35,11 @@ public boolean isField() {
   }
 
   public void generateCode(JsWriter out) throws IOException {
-    out.writeSymbolWhitespace(optSymConstOrVar);
-    if (!writeRuntimeModifiersUnclosed(out)) {
-      out.write(""\"""");
-    }
-    out.writeSymbolToken(optSymConstOrVar);
-    out.write(""\"","");
-    out.write('{');
+    out.beginString();
+    writeModifiers(out);
+    out.writeSymbol(optSymConstOrVar);
+    out.endString();
+    out.write("",{"");
     generateIdeCode(out);
     if (optTypeRelation != null)
       optTypeRelation.generateCode(out);
diff --git a/jooc/src/main/java/net/jangaroo/jooc/ImportDirective.java b/jooc/src/main/java/net/jangaroo/jooc/ImportDirective.java
index aa142b060..b8be3237b 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/ImportDirective.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/ImportDirective.java
@@ -37,9 +37,16 @@ public void analyze(Node parentNode, AnalyzeContext context) {
     super.analyze(parentNode, context);
     if (type instanceof IdeType) {
       Ide ide = ((IdeType)type).ide;
-      context.getScope().declareIde(ide.getName(), this);
-      // also add the fully qualified name (might be the same string for top level imports):
-      context.getScope().declareIde(QualifiedIde.constructQualifiedNameStr(ide.getQualifiedName()), this);
+      String typeName = ide.getName();
+      if (""*"".equals(typeName)) {
+        // found *-import, do not register, but add to package import list:
+        String packageName = QualifiedIde.constructQualifiedNameStr(((QualifiedIde)ide).prefix.getQualifiedName());
+        context.getCurrentPackage().addPackageImport(packageName);
+      } else {
+        context.getScope().declareIde(typeName, this);
+        // also add the fully qualified name (might be the same string for top level imports):
+        context.getScope().declareIde(QualifiedIde.constructQualifiedNameStr(ide.getQualifiedName()), this);
+      }
     }
   }
 
diff --git a/jooc/src/main/java/net/jangaroo/jooc/JsWriter.java b/jooc/src/main/java/net/jangaroo/jooc/JsWriter.java
index 28a606519..5e99d3ffa 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/JsWriter.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/JsWriter.java
@@ -33,6 +33,8 @@ public class JsWriter extends FilterWriter {
   boolean inComment = false;
   int nOpenBeginComments = 0;
   char lastChar = ' ';
+  boolean inString = false;
+  int nOpenStrings = 0;
 
   public JsWriter(Writer target) {
     super(target);
@@ -152,7 +154,7 @@ public void beginComment() throws IOException {
     nOpenBeginComments++;
   }
 
-  private final boolean shouldWrite() throws IOException {
+  private boolean shouldWrite() throws IOException {
     boolean result = keepSource || nOpenBeginComments == 0;
     if (result) {
       if (nOpenBeginComments > 0 && !inComment) {
@@ -178,10 +180,65 @@ public void beginCommentWriteSymbol(JooSymbol symbol) throws IOException {
     writeSymbol(symbol);
   }
 
+  public void beginString() throws IOException {
+    nOpenStrings++;
+  }
+
+  private void checkOpenString() throws IOException {
+    if (nOpenStrings > 0 && !inString) {
+      out.write('""');
+      lastChar = '""';
+      inString = true;
+    }
+  }
+
+  private boolean checkCloseString() throws IOException {
+    if (inString) {
+      out.write('""');
+      inString = false;
+      return true;
+    }
+    return false;
+  }
+
+  public void endString() throws IOException {
+    Debug.assertTrue(nOpenStrings > 0, ""missing beginString() for endString()"");
+    nOpenStrings--;
+    if (nOpenStrings == 0) {
+      checkCloseString();
+    }
+  }
+
+  private void writeLinesInsideString(String ws) throws IOException {
+    String[] lines = ws.split(""\n"",-1);
+    for (int i = 0; i < lines.length-1; i++) {
+      String line = lines[i];
+      if (line.length()>1) {
+        checkOpenString();
+        write(line.substring(0,line.length()-1));
+        write(""\\n"");
+      }
+      if(checkCloseString()) {
+        write(""+"");
+      }
+      write(""\n"");
+    }
+    String line = lines[lines.length - 1];
+    if (line.length()>0) {
+      checkOpenString();
+      write(line);
+    }
+  }
+
   public void writeSymbolWhitespace(JooSymbol symbol) throws IOException {
     String ws = symbol.getWhitespace();
-    if (keepSource)
-      write(ws);
+    if (keepSource) {
+      if (inString) {
+        writeLinesInsideString(ws);
+      } else {
+        write(ws);
+      }
+    }
     else if (keepLines)
       writeLines(ws);
   }
@@ -192,8 +249,14 @@ protected void writeLines(String s) throws IOException {
 
   protected void writeLines(String s, int off, int len) throws IOException {
      int pos = off;
-     while ((pos = s.indexOf('\n', pos)+1) > 0 && pos < off+len+1)
+     while ((pos = s.indexOf('\n', pos)+1) > 0 && pos < off+len+1) {
+       if (inString) {
+         write(""\\n"");
+         checkCloseString();
+         write('+');
+       }
        write('\n');
+     }
   }
 
   public void writeToken(String token) throws IOException {
@@ -204,6 +267,7 @@ public void writeToken(String token) throws IOException {
             (lastChar == firstSymbolChar && ""=><!&|+-*/&|^%"".indexOf(lastChar) >= 0) ||
             (firstSymbolChar == '=' && ""=><!&|+-*/&|^%"".indexOf(lastChar) >= 0))
         write(' ');
+      checkOpenString();
       write(text);
     }
   }
diff --git a/jooc/src/main/java/net/jangaroo/jooc/MethodDeclaration.java b/jooc/src/main/java/net/jangaroo/jooc/MethodDeclaration.java
index 11ecafe4a..b0f442645 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/MethodDeclaration.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/MethodDeclaration.java
@@ -125,26 +125,27 @@ public void generateCode(JsWriter out) throws IOException {
       out.writeSymbol(symFunction);
       ide.generateCode(out);
     } else {
-      if (!writeRuntimeModifiersUnclosed(out))
-        out.write(""\"""");
-      else
-        out.write("" "");
+      out.beginString();
+      writeModifiers(out);
       String methodName = ide.getName();
-      out.write(methodName);
-      out.write(""\"","");
+      if (!isConstructor && !isStatic() && classDeclaration.isBoundMethod(methodName)) {
+        out.writeToken(""bound"");
+      }
+      out.writeToken(methodName);
+      out.endString();
+      out.write("","");
       out.writeSymbol(symFunction);
       out.writeSymbolWhitespace(ide.ide);
       if (out.getKeepSource()) {
-        out.write("" "");
         if (isConstructor) {
           // do not name the constructor initializer function like the class, or it will be called
           // instead of the constructor function generated by the runtime! So we prefix it with a ""$"".
           // The name is for debugging purposes only, anyway.
-          out.write(""$""+methodName);
+          out.writeToken(""$""+methodName);
         } else if (ide instanceof AccessorIde) {
-          out.write(((AccessorIde)ide).getFunctionName());
+          out.writeToken(((AccessorIde)ide).getFunctionName());
         } else {
-          out.write(methodName);
+          out.writeToken(methodName);
         }
       }
     }
diff --git a/jooc/src/main/java/net/jangaroo/jooc/ObjectField.java b/jooc/src/main/java/net/jangaroo/jooc/ObjectField.java
index 3831976b5..c02ab5d6a 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/ObjectField.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/ObjectField.java
@@ -34,13 +34,17 @@ public ObjectField(Expr nameExpr, JooSymbol symColon, Expr value) {
 
   public void analyze(Node parentNode, AnalyzeContext context) {
     super.analyze(parentNode, context);
-    nameExpr.analyze(this, context);
+    if (nameExpr!=null) {
+      nameExpr.analyze(this, context);
+    }
     value.analyze(this, context);
   }
 
   public void generateCode(JsWriter out) throws IOException {
-    nameExpr.generateCode(out);
-    out.writeSymbol(symColon);
+    if (nameExpr!=null) {
+      nameExpr.generateCode(out);
+      out.writeSymbol(symColon);
+    }
     value.generateCode(out);
   }
 
diff --git a/jooc/src/main/java/net/jangaroo/jooc/PackageDeclaration.java b/jooc/src/main/java/net/jangaroo/jooc/PackageDeclaration.java
index f82eaaf8d..f0a343dd7 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/PackageDeclaration.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/PackageDeclaration.java
@@ -16,6 +16,9 @@
 package net.jangaroo.jooc;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
 
 /**
  * @author Andreas Gawecki
@@ -23,6 +26,15 @@
 public class PackageDeclaration extends IdeDeclaration  {
 
   JooSymbol symPackage;
+  private List<String> packageImports = new ArrayList<String>();
+
+  public void addPackageImport(String packageName) {
+    packageImports.add(packageName);
+  }
+
+  public List<String> getPackageImports() {
+    return Collections.unmodifiableList(packageImports);
+  }
 
   public PackageDeclaration(JooSymbol symPackage, Ide ide) {
     super(new JooSymbol[0], 0, ide);
@@ -30,12 +42,12 @@ public PackageDeclaration(JooSymbol symPackage, Ide ide) {
   }
 
   public void generateCode(JsWriter out) throws IOException {
-    out.writeSymbolWhitespace(symPackage);
-    out.write(""\""package "");
+    out.beginString();
+    out.writeSymbol(symPackage);
     if (ide!=null) {
       ide.generateCode(out);
     }
-    out.write(""\"""");
+    out.endString();
     out.write("","");
   }
 
diff --git a/jooc/src/main/java/net/jangaroo/jooc/TopLevelIdeExpr.java b/jooc/src/main/java/net/jangaroo/jooc/TopLevelIdeExpr.java
index 53a2ce32c..859ba12f0 100644
--- a/jooc/src/main/java/net/jangaroo/jooc/TopLevelIdeExpr.java
+++ b/jooc/src/main/java/net/jangaroo/jooc/TopLevelIdeExpr.java
@@ -38,7 +38,7 @@ public void analyze(Node parentNode, AnalyzeContext context) {
     if (scope!=null) {
       Scope declaringScope = scope.findScopeThatDeclares(ide);
       if (declaringScope==null || declaringScope.getDeclaration() instanceof ClassDeclaration) {
-        synthesizedDotExpr = new DotExpr(new ThisExpr(new JooSymbol(""this"")), new JooSymbol("".""), ide);
+        synthesizedDotExpr = new DotExpr(new ThisExpr(new JooSymbol(""this"")), new JooSymbol("".""), new Ide(ide.ide));
         synthesizedDotExpr.analyze(parentNode, context);
       }
     }
@@ -59,25 +59,28 @@ private boolean addThis() {
       Scope declaringScope = scope.findScopeThatDeclares(ide);
       if (declaringScope==null) {
         // check for fully qualified ide:
-        IdeExpr currentExpr = this;
+        DotExpr currentDotExpr = synthesizedDotExpr;
         String ideName = ide.getName();
-        while (declaringScope==null && currentExpr.parentNode instanceof DotExpr && ((DotExpr)currentExpr.parentNode).arg2 instanceof IdeExpr) {
-          currentExpr = (IdeExpr)((DotExpr)currentExpr.parentNode).arg2;
-          ideName += ""."" +currentExpr.ide.getName();
+        while (currentDotExpr.parentNode instanceof DotExpr) {
+          currentDotExpr = (DotExpr)currentDotExpr.parentNode;
+          if (!(currentDotExpr.arg2 instanceof IdeExpr)) 
+            break;
+          ideName += ""."" +((IdeExpr)currentDotExpr.arg2).ide.getName();
           declaringScope = scope.findScopeThatDeclares(ideName);
+          if (declaringScope!=null) {
+            // it has been defined in the meantime or is an imported qualified identifier:
+            return false;
+          }
         }
-        if (declaringScope!=null) {
-          return false;
-        }
-        boolean probablyAType = Character.isUpperCase(ide.getName().charAt(0));
+        boolean maybeInScope = Character.isUpperCase(ide.getName().charAt(0));
         String warningMsg = ""Undeclared identifier: "" + ide.getName();
-        if (probablyAType) {
-          warningMsg += "", assuming it is a top level type."";
+        if (maybeInScope) {
+          warningMsg += "", assuming it is already in scope."";
         } else if (ASSUME_UNDECLARED_IDENTIFIERS_ARE_MEMBERS) {
           warningMsg += "", assuming it is an inherited member."";
         }
         Jooc.warning(ide.getSymbol(), warningMsg);
-        return !probablyAType && ASSUME_UNDECLARED_IDENTIFIERS_ARE_MEMBERS;
+        return !maybeInScope && ASSUME_UNDECLARED_IDENTIFIERS_ARE_MEMBERS;
       } else if (declaringScope.getDeclaration() instanceof ClassDeclaration) {
         MemberDeclaration memberDeclaration = (MemberDeclaration)declaringScope.getIdeDeclaration(ide);
         return !memberDeclaration.isStatic() && !memberDeclaration.isConstructor();
@@ -85,4 +88,5 @@ private boolean addThis() {
     }
     return false;
   }
+
 }
\ No newline at end of file
diff --git a/jooc/src/main/js/joo/Class.js b/jooc/src/main/js/joo/Class.js
index eca78a3ad..c97c163db 100644
--- a/jooc/src/main/js/joo/Class.js
+++ b/jooc/src/main/js/joo/Class.js
@@ -499,7 +499,7 @@ Function.prototype.bind = function(object) {
             var memberName = undefined;
             var modifiers;
             if (typeof members==""string"") {
-              modifiers = members.split("" "");
+              modifiers = members.split(/\s+/);
               for (var j=0; j<modifiers.length; ++j) {
                 var modifier = modifiers[j];
                 if (modifier==""static"") {
@@ -692,10 +692,23 @@ Function.prototype.bind = function(object) {
       var members = arguments[arguments.length-1];
       var imports = [];
       imports.byName = {};
+      imports.packages = [];
       for (var im=1; im<arguments.length-3; ++im) {
-        var importFullClassName = arguments[im].match(/^\s*import\s+([a-zA-Z$_0-9.]+)\s*$/)[1];
-        addImport(imports, importFullClassName);
+        var importMatch = arguments[im].match(/^\s*import\s+(([a-zA-Z$_0-9]+\.)*)(\*|[a-zA-Z$_0-9]+)\s*$/);
+        var importPackageName = importMatch[1]; // including last dot
+        var importClassName = importMatch[3];
+        if (importClassName == ""*"") {
+          imports.packages.push(importPackageName);
+        } else {
+          addImport(imports, importPackageName+importClassName);
+        }
+      }
+      var packageName =  """";
+      if (typeof packageDef==""string"") {
+        packageName = packageDef.split(/\s+/)[1];
+        imports.packages.push(packageName+""."");
       }
+      // TODO: find a way to use imports.packages for resolving extends and implements!
       var $interface = false;
       var classMatch = classDef.match(/^\s*((public|internal)\s+)?class\s+([A-Za-z][a-zA-Z$_0-9]*)(\s+extends\s+([a-zA-Z$_0-9.]+))?(\s+implements\s+([a-zA-Z$_0-9.,\s]+))?\s*$/);
       var $extends = ""Object"";
@@ -718,7 +731,7 @@ Function.prototype.bind = function(object) {
         $imports: imports,
         $publicStaticMethods: publicStaticMethods,
         $members: members,
-        $package: typeof packageDef==""string"" ? packageDef.split(/\s+/)[1] : """",
+        $package: packageName,
         visibility: classMatch[2],
         $interface : $interface,
         $class    : classMatch[3],"
8d5d40e81131bc4deafd39c57874c840c37d26a4,Vala,"Update delegate has_target syntax in *-custom.vala
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index 1893342c99..3eeb798293 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -103,7 +103,8 @@ namespace Gtk {
 		public GLib.SList<GLib.File> get_files ();
 	}
 
-	public static delegate void CallbackMarshal (Object object, void* data, Arg[] args);
+	[CCode (has_target = false)]
+	public delegate void CallbackMarshal (Object object, void* data, Arg[] args);
 
 	public delegate void ActionCallback (Action action);
 
diff --git a/vapi/packages/tracker-indexer-module-1.0/tracker-indexer-module-1.0-custom.vala b/vapi/packages/tracker-indexer-module-1.0/tracker-indexer-module-1.0-custom.vala
index 7f9752f4b3..f5cf696ead 100644
--- a/vapi/packages/tracker-indexer-module-1.0/tracker-indexer-module-1.0-custom.vala
+++ b/vapi/packages/tracker-indexer-module-1.0/tracker-indexer-module-1.0-custom.vala
@@ -138,26 +138,26 @@ namespace Tracker {
 		namespace Module {
 				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
 				public delegate void FileFreeDataFunc ();
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate void* FileGetDataFunc (string path);
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate weak Tracker.Metadata FileGetMetadataFunc (Tracker.File file);
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate weak string FileGetServiceTypeFunc (Tracker.File file);
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate weak string FileGetText (Tracker.File path);
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate void FileGetUriFunc (Tracker.File file, string dirname, string basename);
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate bool FileIterContents (Tracker.File path);
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate weak string GetDirectoriesFunc ();
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate weak string GetNameFunc ();
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate void Init ();
-				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
-				public static delegate void Shutdown ();
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate void* FileGetDataFunc (string path);
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate weak Tracker.Metadata FileGetMetadataFunc (Tracker.File file);
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate weak string FileGetServiceTypeFunc (Tracker.File file);
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate weak string FileGetText (Tracker.File path);
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate void FileGetUriFunc (Tracker.File file, string dirname, string basename);
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate bool FileIterContents (Tracker.File path);
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate weak string GetDirectoriesFunc ();
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate weak string GetNameFunc ();
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate void Init ();
+				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"", has_target = false)]
+				public delegate void Shutdown ();
 
 				[CCode (cheader_filename = ""tracker-1.0/libtracker-indexer/tracker-module.h"")]
 				public static void file_free_data (void* file_data);"
dc9e9cb4cc87f132a32a00e6589d807350f0b8e0,elasticsearch,Aggregations: change to default shard_size in- terms aggregation--The default shard size in the terms aggregation now uses BucketUtils.suggestShardSideQueueSize() to set the shard size if the user does not specify it as a parameter.--Closes -6857-,p,https://github.com/elastic/elasticsearch,"diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java
index c4b57064e80eb..c38f136dd9b29 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java
@@ -21,6 +21,7 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
+import org.elasticsearch.search.aggregations.bucket.BucketUtils;
 import org.elasticsearch.search.aggregations.bucket.terms.support.IncludeExclude;
 import org.elasticsearch.search.aggregations.support.ValuesSourceParser;
 import org.elasticsearch.search.internal.SearchContext;
@@ -32,7 +33,6 @@
  */
 public class TermsParser implements Aggregator.Parser {
 
-    
     @Override
     public String type() {
         return StringTerms.TYPE.name();
@@ -41,19 +41,22 @@ public String type() {
     @Override
     public AggregatorFactory parse(String aggregationName, XContentParser parser, SearchContext context) throws IOException {
         TermsParametersParser aggParser = new TermsParametersParser();
-        ValuesSourceParser vsParser = ValuesSourceParser.any(aggregationName, StringTerms.TYPE, context)
-                .scriptable(true)
-                .formattable(true)
-                .requiresSortedValues(true)
-                .requiresUniqueValues(true)
-                .build();
+        ValuesSourceParser vsParser = ValuesSourceParser.any(aggregationName, StringTerms.TYPE, context).scriptable(true).formattable(true)
+                .requiresSortedValues(true).requiresUniqueValues(true).build();
         IncludeExclude.Parser incExcParser = new IncludeExclude.Parser(aggregationName, StringTerms.TYPE, context);
         aggParser.parse(aggregationName, parser, context, vsParser, incExcParser);
 
+        InternalOrder order = resolveOrder(aggParser.getOrderKey(), aggParser.isOrderAsc());
         TermsAggregator.BucketCountThresholds bucketCountThresholds = aggParser.getBucketCountThresholds();
+        if (!(order == InternalOrder.TERM_ASC || order == InternalOrder.TERM_DESC)
+                && bucketCountThresholds.getShardSize() == aggParser.getDefaultBucketCountThresholds().getShardSize()) {
+            // The user has not made a shardSize selection. Use default heuristic to avoid any wrong-ranking caused by distributed counting
+            bucketCountThresholds.setShardSize(BucketUtils.suggestShardSideQueueSize(bucketCountThresholds.getRequiredSize(),
+                    context.numberOfShards()));
+        }
         bucketCountThresholds.ensureValidity();
-        InternalOrder order = resolveOrder(aggParser.getOrderKey(), aggParser.isOrderAsc());
-        return new TermsAggregatorFactory(aggregationName, vsParser.config(), order, bucketCountThresholds, aggParser.getIncludeExclude(), aggParser.getExecutionHint(), aggParser.getCollectionMode());
+        return new TermsAggregatorFactory(aggregationName, vsParser.config(), order, bucketCountThresholds, aggParser.getIncludeExclude(),
+                aggParser.getExecutionHint(), aggParser.getCollectionMode());
     }
 
     static InternalOrder resolveOrder(String key, boolean asc) {
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java
index 7251617f374ee..4bdaecc646d0c 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java
@@ -45,6 +45,31 @@ public void noShardSize_string() throws Exception {
                         .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.count(false)))
                 .execute().actionGet();
 
+        Terms  terms = response.getAggregations().get(""keys"");
+        Collection<Terms.Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+        Map<String, Long> expected = ImmutableMap.<String, Long>builder()
+                .put(""1"", 8l)
+                .put(""3"", 8l)
+                .put(""2"", 5l)
+                .build();
+        for (Terms.Bucket bucket : buckets) {
+            assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsText().string())));
+        }
+    }
+    
+    @Test
+    public void shardSizeEqualsSize_string() throws Exception {
+        createIdx(""type=string,index=not_analyzed"");
+
+        indexData();
+
+        SearchResponse response = client().prepareSearch(""idx"").setTypes(""type"")
+                .setQuery(matchAllQuery())
+                .addAggregation(terms(""keys"").field(""key"").size(3).shardSize(3)
+                        .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.count(false)))
+                .execute().actionGet();
+
         Terms  terms = response.getAggregations().get(""keys"");
         Collection<Terms.Bucket> buckets = terms.getBuckets();
         assertThat(buckets.size(), equalTo(3));
@@ -109,6 +134,31 @@ public void withShardSize_string_singleShard() throws Exception {
             assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKey())));
         }
     }
+    
+    @Test
+    public void noShardSizeTermOrder_string() throws Exception {
+        createIdx(""type=string,index=not_analyzed"");
+
+        indexData();
+
+        SearchResponse response = client().prepareSearch(""idx"").setTypes(""type"")
+                .setQuery(matchAllQuery())
+                .addAggregation(terms(""keys"").field(""key"").size(3)
+                        .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true)))
+                .execute().actionGet();
+
+        Terms  terms = response.getAggregations().get(""keys"");
+        Collection<Terms.Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+        Map<String, Long> expected = ImmutableMap.<String, Long>builder()
+                .put(""1"", 8l)
+                .put(""2"", 5l)
+                .put(""3"", 8l)
+                .build();
+        for (Terms.Bucket bucket : buckets) {
+            assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsText().string())));
+        }
+    }
 
     @Test
     public void noShardSize_long() throws Exception {
@@ -123,6 +173,32 @@ public void noShardSize_long() throws Exception {
                         .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.count(false)))
                 .execute().actionGet();
 
+        Terms terms = response.getAggregations().get(""keys"");
+        Collection<Terms.Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+        Map<Integer, Long> expected = ImmutableMap.<Integer, Long>builder()
+                .put(1, 8l)
+                .put(3, 8l)
+                .put(2, 5l)
+                .build();
+        for (Terms.Bucket bucket : buckets) {
+            assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsNumber().intValue())));
+        }
+    }
+
+    @Test
+    public void shardSizeEqualsSize_long() throws Exception {
+
+        createIdx(""type=long"");
+
+        indexData();
+
+        SearchResponse response = client().prepareSearch(""idx"").setTypes(""type"")
+                .setQuery(matchAllQuery())
+                .addAggregation(terms(""keys"").field(""key"").size(3).shardSize(3)
+                        .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.count(false)))
+                .execute().actionGet();
+
         Terms terms = response.getAggregations().get(""keys"");
         Collection<Terms.Bucket> buckets = terms.getBuckets();
         assertThat(buckets.size(), equalTo(3));
@@ -188,6 +264,32 @@ public void withShardSize_long_singleShard() throws Exception {
         }
     }
 
+    @Test
+    public void noShardSizeTermOrder_long() throws Exception {
+
+        createIdx(""type=long"");
+
+        indexData();
+
+        SearchResponse response = client().prepareSearch(""idx"").setTypes(""type"")
+                .setQuery(matchAllQuery())
+                .addAggregation(terms(""keys"").field(""key"").size(3)
+                        .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true)))
+                .execute().actionGet();
+
+        Terms terms = response.getAggregations().get(""keys"");
+        Collection<Terms.Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+        Map<Integer, Long> expected = ImmutableMap.<Integer, Long>builder()
+                .put(1, 8l)
+                .put(2, 5l)
+                .put(3, 8l)
+                .build();
+        for (Terms.Bucket bucket : buckets) {
+            assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsNumber().intValue())));
+        }
+    }
+
     @Test
     public void noShardSize_double() throws Exception {
 
@@ -201,6 +303,32 @@ public void noShardSize_double() throws Exception {
                         .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.count(false)))
                 .execute().actionGet();
 
+        Terms terms = response.getAggregations().get(""keys"");
+        Collection<Terms.Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+        Map<Integer, Long> expected = ImmutableMap.<Integer, Long>builder()
+                .put(1, 8l)
+                .put(3, 8l)
+                .put(2, 5l)
+                .build();
+        for (Terms.Bucket bucket : buckets) {
+            assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsNumber().intValue())));
+        }
+    }
+
+    @Test
+    public void shardSizeEqualsSize_double() throws Exception {
+
+        createIdx(""type=double"");
+
+        indexData();
+
+        SearchResponse response = client().prepareSearch(""idx"").setTypes(""type"")
+                .setQuery(matchAllQuery())
+                .addAggregation(terms(""keys"").field(""key"").size(3).shardSize(3)
+                        .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.count(false)))
+                .execute().actionGet();
+
         Terms terms = response.getAggregations().get(""keys"");
         Collection<Terms.Bucket> buckets = terms.getBuckets();
         assertThat(buckets.size(), equalTo(3));
@@ -265,4 +393,30 @@ public void withShardSize_double_singleShard() throws Exception {
             assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsNumber().intValue())));
         }
     }
+
+    @Test
+    public void noShardSizeTermOrder_double() throws Exception {
+
+        createIdx(""type=double"");
+
+        indexData();
+
+        SearchResponse response = client().prepareSearch(""idx"").setTypes(""type"")
+                .setQuery(matchAllQuery())
+                .addAggregation(terms(""keys"").field(""key"").size(3)
+                        .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true)))
+                .execute().actionGet();
+
+        Terms terms = response.getAggregations().get(""keys"");
+        Collection<Terms.Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+        Map<Integer, Long> expected = ImmutableMap.<Integer, Long>builder()
+                .put(1, 8l)
+                .put(2, 5l)
+                .put(3, 8l)
+                .build();
+        for (Terms.Bucket bucket : buckets) {
+            assertThat(bucket.getDocCount(), equalTo(expected.get(bucket.getKeyAsNumber().intValue())));
+        }
+    }
 }"
420d11911bbfd59192bfefc061fdc253e326647c,spring-framework,SPR-5973: Extract UriComponentTemplate out of- UriTemplate--,p,https://github.com/spring-projects/spring-framework,"diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriBuilder.java b/org.springframework.web/src/main/java/org/springframework/web/util/UriBuilder.java
index f2e0b7364d0c..b27db5b16a64 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/util/UriBuilder.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/util/UriBuilder.java
@@ -220,8 +220,8 @@ private URI buildFromMap(boolean encodeUriVariableValues, Map<String, ?> uriVari
 		UriTemplate template;
 
 		if (scheme != null) {
-			template = new UriTemplate(scheme, UriComponent.SCHEME);
-			uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariables));
+			template = new UriComponentTemplate(scheme, UriComponent.SCHEME, encodeUriVariableValues);
+			uriBuilder.append(template.expandAsString(uriVariables));
 			uriBuilder.append(':');
 		}
 
@@ -229,14 +229,14 @@ private URI buildFromMap(boolean encodeUriVariableValues, Map<String, ?> uriVari
 			uriBuilder.append(""//"");
 
 			if (StringUtils.hasLength(userInfo)) {
-				template = new UriTemplate(userInfo, UriComponent.USER_INFO);
-				uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariables));
+				template = new UriComponentTemplate(userInfo, UriComponent.USER_INFO, encodeUriVariableValues);
+				uriBuilder.append(template.expandAsString(uriVariables));
 				uriBuilder.append('@');
 			}
 
 			if (host != null) {
-				template = new UriTemplate(host, UriComponent.HOST);
-				uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariables));
+				template = new UriComponentTemplate(host, UriComponent.HOST, encodeUriVariableValues);
+				uriBuilder.append(template.expandAsString(uriVariables));
 			}
 
 			if (port != -1) {
@@ -256,20 +256,20 @@ private URI buildFromMap(boolean encodeUriVariableValues, Map<String, ?> uriVari
 				else if (endsWithSlash && startsWithSlash) {
 					pathSegment = pathSegment.substring(1);
 				}
-				template = new UriTemplate(pathSegment, UriComponent.PATH_SEGMENT);
-				uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariables));
+				template = new UriComponentTemplate(pathSegment, UriComponent.PATH_SEGMENT, encodeUriVariableValues);
+				uriBuilder.append(template.expandAsString(uriVariables));
 			}
 		}
 		if (queryBuilder.length() > 0) {
 			uriBuilder.append('?');
-			template = new UriTemplate(queryBuilder.toString(), UriComponent.QUERY);
-			uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariables));
+			template = new UriComponentTemplate(queryBuilder.toString(), UriComponent.QUERY, encodeUriVariableValues);
+			uriBuilder.append(template.expandAsString(uriVariables));
 		}
 
 		if (StringUtils.hasLength(fragment)) {
 			uriBuilder.append('#');
-			template = new UriTemplate(fragment, UriComponent.FRAGMENT);
-			uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariables));
+			template = new UriComponentTemplate(fragment, UriComponent.FRAGMENT, encodeUriVariableValues);
+			uriBuilder.append(template.expandAsString(uriVariables));
 		}
 
 		return URI.create(uriBuilder.toString());
@@ -308,8 +308,8 @@ private URI buildFromVarArg(boolean encodeUriVariableValues, Object... uriVariab
 		UriTemplate template;
 
 		if (scheme != null) {
-			template = new UriTemplate(scheme, UriComponent.SCHEME);
-			uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariableValues));
+			template = new UriComponentTemplate(scheme, UriComponent.SCHEME, encodeUriVariableValues);
+			uriBuilder.append(template.expandAsString(uriVariableValues));
 			uriBuilder.append(':');
 		}
 
@@ -317,14 +317,14 @@ private URI buildFromVarArg(boolean encodeUriVariableValues, Object... uriVariab
 			uriBuilder.append(""//"");
 
 			if (StringUtils.hasLength(userInfo)) {
-				template = new UriTemplate(userInfo, UriComponent.USER_INFO);
-				uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariableValues));
+				template = new UriComponentTemplate(userInfo, UriComponent.USER_INFO, encodeUriVariableValues);
+				uriBuilder.append(template.expandAsString(uriVariableValues));
 				uriBuilder.append('@');
 			}
 
 			if (host != null) {
-				template = new UriTemplate(host, UriComponent.HOST);
-				uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariableValues));
+				template = new UriComponentTemplate(host, UriComponent.HOST, encodeUriVariableValues);
+				uriBuilder.append(template.expandAsString(uriVariableValues));
 			}
 
 			if (port != -1) {
@@ -344,21 +344,21 @@ private URI buildFromVarArg(boolean encodeUriVariableValues, Object... uriVariab
 				else if (endsWithSlash && startsWithSlash) {
 					pathSegment = pathSegment.substring(1);
 				}
-				template = new UriTemplate(pathSegment, UriComponent.PATH_SEGMENT);
-				uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariableValues));
+				template = new UriComponentTemplate(pathSegment, UriComponent.PATH_SEGMENT, encodeUriVariableValues);
+				uriBuilder.append(template.expandAsString(uriVariableValues));
 			}
 		}
 
 		if (queryBuilder.length() > 0) {
 			uriBuilder.append('?');
-			template = new UriTemplate(queryBuilder.toString(), UriComponent.QUERY);
-			uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariableValues));
+			template = new UriComponentTemplate(queryBuilder.toString(), UriComponent.QUERY, encodeUriVariableValues);
+			uriBuilder.append(template.expandAsString(uriVariableValues));
 		}
 
 		if (StringUtils.hasLength(fragment)) {
 			uriBuilder.append('#');
-			template = new UriTemplate(fragment, UriComponent.FRAGMENT);
-			uriBuilder.append(template.expandAsString(encodeUriVariableValues, uriVariableValues));
+			template = new UriComponentTemplate(fragment, UriComponent.FRAGMENT, encodeUriVariableValues);
+			uriBuilder.append(template.expandAsString(uriVariableValues));
 		}
 
 		return URI.create(uriBuilder.toString());
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriComponentTemplate.java b/org.springframework.web/src/main/java/org/springframework/web/util/UriComponentTemplate.java
new file mode 100644
index 000000000000..d354ca2dcc3f
--- /dev/null
+++ b/org.springframework.web/src/main/java/org/springframework/web/util/UriComponentTemplate.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.util;
+
+import org.springframework.util.Assert;
+
+/**
+ * Subclass of {@link UriTemplate} that operates on URI components, rather than full URIs.
+ *
+ * @author Arjen Poutsma
+ * @since 3.1
+ */
+class UriComponentTemplate extends UriTemplate {
+
+	private final UriComponent uriComponent;
+
+	private boolean encodeUriVariableValues;
+
+	UriComponentTemplate(String uriTemplate, UriComponent uriComponent, boolean encodeUriVariableValues) {
+		super(uriTemplate);
+		Assert.notNull(uriComponent, ""'uriComponent' must not be null"");
+		this.uriComponent = uriComponent;
+		this.encodeUriVariableValues = encodeUriVariableValues;
+	}
+
+	@Override
+	protected String getVariableValueAsString(Object variableValue) {
+		String variableValueString = super.getVariableValueAsString(variableValue);
+		return encodeUriVariableValues ? UriUtils.encode(variableValueString, uriComponent, false) :
+				variableValueString;
+	}
+}
diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java b/org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java
index 51ebb224600e..6026020b9761 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -56,8 +56,6 @@ public class UriTemplate implements Serializable {
 
 	private final String uriTemplate;
 
-	private final UriComponent uriComponent;
-
 
 	/**
 	 * Construct a new {@link UriTemplate} with the given URI String.
@@ -68,19 +66,6 @@ public UriTemplate(String uriTemplate) {
 		this.uriTemplate = uriTemplate;
 		this.variableNames = parser.getVariableNames();
 		this.matchPattern = parser.getMatchPattern();
-		this.uriComponent = null;
-	}
-
-	/**
-	 * Construct a new {@link UriTemplate} with the given URI String.
-	 * @param uriTemplate the URI template string
-	 */
-	public UriTemplate(String uriTemplate, UriComponent uriComponent) {
-		Parser parser = new Parser(uriTemplate);
-		this.uriTemplate = uriTemplate;
-		this.variableNames = parser.getVariableNames();
-		this.matchPattern = parser.getMatchPattern();
-		this.uriComponent = uriComponent;
 	}
 
 	/**
@@ -110,7 +95,7 @@ public List<String> getVariableNames() {
 	 * or if it does not contain values for all the variable names
 	 */
 	public URI expand(Map<String, ?> uriVariables) {
-		return encodeUri(expandAsString(false, uriVariables));
+		return encodeUri(expandAsString(uriVariables));
 	}
 
 	/**
@@ -125,13 +110,13 @@ public URI expand(Map<String, ?> uriVariables) {
 	 * System.out.println(template.expand(uriVariables));
 	 * </pre>
 	 * will print: <blockquote><code>http://example.com/hotels/1/bookings/42</code></blockquote>
-	 * @param encodeUriVariableValues indicates whether uri template variables should be encoded or not
+	 *
 	 * @param uriVariables the map of URI variables
 	 * @return the expanded URI
 	 * @throws IllegalArgumentException if <code>uriVariables</code> is <code>null</code>;
 	 * or if it does not contain values for all the variable names
 	 */
-	public String expandAsString(boolean encodeUriVariableValues, Map<String, ?> uriVariables) {
+	public String expandAsString(Map<String, ?> uriVariables) {
 		Assert.notNull(uriVariables, ""'uriVariables' must not be null"");
 		Object[] values = new Object[this.variableNames.size()];
 		for (int i = 0; i < this.variableNames.size(); i++) {
@@ -141,7 +126,7 @@ public String expandAsString(boolean encodeUriVariableValues, Map<String, ?> uri
 			}
 			values[i] = uriVariables.get(name);
 		}
-		return expandAsString(encodeUriVariableValues, values);
+		return expandAsString(values);
 	}
 
 	/**
@@ -159,7 +144,7 @@ public String expandAsString(boolean encodeUriVariableValues, Map<String, ?> uri
 	 * or if it does not contain sufficient variables
 	 */
 	public URI expand(Object... uriVariableValues) {
-		return encodeUri(expandAsString(false, uriVariableValues));
+		return encodeUri(expandAsString(uriVariableValues));
 	}
 
 	/**
@@ -171,13 +156,13 @@ public URI expand(Object... uriVariableValues) {
 	 * System.out.println(template.expand(""1"", ""42));
 	 * </pre>
 	 * will print: <blockquote><code>http://example.com/hotels/1/bookings/42</code></blockquote>
-	 * @param encodeVariableValues indicates whether uri template variables should be encoded or not
+	 *
 	 * @param uriVariableValues the array of URI variables
 	 * @return the expanded URI
 	 * @throws IllegalArgumentException if <code>uriVariables</code> is <code>null</code>
 	 * or if it does not contain sufficient variables
 	 */
-	public String expandAsString(boolean encodeVariableValues, Object... uriVariableValues) {
+	public String expandAsString(Object... uriVariableValues) {
 		Assert.notNull(uriVariableValues, ""'uriVariableValues' must not be null"");
 		if (uriVariableValues.length < this.variableNames.size()) {
 			throw new IllegalArgumentException(
@@ -188,18 +173,27 @@ public String expandAsString(boolean encodeVariableValues, Object... uriVariable
 		StringBuffer uriBuffer = new StringBuffer();
 		int i = 0;
 		while (matcher.find()) {
-			Object uriVariable = uriVariableValues[i++];
-			String uriVariableString = uriVariable != null ? uriVariable.toString() : """";
-			if (encodeVariableValues && uriComponent != null) {
-				uriVariableString = UriUtils.encode(uriVariableString, uriComponent, false);
-			}
-			String replacement = Matcher.quoteReplacement(uriVariableString);
+			Object uriVariableValue = uriVariableValues[i++];
+			String uriVariableValueString = getVariableValueAsString(uriVariableValue);
+			String replacement = Matcher.quoteReplacement(uriVariableValueString);
 			matcher.appendReplacement(uriBuffer, replacement);
 		}
 		matcher.appendTail(uriBuffer);
 		return uriBuffer.toString();
 	}
 
+	/**
+	 * Template method that returns the string representation of the given URI template value.
+	 *
+	 * <p>Defaults implementation simply calls {@link Object#toString()}, or returns an empty string for {@code null}.
+	 *
+	 * @param variableValue the URI template variable value
+	 * @return the variable value as string
+	 */
+	protected String getVariableValueAsString(Object variableValue) {
+		return variableValue != null ? variableValue.toString() : """";
+	}
+
 	/**
 	 * Indicate whether the given URI matches this template.
 	 * @param uri the URI to match to"
f3554235b3abb5b5820b57f932398af5a8846b32,Delta Spike,"adding release notes draft for upcoming deltaspike-0.5 release
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/readme/ReleaseNotes-0.5.txt b/deltaspike/readme/ReleaseNotes-0.5.txt
new file mode 100644
index 000000000..ea682196b
--- /dev/null
+++ b/deltaspike/readme/ReleaseNotes-0.5.txt
@@ -0,0 +1,30 @@
+Apache DeltaSpike-0.5 Release Notes
+
+
+The following modules and big features got added in the DeltaSpike-0.5 release:
+
+* DeltaSpike-Data
+
+The DeltaSpike Data module enhances JPA experience with declarative
+queries, reducing boilerplate to a minimum. DeltaSpike Data repositories
+can derive queries by simple method names, or by method annotations
+defining JPQL, named queries or even plain SQL - beside result pagination
+and sorting. The module also features auditing of entities and a simplified
+alternative to the Criteria API.
+
+
+* DeltaSpike-Servlet
+
+The DeltaSpike Servlet module provides integration with the Java Servlet
+API. It adds support for injection of common servlet objects
+and propagates servlet events to the CDI event bus.
+
+
+* DeltaSpike-BeanValidation
+
+The main feature of the Bean Validation module is to provide
+CDI integration in to ConstraintValidators. This allows you to
+inject CDI objects, EJBs etc in to your validators.
+
+
+"
cd2f14637bcecec0081104d749cd1bf10f28b07d,ReactiveX-RxJava,Fixed issue -799 - Added break to possibly-infinite- loop in CompositeException.attachCallingThreadStack--,c,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-core/src/main/java/rx/util/CompositeException.java b/rxjava-core/src/main/java/rx/util/CompositeException.java
index bca5dcfbf7..439b9400b2 100644
--- a/rxjava-core/src/main/java/rx/util/CompositeException.java
+++ b/rxjava-core/src/main/java/rx/util/CompositeException.java
@@ -18,7 +18,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Exception that is a composite of 1 or more other exceptions.
@@ -84,9 +86,16 @@ private static String getStackTraceAsString(StackTraceElement[] stack) {
         return s.toString();
     }
 
-    private static void attachCallingThreadStack(Throwable e, Throwable cause) {
+    /* package-private */ static void attachCallingThreadStack(Throwable e, Throwable cause) {
+        Set<Throwable> seenCauses = new HashSet<Throwable>();
+
         while (e.getCause() != null) {
             e = e.getCause();
+            if (seenCauses.contains(e.getCause())) {
+                break;
+            } else {
+                seenCauses.add(e.getCause());
+            }
         }
         // we now have 'e' as the last in the chain
         try {
@@ -98,12 +107,13 @@ private static void attachCallingThreadStack(Throwable e, Throwable cause) {
         }
     }
 
-    private final static class CompositeExceptionCausalChain extends RuntimeException {
+    /* package-private */ final static class CompositeExceptionCausalChain extends RuntimeException {
         private static final long serialVersionUID = 3875212506787802066L;
+        /* package-private */ static String MESSAGE = ""Chain of Causes for CompositeException In Order Received =>"";
 
         @Override
         public String getMessage() {
-            return ""Chain of Causes for CompositeException In Order Received =>"";
+            return MESSAGE;
         }
     }
 
diff --git a/rxjava-core/src/test/java/rx/util/CompositeExceptionTest.java b/rxjava-core/src/test/java/rx/util/CompositeExceptionTest.java
new file mode 100644
index 0000000000..0e80cf0309
--- /dev/null
+++ b/rxjava-core/src/test/java/rx/util/CompositeExceptionTest.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright 2013 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.util;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CompositeExceptionTest {
+
+    private final Throwable ex1 = new Throwable(""Ex1"");
+    private final Throwable ex2 = new Throwable(""Ex2"", ex1);
+    private final Throwable ex3 = new Throwable(""Ex3"", ex2);
+
+    private final CompositeException compositeEx;
+
+    public CompositeExceptionTest() {
+        List<Throwable> throwables = new ArrayList<Throwable>();
+        throwables.add(ex1);
+        throwables.add(ex2);
+        throwables.add(ex3);
+        compositeEx = new CompositeException(throwables);
+    }
+
+    @Test
+    public void testAttachCallingThreadStackParentThenChild() {
+        CompositeException.attachCallingThreadStack(ex1, ex2);
+        assertEquals(""Ex2"", ex1.getCause().getMessage());
+    }
+
+    @Test
+    public void testAttachCallingThreadStackChildThenParent() {
+        CompositeException.attachCallingThreadStack(ex2, ex1);
+        assertEquals(""Ex1"", ex2.getCause().getMessage());
+    }
+
+    @Test
+    public void testAttachCallingThreadStackAddComposite() {
+        CompositeException.attachCallingThreadStack(ex1, compositeEx);
+        assertEquals(""Ex2"", ex1.getCause().getMessage());
+    }
+
+    @Test
+    public void testAttachCallingThreadStackAddToComposite() {
+        CompositeException.attachCallingThreadStack(compositeEx, ex1);
+        assertEquals(CompositeException.CompositeExceptionCausalChain.MESSAGE, compositeEx.getCause().getMessage());
+    }
+
+    @Test
+    public void testAttachCallingThreadStackAddCompositeToItself() {
+        CompositeException.attachCallingThreadStack(compositeEx, compositeEx);
+        assertEquals(CompositeException.CompositeExceptionCausalChain.MESSAGE, compositeEx.getCause().getMessage());
+    }
+}
\ No newline at end of file"
4043b1d38140d531f5f97d4f87850f168283c240,spring-framework,Workaround Javadoc bug with JDK 8 (b112+)--Remove Javadoc linkplain to ExceptionHandler-value() from-AnnotationMethodHandlerExceptionResolver to work around JDK-Javadoc bug 9007707.-,c,https://github.com/spring-projects/spring-framework,"diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index 1450d8a9683a..65bba17c3830 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -206,7 +206,7 @@ public void doWith(Method method) {
 
 	/**
 	 * Returns all the exception classes handled by the given method.
-	 * <p>The default implementation looks for exceptions in the {@linkplain ExceptionHandler#value() annotation},
+	 * <p>The default implementation looks for exceptions in the annotation,
 	 * or - if that annotation element is empty - any exceptions listed in the method parameters if the method
 	 * is annotated with {@code @ExceptionHandler}.
 	 * @param method the method"
95ba62f83dfa05990d2165484330cdd0792064d8,elasticsearch,Translog: Implement a file system based translog- and make it the default,a,https://github.com/elastic/elasticsearch,"diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java
index 61977707465c0..02c378097c250 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java
@@ -22,7 +22,7 @@
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.inject.Scopes;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.translog.memory.MemoryTranslog;
+import org.elasticsearch.index.translog.fs.FsTranslog;
 
 /**
  * @author kimchy (shay.banon)
@@ -41,7 +41,7 @@ public TranslogModule(Settings settings) {
 
     @Override protected void configure() {
         bind(Translog.class)
-                .to(settings.getAsClass(TranslogSettings.TYPE, MemoryTranslog.class))
+                .to(settings.getAsClass(TranslogSettings.TYPE, FsTranslog.class))
                 .in(Scopes.SINGLETON);
     }
 }"
bb85cacf9358f9ed289e72a416e78625fcab18a4,Delta Spike,"DELTASPIKE-289 fix WindowScoped context test on jbossas

I recently removed the <h:form> which did lead to a different
component Id for the outputValue. fixed now.
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
index c57b16c48..a6e97cb28 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
@@ -20,6 +20,7 @@
 
 
 import java.net.URL;
+import java.util.logging.Logger;
 
 import org.apache.deltaspike.test.category.WebProfileCategory;
 import org.apache.deltaspike.test.jsf.impl.scope.window.beans.WindowScopedBackingBean;
@@ -51,6 +52,8 @@
 @Category(WebProfileCategory.class)
 public class WindowScopedContextTest
 {
+    private static final Logger log = Logger.getLogger(WindowScopedContextTest.class.getName());
+
     @Drone
     private WebDriver driver;
 
@@ -79,14 +82,12 @@ public static WebArchive deploy()
     public void testWindowId() throws Exception
     {
         System.out.println(""contextpath= "" + contextPath);
-        //X
-        Thread.sleep(600000L);
-
-        driver.get(new URL(contextPath, ""page.xhtml"").toString());
 
         //X comment this in if you like to debug the server
         //X I've already reported ARQGRA-213 for it
-        //X
+        //X Thread.sleep(600000L);
+
+        driver.get(new URL(contextPath, ""page.xhtml"").toString());
 
         WebElement inputField = driver.findElement(By.id(""test:valueInput""));
         inputField.sendKeys(""23"");
@@ -94,7 +95,7 @@ public void testWindowId() throws Exception
         WebElement button = driver.findElement(By.id(""test:saveButton""));
         button.click();
 
-        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""test:valueOutput""), ""23"").apply(driver));
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""valueOutput""), ""23"").apply(driver));
 
     }"
a09d266b247b185054d0ab0dfdb6e8dc2e8898bc,orientdb,Minor: removed some warnings--,p,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManager.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManager.java
index f5fe061175a..dcf7d2ae48b 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManager.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManager.java
@@ -32,13 +32,13 @@ public interface OIndexManager {
 
 	public void create();
 
-	public Collection<? extends OIndex> getIndexes();
+	public Collection<? extends OIndex<?>> getIndexes();
 
-	public OIndex getIndex(final String iName);
+	public OIndex<?> getIndex(final String iName);
 
-	public OIndex getIndex(final ORID iRID);
+	public OIndex<?> getIndex(final ORID iRID);
 
-	public OIndex createIndex(final String iName, final String iType, final OType iKeyType, final int[] iClusterIdsToIndex,
+	public OIndex<?> createIndex(final String iName, final String iType, final OType iKeyType, final int[] iClusterIdsToIndex,
 			OIndexCallback iCallback, final OProgressListener iProgressListener, final boolean iAutomatic);
 
 	public OIndexManager dropIndex(final String iIndexName);
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerProxy.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerProxy.java
index d0a9eadd979..7b403ff8d30 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerProxy.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerProxy.java
@@ -47,24 +47,24 @@ public void create() {
 		delegate.create();
 	}
 
-	public Collection<? extends OIndex> getIndexes() {
+	public Collection<? extends OIndex<?>> getIndexes() {
 		return delegate.getIndexes();
 	}
 
-	public OIndex getIndex(String iName) {
+	public OIndex<?> getIndex(String iName) {
 		return delegate.getIndex(iName);
 	}
 
-	public OIndex getIndex(ORID iRID) {
+	public OIndex<?> getIndex(ORID iRID) {
 		return delegate.getIndex(iRID);
 	}
 
-	public OIndex createIndex(String iName, String iType, final OType iKeyType, int[] iClusterIdsToIndex, OIndexCallback iCallback,
+	public OIndex<?> createIndex(String iName, String iType, final OType iKeyType, int[] iClusterIdsToIndex, OIndexCallback iCallback,
 			OProgressListener iProgressListener, boolean iAutomatic) {
 		return delegate.createIndex(iName, iType, iKeyType, iClusterIdsToIndex, iCallback, iProgressListener, iAutomatic);
 	}
 
-	public OIndex getIndexInternal(final String iName) {
+	public OIndex<?> getIndexInternal(final String iName) {
 		return ((OIndexManagerShared) delegate).getIndexInternal(iName);
 	}
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java
index d85b127e2d9..10e8f89b848 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java
@@ -108,9 +108,9 @@ public class OCommandExecutorSQLSelect extends OCommandExecutorSQLAbstract imple
 	private static final class OSearchInIndexTriple {
 		private OQueryOperator	indexOperator;
 		private Object					key;
-		private OIndex					index;
+		private OIndex<?>				index;
 
-		private OSearchInIndexTriple(final OQueryOperator indexOperator, final Object key, final OIndex index) {
+		private OSearchInIndexTriple(final OQueryOperator indexOperator, final Object key, final OIndex<?> index) {
 			this.indexOperator = indexOperator;
 			this.key = key;
 			this.index = index;
@@ -120,7 +120,6 @@ private OSearchInIndexTriple(final OQueryOperator indexOperator, final Object ke
 	/**
 	 * Compile the filter conditions only the first time.
 	 */
-	@SuppressWarnings(""unchecked"")
 	public OCommandExecutorSQLSelect parse(final OCommandRequestText iRequest) {
 		iRequest.getDatabase().checkSecurity(ODatabaseSecurityResources.COMMAND, ORole.PERMISSION_READ);
 
@@ -386,7 +385,7 @@ private boolean searchForIndexes(final List<ORecord<?>> iResultSet, final OClass
 			return false;
 
 		for (OSearchInIndexTriple indexTriple : searchInIndexTriples) {
-			final OIndex idx = indexTriple.index.getInternal();
+			final OIndex<?> idx = indexTriple.index.getInternal();
 			final OQueryOperator operator = indexTriple.indexOperator;
 			final Object key = indexTriple.key;
 
@@ -482,7 +481,7 @@ private boolean searchIndexedProperty(OClass iSchemaClass, final OSQLFilterCondi
 
 		if (prop != null && prop.isIndexed()) {
 			final Object origValue = iCondition.getLeft() == iItem ? iCondition.getRight() : iCondition.getLeft();
-			final OIndex underlyingIndex = prop.getIndex().getUnderlying();
+			final OIndex<?> underlyingIndex = prop.getIndex().getUnderlying();
 
 			if (iCondition.getOperator() instanceof OQueryOperatorBetween) {
 				iSearchInIndexTriples.add(new OSearchInIndexTriple(iCondition.getOperator(), origValue, underlyingIndex));
@@ -788,7 +787,8 @@ record = database.load(rid);
 	}
 
 	private void searchInIndex() {
-		final OIndex<Object> index = database.getMetadata().getIndexManager().getIndex(compiledFilter.getTargetIndex());
+		final OIndex<Object> index = (OIndex<Object>) database.getMetadata().getIndexManager()
+				.getIndex(compiledFilter.getTargetIndex());
 		if (index == null)
 			throw new OCommandExecutionException(""Target index '"" + compiledFilter.getTargetIndex() + ""' not found"");
 
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/IndexTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/IndexTest.java
index 280c175c157..dac497b5198 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/IndexTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/IndexTest.java
@@ -706,7 +706,7 @@ public void createNotUniqueIndexOnNick() {
 	public void LongTypes() {
 		database.getMetadata().getSchema().getClass(""Profile"").createProperty(""hash"", OType.LONG).createIndex(INDEX_TYPE.UNIQUE);
 
-		OIndex<OIdentifiable> idx = database.getMetadata().getIndexManager().getIndex(""Profile.hash"");
+		OIndex<OIdentifiable> idx = (OIndex<OIdentifiable>) database.getMetadata().getIndexManager().getIndex(""Profile.hash"");
 
 		for (int i = 0; i < 5; i++) {
 			Profile profile = new Profile(""HashTest1"").setHash(100l + i);"
a9a93876f2ead9468fd50eba715083c9a7e8a52a,drools,JBRULES-3714 Add capability to configure- date-effective/date-expires for SpreadSheet--,a,https://github.com/kiegroup/drools,"diff --git a/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java b/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java
index 73cb78135c8..9fe46429cd8 100644
--- a/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java
+++ b/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java
@@ -46,6 +46,8 @@ public enum Code {
         ACTIVATIONGROUP( ""ACTIVATION-GROUP"", ""X"", 1 ),
         AGENDAGROUP(     ""AGENDA-GROUP"",     ""G"", 1 ),
         RULEFLOWGROUP(   ""RULEFLOW-GROUP"",   ""R"", 1 ),
+        DATEEFFECTIVE(   ""DATE-EFFECTIVE"",   ""V"", 1 ),
+        DATEEXPIRES(     ""DATE-EXPIRES"",     ""Z"", 1 ),
         METADATA(        ""METADATA"",         ""@"" );
                 
         private String colHeader;
@@ -80,7 +82,7 @@ public int getMaxCount() {
         }
     }
 
-    public static final EnumSet<Code> ATTRIBUTE_CODE_SET = EnumSet.range( Code.SALIENCE, Code.RULEFLOWGROUP );
+    public static final EnumSet<Code> ATTRIBUTE_CODE_SET = EnumSet.range( Code.SALIENCE, Code.DATEEXPIRES );
 
     private static final Map<String,Code> tag2code = new HashMap<String,Code>();
     static {
diff --git a/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java b/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
index 1e513078472..c5ba2bb178d 100644
--- a/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
+++ b/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
@@ -240,6 +240,12 @@ private Package buildRuleSet() {
                 case RULEFLOWGROUP:
                     ruleset.setRuleFlowGroup( value );
                     break;
+                case DATEEFFECTIVE:
+                    ruleset.setDateEffective( value );
+                    break;
+                case DATEEXPIRES:
+                    ruleset.setDateExpires( value );
+                    break;
                 }
             }
         }
@@ -648,6 +654,12 @@ private void nextDataCell(final int row,
         case CALENDARS:
             this._currentRule.setCalendars( value );
             break;
+        case DATEEFFECTIVE:
+            this._currentRule.setDateEffective( value );
+            break;
+        case DATEEXPIRES:
+            this._currentRule.setDateExpires( value );
+            break;
         }
     }
 
diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
index 1b6e45ff102..150eac13869 100644
--- a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
+++ b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
@@ -192,6 +192,10 @@ public void testAttributesXLS() {
                                  rule1 ) > -1 );
         assertTrue( drl.indexOf( ""calendars \""CAL1\"""",
                                  rule1 ) > -1 );
+        assertTrue( drl.indexOf( ""date-effective \""01-Jan-2007\"""",
+                                 rule1 ) > -1 );
+        assertTrue( drl.indexOf( ""date-expires \""31-Dec-2007\"""",
+                                 rule1 ) > -1 );
 
         int rule2 = drl.indexOf( ""rule \""N2\"""" );
         assertFalse( rule2 == -1 );
@@ -216,6 +220,10 @@ public void testAttributesXLS() {
                                  rule2 ) > -1 );
         assertTrue( drl.indexOf( ""calendars \""CAL2\"""",
                                  rule2 ) > -1 );
+        assertTrue( drl.indexOf( ""date-effective \""01-Jan-2012\"""",
+                                 rule2 ) > -1 );
+        assertTrue( drl.indexOf( ""date-expires \""31-Dec-2015\"""",
+                                 rule2 ) > -1 );
     }
 
     @Test
diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
index cbfc6e9644a..6d7bf450be7 100644
--- a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
+++ b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
@@ -156,6 +156,26 @@ public void testChooseActionType() {
         type = (ActionType) actionTypeMap.get( new Integer(0) );
         assertEquals(Code.RULEFLOWGROUP, type.getCode());
 
+        actionTypeMap = new HashMap<Integer, ActionType>();
+        ActionType.addNewActionType( actionTypeMap, ""V"", 0, 1 );
+        type = (ActionType) actionTypeMap.get( new Integer(0) );
+        assertEquals(Code.DATEEFFECTIVE, type.getCode());
+
+        actionTypeMap = new HashMap<Integer, ActionType>();
+        ActionType.addNewActionType( actionTypeMap, ""DATE-EFFECTIVE"", 0, 1 );
+        type = (ActionType) actionTypeMap.get( new Integer(0) );
+        assertEquals(Code.DATEEFFECTIVE, type.getCode());
+
+        actionTypeMap = new HashMap<Integer, ActionType>();
+        ActionType.addNewActionType( actionTypeMap, ""Z"", 0, 1 );
+        type = (ActionType) actionTypeMap.get( new Integer(0) );
+        assertEquals(Code.DATEEXPIRES, type.getCode());
+
+        actionTypeMap = new HashMap<Integer, ActionType>();
+        ActionType.addNewActionType( actionTypeMap, ""DATE-EXPIRES"", 0, 1 );
+        type = (ActionType) actionTypeMap.get( new Integer(0) );
+        assertEquals(Code.DATEEXPIRES, type.getCode());
+
         actionTypeMap = new HashMap<Integer, ActionType>();
         ActionType.addNewActionType( actionTypeMap, ""@"", 0, 1 );
         type = (ActionType) actionTypeMap.get( new Integer(0) );
diff --git a/drools-decisiontables/src/test/resources/org/drools/decisiontable/Attributes.xls b/drools-decisiontables/src/test/resources/org/drools/decisiontable/Attributes.xls
index 3159e4ffeb6..1819888649a 100644
Binary files a/drools-decisiontables/src/test/resources/org/drools/decisiontable/Attributes.xls and b/drools-decisiontables/src/test/resources/org/drools/decisiontable/Attributes.xls differ
diff --git a/drools-templates/src/main/java/org/drools/template/model/AttributedDRLElement.java b/drools-templates/src/main/java/org/drools/template/model/AttributedDRLElement.java
index b46e25c7c45..3232fb349be 100644
--- a/drools-templates/src/main/java/org/drools/template/model/AttributedDRLElement.java
+++ b/drools-templates/src/main/java/org/drools/template/model/AttributedDRLElement.java
@@ -105,6 +105,14 @@ public void setAutoFocus(final boolean value) {
         this._attr2value.put( ""auto-focus"", Boolean.toString( value ) );
     }
 
+    public void setDateEffective(final String value) {
+        this._attr2value.put( ""date-effective"", asStringLiteral( value ) );
+    }
+
+    public void setDateExpires(final String value) {
+        this._attr2value.put( ""date-expires"", asStringLiteral( value ) );
+    }
+
     public String getAttribute( String name ){
         return this._attr2value.get( name ).toString();
     }"
ce2995c49d111b5749a88b4de2065a3a68551386,hbase,HBASE-1136  HashFunction inadvertently destroys- some randomness; REVERTING--git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@735880 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hbase,"diff --git a/CHANGES.txt b/CHANGES.txt
index 7e9c80101764..970250b4eaeb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,8 +3,6 @@ Release 0.20.0 - Unreleased
   INCOMPATIBLE CHANGES
 
   BUG FIXES
-   HBASE-1136  HashFunction inadvertently destroys some randomness
-               (Jonathan Ellis via Stack) 
    HBASE-1140  ""ant clean test"" fails (Nitay Joffe via Stack)
 
   IMPROVEMENTS
diff --git a/src/java/org/onelab/filter/HashFunction.java b/src/java/org/onelab/filter/HashFunction.java
index cf97c7bcaa26..a0c26964e2f6 100644
--- a/src/java/org/onelab/filter/HashFunction.java
+++ b/src/java/org/onelab/filter/HashFunction.java
@@ -118,8 +118,7 @@ public int[] hash(Key k){
       }
       int[] result = new int[nbHash];
       for (int i = 0, initval = 0; i < nbHash; i++) {
-	  initval = hashFunction.hash(b, initval);
-	  result[i] = Math.abs(initval) % maxValue;
+        initval = result[i] = Math.abs(hashFunction.hash(b, initval) % maxValue);
       }
       return result;
   }//end hash() 
diff --git a/src/test/org/onelab/test/TestFilter.java b/src/test/org/onelab/test/TestFilter.java
index 363fc9451481..6c88c1ab33f4 100644
--- a/src/test/org/onelab/test/TestFilter.java
+++ b/src/test/org/onelab/test/TestFilter.java
@@ -274,7 +274,7 @@ public void testCountingBloomFilter() throws UnsupportedEncodingException {
     bf.add(k2);
     bf.add(k3);
     assertTrue(bf.membershipTest(key));
-    assertFalse(bf.membershipTest(k2));
+    assertTrue(bf.membershipTest(new StringKey(""graknyl"")));
     assertFalse(bf.membershipTest(new StringKey(""xyzzy"")));
     assertFalse(bf.membershipTest(new StringKey(""abcd"")));
 
@@ -287,7 +287,7 @@ public void testCountingBloomFilter() throws UnsupportedEncodingException {
     bf2.add(key);
     bf.or(bf2);
     assertTrue(bf.membershipTest(key));
-    assertTrue(bf.membershipTest(k2));
+    assertTrue(bf.membershipTest(new StringKey(""graknyl"")));
     assertFalse(bf.membershipTest(new StringKey(""xyzzy"")));
     assertFalse(bf.membershipTest(new StringKey(""abcd"")));"
eb0a1bebaa1486ab4d2af4dccf40aea7f8f1d5dd,Mylyn Reviews,"Merge branch 'master' of git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.reviews
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/framework/org.eclipse.mylyn.reviews.core/build.properties b/framework/org.eclipse.mylyn.reviews.core/build.properties
index 9adcaaf4..21815455 100644
--- a/framework/org.eclipse.mylyn.reviews.core/build.properties
+++ b/framework/org.eclipse.mylyn.reviews.core/build.properties
@@ -10,7 +10,9 @@
 bin.includes = .,\
                model/,\
                plugin.xml,\
-               META-INF/
+               META-INF/,\
+               about.html
 jars.compile.order = .
 source.. = src/
 output.. = target/classes/
+src.includes = about.html
diff --git a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.jdt.core.prefs b/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bc1e8f9c..00000000
--- a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,357 +0,0 @@
-#Wed Mar 02 16:00:03 PST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.jdt.ui.prefs b/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e2834b27..00000000
--- a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Wed Mar 02 16:00:04 PST 2011
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=12
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\=""1.0"" encoding\=""UTF-8"" standalone\=""no""?><templates><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created Java files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""false"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for fields"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""false"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment""/><template autoinsert\=""false"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.newtype"" name\=""newtype"">/*******************************************************************************\r\n * Copyright (c) ${year} Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""false"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""false"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created method stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ignore\r\n${body_statement}</template><template autoinsert\=""false"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ignore</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created JavaScript files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for vars"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment"">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.newtype"" name\=""newtype"">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""true"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""true"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created function stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\=""true"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/framework/org.eclipse.mylyn.reviews.feature/about.html b/framework/org.eclipse.mylyn.reviews.feature/about.html
deleted file mode 100644
index d774b07c..00000000
--- a/framework/org.eclipse.mylyn.reviews.feature/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 4.0//EN"">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content=""text/html; charset=ISO-8859-1"">
-</head>
-<body lang=""EN-US"">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href=""http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href=""/"">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/framework/org.eclipse.mylyn.reviews.feature/build.properties b/framework/org.eclipse.mylyn.reviews.feature/build.properties
index 1d717bf0..8e3732e7 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/build.properties
+++ b/framework/org.eclipse.mylyn.reviews.feature/build.properties
@@ -10,7 +10,5 @@
 ###############################################################################
 bin.includes = feature.properties,\
                feature.xml,\
-               about.html,\
                epl-v10.html,\
                license.html
-src.includes = about.html
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.jdt.core.prefs b/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8e95137a..00000000
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,357 +0,0 @@
-#Wed Mar 02 16:00:08 PST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.jdt.ui.prefs b/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f6c0a161..00000000
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Wed Mar 02 16:00:06 PST 2011
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=12
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\=""1.0"" encoding\=""UTF-8"" standalone\=""no""?><templates><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created Java files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""false"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for fields"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""false"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment""/><template autoinsert\=""false"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.newtype"" name\=""newtype"">/*******************************************************************************\r\n * Copyright (c) ${year} Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""false"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""false"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created method stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ignore\r\n${body_statement}</template><template autoinsert\=""false"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ignore</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created JavaScript files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for vars"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment"">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.newtype"" name\=""newtype"">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""true"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""true"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created function stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\=""true"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/about.html b/framework/org.eclipse.mylyn.reviews.sdk.feature/about.html
deleted file mode 100644
index d774b07c..00000000
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 4.0//EN"">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content=""text/html; charset=ISO-8859-1"">
-</head>
-<body lang=""EN-US"">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href=""http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href=""/"">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/build.properties b/framework/org.eclipse.mylyn.reviews.sdk.feature/build.properties
index 1d717bf0..8e3732e7 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/build.properties
+++ b/framework/org.eclipse.mylyn.reviews.sdk.feature/build.properties
@@ -10,7 +10,5 @@
 ###############################################################################
 bin.includes = feature.properties,\
                feature.xml,\
-               about.html,\
                epl-v10.html,\
                license.html
-src.includes = about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/build.properties b/gerrit/org.eclipse.mylyn.gerrit.core/build.properties
index 1b8cf665..b6a5a0ec 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/build.properties
+++ b/gerrit/org.eclipse.mylyn.gerrit.core/build.properties
@@ -9,7 +9,9 @@
 
 bin.includes = .,\
                model/,\
-               META-INF/
+               META-INF/,\
+               about.html
 jars.compile.order = .
 source.. = src/
 output.. = target/classes/
+src.includes = about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.jdt.core.prefs b/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bc1e8f9c..00000000
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,357 +0,0 @@
-#Wed Mar 02 16:00:03 PST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.jdt.ui.prefs b/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index d92dfc1c..00000000
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Wed Mar 02 16:00:08 PST 2011
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=12
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\=""1.0"" encoding\=""UTF-8"" standalone\=""no""?><templates><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created Java files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""false"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for fields"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""false"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment""/><template autoinsert\=""false"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.newtype"" name\=""newtype"">/*******************************************************************************\r\n * Copyright (c) ${year} Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""false"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""false"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created method stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ignore\r\n${body_statement}</template><template autoinsert\=""false"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ignore</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created JavaScript files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for vars"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment"">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.newtype"" name\=""newtype"">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""true"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""true"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created function stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\=""true"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/about.html b/gerrit/org.eclipse.mylyn.gerrit.feature/about.html
deleted file mode 100644
index d774b07c..00000000
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 4.0//EN"">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content=""text/html; charset=ISO-8859-1"">
-</head>
-<body lang=""EN-US"">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href=""http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href=""/"">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/build.properties b/gerrit/org.eclipse.mylyn.gerrit.feature/build.properties
index 1d717bf0..8e3732e7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/build.properties
+++ b/gerrit/org.eclipse.mylyn.gerrit.feature/build.properties
@@ -10,7 +10,5 @@
 ###############################################################################
 bin.includes = feature.properties,\
                feature.xml,\
-               about.html,\
                epl-v10.html,\
                license.html
-src.includes = about.html
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks/.settings/org.eclipse.mylyn.tasks.ui.prefs b/tbr/org.eclipse.mylyn.reviews.tasks/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 00000000..56f30d42
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Wed Nov 28 14:28:55 PST 2007
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks/about.html b/tbr/org.eclipse.mylyn.reviews.tasks/about.html
deleted file mode 100644
index d774b07c..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 4.0//EN"">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content=""text/html; charset=ISO-8859-1"">
-</head>
-<body lang=""EN-US"">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href=""http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href=""/"">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks/build.properties b/tbr/org.eclipse.mylyn.reviews.tasks/build.properties
index 1d717bf0..8e3732e7 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks/build.properties
+++ b/tbr/org.eclipse.mylyn.reviews.tasks/build.properties
@@ -10,7 +10,5 @@
 ###############################################################################
 bin.includes = feature.properties,\
                feature.xml,\
-               about.html,\
                epl-v10.html,\
                license.html
-src.includes = about.html"
35c5faa642a497729746e958d1c3d84e4234270c,belaban$jgroups,"        NIO Reads writes are completed in the caller thered;
100% compatible with old interface and functionality.
Each connection has an instance of this object to
receive data for a message in multiple OP_READ events.
",p,https://github.com/belaban/jgroups,"diff --git a/src/org/jgroups/blocks/ConnectionTable1_4.java b/src/org/jgroups/blocks/ConnectionTable1_4.java
index 3b01c9a727e..3a681a673a0 100644
--- a/src/org/jgroups/blocks/ConnectionTable1_4.java
+++ b/src/org/jgroups/blocks/ConnectionTable1_4.java
@@ -1,26 +1,17 @@
-// $Id: ConnectionTable1_4.java,v 1.1 2003/09/09 01:24:08 belaban Exp $
+// $Id: ConnectionTable1_4.java,v 1.2 2003/12/21 03:47:56 akbollu Exp $
 
 package org.jgroups.blocks;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketException;
+import java.net.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
+import java.util.*;
 
 import org.jgroups.Address;
 import org.jgroups.Message;
@@ -28,8 +19,9 @@
 import org.jgroups.log.Trace;
 import org.jgroups.stack.IpAddress;
 import org.jgroups.util.Util;
+import org.jgroups.util.Util1_4;
+
 
-/* ---------------------------- TODO WORK IN PROGRESS --------------------------------------------------*/
 /**
  * Manages incoming and outgoing TCP connections. For each outgoing message to destination P, if there
  * is not yet a connection for P, one will be created. Subsequent outgoing messages will use this
@@ -40,334 +32,291 @@
  * message listener.
  * @author Bela Ban
  */
-public class ConnectionTable1_4 implements Runnable
-{
-	Hashtable conns = new Hashtable();
-	// keys: Addresses (peer address), values: Connection
-	Receiver receiver = null;
-	ServerSocketChannel srv_sock = null;
-	InetAddress bind_addr = null;
-	Address local_addr = null; // bind_addr + port of srv_sock
-	int srv_port = 7800;
-	Thread acceptor = null; // continuously calls srv_sock.accept()
-	final int backlog = 20;
-	// 20 conn requests are queued by ServerSocket (addtl will be discarded)
-	Vector conn_listeners = new Vector();
-	// listeners to be notified when a conn is established/torn down
-	Object recv_mutex = new Object();
-	// to serialize simultaneous access to receive() from multiple Connections
-	Reaper reaper = null;
-	// closes conns that have been idle for more than n secs
-	long reaper_interval = 60000; // reap unused conns once a minute
-	long conn_expire_time = 300000;
-	// connections can be idle for 5 minutes before they are reaped
-	boolean use_reaper = false; // by default we don't reap idle conns
-	ThreadGroup thread_group = null;
-	final byte[] cookie = { 'b', 'e', 'l', 'a' };
-	private Selector connectSelector;
-
-	/** Used for message reception */
-	public interface Receiver
-	{
-		void receive(Message msg);
-	}
-
-	/** Used to be notified about connection establishment and teardown */
-	public interface ConnectionListener
-	{
-		void connectionOpened(Address peer_addr);
-		void connectionClosed(Address peer_addr);
-	}
-
-	private ConnectionTable1_4()
-	{ // cannot be used, other ctor has to be used
-
-	}
-
-	/**
-	 * Regular ConnectionTable without expiration of idle connections
-	 * @param srv_port The port on which the server will listen. If this port is reserved, the next
-	 *                 free port will be taken (incrementing srv_port).
-	 */
-	public ConnectionTable1_4(int srv_port) throws Exception
-	{
-		this.srv_port = srv_port;
-		start();
-	}
-
-	/**
-	 * ConnectionTable including a connection reaper. Connections that have been idle for more than conn_expire_time
-	 * milliseconds will be closed and removed from the connection table. On next access they will be re-created.
-	 * @param srv_port The port on which the server will listen
-	 * @param reaper_interval Number of milliseconds to wait for reaper between attepts to reap idle connections
-	 * @param conn_expire_time Number of milliseconds a connection can be idle (no traffic sent or received until
-	 *                         it will be reaped
-	 */
-	public ConnectionTable1_4(
-		int srv_port,
-		long reaper_interval,
-		long conn_expire_time)
-		throws Exception
-	{
-		this.srv_port = srv_port;
-		this.reaper_interval = reaper_interval;
-		this.conn_expire_time = conn_expire_time;
-		use_reaper = true;
-		start();
-	}
-
-	/**
-	 * Create a ConnectionTable
-	 * @param r A reference to a receiver of all messages received by this class. Method <code>receive()</code>
-	 *          will be called.
-	 * @param bind_addr The host name or IP address of the interface to which the server socket will bind.
-	 *                  This is interesting only in multi-homed systems. If bind_addr is null, the
-	 *	  	        server socket will bind to the first available interface (e.g. /dev/hme0 on
-	 *                  Solaris or /dev/eth0 on Linux systems).
-	 * @param srv_port The port to which the server socket will bind to. If this port is reserved, the next
-	 *                 free port will be taken (incrementing srv_port).
-	 */
-	public ConnectionTable1_4(Receiver r, InetAddress bind_addr, int srv_port)
-		throws Exception
-	{
-		setReceiver(r);
-		this.bind_addr = bind_addr;
-		this.srv_port = srv_port;
-		start();
-	}
-
-	/**
-	 * ConnectionTable including a connection reaper. Connections that have been idle for more than conn_expire_time
-	 * milliseconds will be closed and removed from the connection table. On next access they will be re-created.
-	 *
-	 * @param srv_port The port on which the server will listen.If this port is reserved, the next
-	 *                 free port will be taken (incrementing srv_port).
-	 * @param bind_addr The host name or IP address of the interface to which the server socket will bind.
-	 *                  This is interesting only in multi-homed systems. If bind_addr is null, the
-	 *		        server socket will bind to the first available interface (e.g. /dev/hme0 on
-	 *		        Solaris or /dev/eth0 on Linux systems).
-	 * @param srv_port The port to which the server socket will bind to. If this port is reserved, the next
-	 *                 free port will be taken (incrementing srv_port).
-	 * @param reaper_interval Number of milliseconds to wait for reaper between attepts to reap idle connections
-	 * @param conn_expire_time Number of milliseconds a connection can be idle (no traffic sent or received until
-	 *                         it will be reaped
-	 */
-	public ConnectionTable1_4(
-		Receiver r,
-		InetAddress bind_addr,
-		int srv_port,
-		long reaper_interval,
-		long conn_expire_time)
-		throws Exception
-	{
-		setReceiver(r);
-		this.bind_addr = bind_addr;
-		this.srv_port = srv_port;
-		this.reaper_interval = reaper_interval;
-		this.conn_expire_time = conn_expire_time;
-		use_reaper = true;
-		start();
-	}
-
-	public void setReceiver(Receiver r)
-	{
-		receiver = r;
-	}
-
-	public void addConnectionListener(ConnectionListener l)
-	{
-		if (l != null && !conn_listeners.contains(l))
-			conn_listeners.addElement(l);
-	}
-
-	public void removeConnectionListener(ConnectionListener l)
-	{
-		if (l != null)
-			conn_listeners.removeElement(l);
-	}
-
-	public Address getLocalAddress()
-	{
-		if (local_addr == null)
-			local_addr =
-				bind_addr != null ? new IpAddress(bind_addr, srv_port) : null;
-		return local_addr;
-	}
-
-	/** Sends a message to a unicast destination. The destination has to be set */
-	public void send(Message msg)
-	{
-		Address dest = msg != null ? msg.getDest() : null;
-		Connection conn;
-
-		if (dest == null)
-		{
-			Trace.error(
-				""ConnectionTable.send()"",
-				""msg is null or message's destination is null"");
-			return;
-		}
-
-		// 1. Try to obtain correct Connection (or create one if not yet existent)
-		try
-		{
-			conn = getConnection(dest);
-			if (conn == null)
-				return;
-		}
-		catch (Throwable ex)
-		{
-			Trace.info(
-				""ConnectionTable.send()"",
-				""connection to "" + dest + "" could not be established: "" + ex);
-			return;
-		}
-
-		// 2. Send the message using that connection
-		try
-		{
-			conn.send(msg);
-		}
-		catch (Throwable ex)
-		{
-			if (Trace.trace)
-				Trace.info(
-					""ConnectionTable.send()"",
-					""sending message to ""
-						+ dest
-						+ "" failed (ex=""
-						+ ex.getClass().getName()
-						+ ""); removing from connection table"");
-			remove(dest);
-		}
-	}
-
-	/** Try to obtain correct Connection (or create one if not yet existent) */
-	Connection getConnection(Address dest) throws Exception
-	{
-		Connection conn = null;
-		Socket sock;
-
-		synchronized (conns)
-		{
-			conn = (Connection) conns.get(dest);
-			if (conn == null)
-			{
-				sock =
-					new Socket(
+public class ConnectionTable1_4 implements Runnable {
+    Hashtable     conns=new Hashtable();       // keys: Addresses (peer address), values: Connection
+    Receiver      receiver=null;
+    ServerSocketChannel srv_sock_ch=null;
+    ServerSocket  srv_sock=null;
+    InetAddress   bind_addr=null;
+    Address       local_addr=null;             // bind_addr + port of srv_sock
+    int           srv_port=7800;
+    Thread        acceptor=null;               // continuously calls srv_sock.accept()
+    final int     backlog=20;                  // 20 conn requests are queued by ServerSocket (addtl will be discarded)
+    Vector        conn_listeners=new Vector(); // listeners to be notified when a conn is established/torn down
+    Object        recv_mutex=new Object();     // to serialize simultaneous access to receive() from multiple Connections
+    Reaper        reaper=null;                 // closes conns that have been idle for more than n secs
+    long          reaper_interval=60000;       // reap unused conns once a minute
+    long          conn_expire_time=300000;     // connections can be idle for 5 minutes before they are reaped
+    boolean       use_reaper=false;            // by default we don't reap idle conns
+    ThreadGroup   thread_group=null;
+    final byte[]  cookie={'b', 'e', 'l', 'a'};
+	private Selector selector = null;
+	private ArrayList pendingSocksList=null;
+    /** Used for message reception */
+    public interface Receiver {
+        void receive(Message msg);
+    }
+
+
+    /** Used to be notified about connection establishment and teardown */
+    public interface ConnectionListener {
+        void connectionOpened(Address peer_addr);
+        void connectionClosed(Address peer_addr);
+    }
+
+
+    private ConnectionTable1_4() { // cannot be used, other ctor has to be used
+
+    }
+
+    /**
+     * Regular ConnectionTable1_4 without expiration of idle connections
+     * @param srv_port The port on which the server will listen. If this port is reserved, the next
+     *                 free port will be taken (incrementing srv_port).
+     */
+    public ConnectionTable1_4(int srv_port) throws Exception {
+        this.srv_port=srv_port;
+        start();
+    }
+
+
+    /**
+     * ConnectionTable including a connection reaper. Connections that have been idle for more than conn_expire_time
+     * milliseconds will be closed and removed from the connection table. On next access they will be re-created.
+     * @param srv_port The port on which the server will listen
+     * @param reaper_interval Number of milliseconds to wait for reaper between attepts to reap idle connections
+     * @param conn_expire_time Number of milliseconds a connection can be idle (no traffic sent or received until
+     *                         it will be reaped
+     */
+    public ConnectionTable1_4(int srv_port, long reaper_interval, long conn_expire_time) throws Exception {
+        this.srv_port=srv_port;
+        this.reaper_interval=reaper_interval;
+        this.conn_expire_time=conn_expire_time;
+        use_reaper=true;
+        start();
+    }
+
+
+    /**
+     * Create a ConnectionTable
+     * @param r A reference to a receiver of all messages received by this class. Method <code>receive()</code>
+     *          will be called.
+     * @param bind_addr The host name or IP address of the interface to which the server socket will bind.
+     *                  This is interesting only in multi-homed systems. If bind_addr is null, the
+     *	  	        server socket will bind to the first available interface (e.g. /dev/hme0 on
+     *                  Solaris or /dev/eth0 on Linux systems).
+     * @param srv_port The port to which the server socket will bind to. If this port is reserved, the next
+     *                 free port will be taken (incrementing srv_port).
+     */
+    public ConnectionTable1_4(Receiver r, InetAddress bind_addr, int srv_port) throws Exception {
+        setReceiver(r);
+        this.bind_addr=bind_addr;
+        this.srv_port=srv_port;
+        start();
+    }
+
+
+    /**
+     * ConnectionTable including a connection reaper. Connections that have been idle for more than conn_expire_time
+     * milliseconds will be closed and removed from the connection table. On next access they will be re-created.
+     *
+     * @param srv_port The port on which the server will listen.If this port is reserved, the next
+     *                 free port will be taken (incrementing srv_port).
+     * @param bind_addr The host name or IP address of the interface to which the server socket will bind.
+     *                  This is interesting only in multi-homed systems. If bind_addr is null, the
+     *		        server socket will bind to the first available interface (e.g. /dev/hme0 on
+     *		        Solaris or /dev/eth0 on Linux systems).
+     * @param srv_port The port to which the server socket will bind to. If this port is reserved, the next
+     *                 free port will be taken (incrementing srv_port).
+     * @param reaper_interval Number of milliseconds to wait for reaper between attepts to reap idle connections
+     * @param conn_expire_time Number of milliseconds a connection can be idle (no traffic sent or received until
+     *                         it will be reaped
+     */
+    public ConnectionTable1_4(Receiver r, InetAddress bind_addr, int srv_port,
+                           long reaper_interval, long conn_expire_time) throws Exception {
+        setReceiver(r);
+        this.bind_addr=bind_addr;
+        this.srv_port=srv_port;
+        this.reaper_interval=reaper_interval;
+        this.conn_expire_time=conn_expire_time;
+        use_reaper=true;
+        start();
+    }
+
+
+    public void setReceiver(Receiver r) {
+        receiver=r;
+    }
+
+
+    public void addConnectionListener(ConnectionListener l) {
+        if(l != null && !conn_listeners.contains(l))
+            conn_listeners.addElement(l);
+    }
+
+
+    public void removeConnectionListener(ConnectionListener l) {
+        if(l != null) conn_listeners.removeElement(l);
+    }
+
+
+    public Address getLocalAddress() {
+        if(local_addr == null)
+            local_addr=bind_addr != null ? new IpAddress(bind_addr, srv_port) : null;
+        return local_addr;
+    }
+
+
+    /** Sends a message to a unicast destination. The destination has to be set */
+    public void send(Message msg) {
+        Address dest=msg != null ? msg.getDest() : null;
+        Connection conn;
+
+        if(dest == null) {
+            Trace.error(""ConnectionTable1_4.send()"", ""msg is null or message's destination is null"");
+            return;
+        }
+
+        // 1. Try to obtain correct Connection (or create one if not yet existent)
+        try {
+            conn=getConnection(dest);
+            if(conn == null) return;
+        }
+        catch(Throwable ex) {
+            Trace.info(""ConnectionTable1_4.send()"", ""connection to "" + dest + "" could not be established: "" + ex);
+            return;
+        }
+
+        // 2. Send the message using that connection
+        try {
+            conn.send(msg);
+        }
+        catch(Throwable ex) {
+            if(Trace.trace)
+                Trace.info(""ConnectionTable1_4.send()"", ""sending message to "" + dest + "" failed (ex="" +
+                                                     ex.getClass().getName() + ""); removing from connection table"");
+            remove(dest);
+        }
+    }
+
+
+    /** Try to obtain correct Connection (or create one if not yet existent) */
+    Connection getConnection(Address dest) throws Exception {
+        Connection conn=null;
+        SocketChannel sock_ch;
+
+        synchronized(conns) {
+            conn=(Connection)conns.get(dest);
+            if(conn == null) {
+				InetSocketAddress destAddress =
+					new InetSocketAddress(
 						((IpAddress) dest).getIpAddress(),
 						((IpAddress) dest).getPort());
-				conn = new Connection(sock, dest);
-				conn.sendLocalAddress(local_addr);
-				notifyConnectionOpened(dest);
-				// conns.put(dest, conn);
-				addConnection(dest, conn);
-				conn.init();
-				if (Trace.trace)
-					Trace.info(
-						""ConnectionTable.getConnection()"",
-						""created socket to "" + dest);
-			}
-			return conn;
-		}
-	}
-
-	public void start() throws Exception
-	{
-		srv_sock = createServerSocket(srv_port);
-
-		if (bind_addr != null)
-			local_addr =
-				new IpAddress(bind_addr, srv_sock.socket().getLocalPort());
-		else
-			local_addr = new IpAddress(srv_sock.socket().getLocalPort());
-
-		if (Trace.trace)
-		{
-			Trace.info(
-				""ConnectionTable.start()"",
-				""server socket created "" + ""on "" + local_addr);
-		}
-		acceptor = new Thread(this, ""ConnectionTable.AcceptorThread"");
-		acceptor.setDaemon(true);
-		acceptor.start();
-
-		// start the connection reaper - will periodically remove unused connections
-		if (use_reaper && reaper == null)
-		{
-			reaper = new Reaper();
-			reaper.start();
-		}
-	}
-
-	/** Closes all open sockets, the server socket and all threads waiting for incoming messages */
-	public void stop()
-	{
-		Iterator it = null;
-		Connection conn;
-		ServerSocketChannel tmp;
-
-		// 1. close the server socket (this also stops the acceptor thread)
-		if (srv_sock != null)
-		{
-			try
-			{
-				tmp = srv_sock;
-				srv_sock = null;
-				tmp.close();
-			}
-			catch (Exception e)
-			{
-			}
-		}
-
-		// 2. then close the connections
-		synchronized (conns)
-		{
-			it = conns.values().iterator();
-			while (it.hasNext())
-			{
-				conn = (Connection) it.next();
-				conn.destroy();
-			}
-			conns.clear();
-		}
-		local_addr = null;
-	}
-
-	/**
-	 Remove <code>addr</code>from connection table. This is typically triggered when a member is suspected.
-	 */
-	public void remove(Address addr)
-	{
-		Connection conn;
-
-		synchronized (conns)
-		{
-			conn = (Connection) conns.get(addr);
-
-			if (conn != null)
-			{
-				try
-				{
-					conn.destroy(); // won't do anything if already destroyed
-				}
-				catch (Exception e)
-				{
-				}
-				conns.remove(addr);
-			}
-			if (Trace.trace)
-				Trace.info(
-					""ConnectionTable.remove()"",
-					""addr="" + addr + "", connections are "" + toString());
-		}
-	}
-
-	/**
-	 * Acceptor thread. Continuously accept new connections. Create a new thread for each new
-	 * connection and put it in conns. When the thread should stop, it is
-	 * interrupted by the thread creator.
+				sock_ch = SocketChannel.open(destAddress);
+                conn=new Connection(sock_ch, dest);
+                conn.sendLocalAddress(local_addr);
+                // conns.put(dest, conn);
+                addConnection(dest, conn);
+                pendingSocksList.add(conn);
+                selector.wakeup();
+                notifyConnectionOpened(dest);
+                if(Trace.trace) Trace.info(""ConnectionTable1_4.getConnection()"", ""created socket to "" + dest);
+            }
+            return conn;
+        }
+    }
+
+
+    public void start() throws Exception {
+		this.selector = Selector.open();
+        srv_sock=createServerSocket(srv_port);
+
+        if(bind_addr != null)
+            local_addr=new IpAddress(bind_addr, srv_sock.getLocalPort());
+        else
+            local_addr=new IpAddress(srv_sock.getLocalPort());
+
+        if(Trace.trace) {
+            Trace.info(""ConnectionTable1_4.start()"", ""server socket created "" +
+                                                  ""on "" + local_addr);
+        }
+
+        //Roland Kurmann 4/7/2003, build new thread group
+        thread_group = new ThreadGroup(Thread.currentThread().getThreadGroup(), ""ConnectionTableGroup"");
+        //Roland Kurmann 4/7/2003, put in thread_group
+        acceptor=new Thread(thread_group, this, ""ConnectionTable1_4.AcceptorThread"");
+        acceptor.setDaemon(true);
+        acceptor.start();
+
+        // start the connection reaper - will periodically remove unused connections
+        if(use_reaper && reaper == null) {
+            reaper=new Reaper();
+            reaper.start();
+        }
+        pendingSocksList = new ArrayList();
+    }
+
+
+    /** Closes all open sockets, the server socket and all threads waiting for incoming messages */
+    public void stop() {
+        Iterator it=null;
+        Connection conn;
+        ServerSocket tmp;
+
+        // 1. close the server socket (this also stops the acceptor thread)
+        if(srv_sock != null) {
+            try {
+                tmp=srv_sock;
+                srv_sock=null;
+                tmp.close();
+            }
+            catch(Exception e) {
+            	e.printStackTrace();
+            }
+        }
+
+
+        // 2. then close the connections
+        synchronized(conns) {
+            it=conns.values().iterator();
+            while(it.hasNext()) {
+                conn=(Connection)it.next();
+                conn.destroy();
+            }
+            conns.clear();
+        }
+        local_addr=null;
+    }
+
+
+    /**
+     Remove <code>addr</code>from connection table. This is typically triggered when a member is suspected.
+     */
+    public void remove(Address addr) {
+        Connection conn;
+
+        synchronized(conns) {
+            conn=(Connection)conns.get(addr);
+
+            if(conn != null) {
+                try {
+                    conn.destroy();  // won't do anything if already destroyed
+                }
+                catch(Exception e) {
+                	e.printStackTrace();
+                }
+                conns.remove(addr);
+            }
+            if(Trace.trace)
+                Trace.info(""ConnectionTable1_4.remove()"", ""addr="" + addr + "", connections are "" + toString());
+        }
+    }
+
+
+    /**
+	 * Acceptor thread. Continuously accept new connections. Create a new
+	 * thread for each new connection and put it in conns. When the thread
+	 * should stop, it is interrupted by the thread creator.
 	 */
 	public void run()
 	{
@@ -375,63 +324,96 @@ public void run()
 		Connection conn = null;
 		Address peer_addr;
 
-		while (srv_sock != null)
+		while (srv_sock_ch != null)
 		{
 			try
 			{
-				connectSelector.select();
-				Set readyKeys = connectSelector.selectedKeys();
-
-				for (Iterator i = readyKeys.iterator(); i.hasNext();)
+				if (selector.select() > 0)
 				{
-					SelectionKey key = (SelectionKey) i.next();
-					i.remove();
-
-					ServerSocketChannel readyChannel =
-						(ServerSocketChannel) key.channel();
-
-					SocketChannel incomingChannel = readyChannel.accept();
-					incomingChannel.configureBlocking(false);
-					client_sock = incomingChannel.socket();
-
-					if (Trace.trace)
-						Trace.info(
-							""ConnectionTable.run()"",
-							""accepted connection, client_sock="" + client_sock);
-
-					// create new thread and add to conn table
-					conn = new Connection(client_sock, null);
-					// will call receive(msg)
-					// get peer's address
-					peer_addr = conn.readPeerAddress(client_sock);
-
-					// client_addr=new IpAddress(client_sock.getInetAddress(), client_port);
-					conn.setPeerAddress(peer_addr);
-
-					synchronized (conns)
+					Set readyKeys = selector.selectedKeys();
+					for (Iterator i = readyKeys.iterator(); i.hasNext();)
 					{
-						if (conns.contains(peer_addr))
+						SelectionKey key = (SelectionKey) i.next();
+						i.remove();
+						if ((key.readyOps() & SelectionKey.OP_ACCEPT)
+							== SelectionKey.OP_ACCEPT)
 						{
+							ServerSocketChannel readyChannel =
+								(ServerSocketChannel) key.channel();
+
+							SocketChannel client_sock_ch=
+								readyChannel.accept();
+							client_sock = client_sock_ch.socket();
 							if (Trace.trace)
-								Trace.warn(
-									""ConnectionTable.run()"",
-									peer_addr
-										+ "" is already there, will terminate connection"");
-							conn.destroy();
-							return;
+								Trace.info(
+									""ConnectionTable1_4.run()"",
+									""accepted connection, client_sock=""
+										+ client_sock);
+
+							conn = new Connection(client_sock_ch, null);
+							// will call receive(msg)
+							// get peer's address
+							peer_addr = conn.readPeerAddress(client_sock);
+
+							conn.setPeerAddress(peer_addr);
+
+							synchronized (conns)
+							{
+								if (conns.contains(peer_addr))
+								{
+									if (Trace.trace)
+										Trace.warn(
+											""ConnectionTable1_4.run()"",
+											peer_addr
+												+ "" is already there, will terminate connection"");
+									conn.destroy();
+									return;
+								}
+								addConnection(peer_addr, conn);
+							}
+							conn.init();
+							notifyConnectionOpened(peer_addr);
+						}
+						else if (
+							(key.readyOps() & SelectionKey.OP_READ)
+								== SelectionKey.OP_READ)
+						{
+							SocketChannel incomingChannel =
+							(SocketChannel) key.channel();
+							conn = (Connection) key.attachment();
+							ByteBuffer buff = conn.getNIOMsgReader().readCompleteMsgBuffer();
+							if(buff != null)
+							{
+								receive((Message)Util.objectFromByteBuffer(buff.array()));
+								conn.getNIOMsgReader().reset();
+							}
 						}
-						// conns.put(peer_addr, conn);
-						addConnection(peer_addr, conn);
 					}
-					notifyConnectionOpened(peer_addr);
-					conn.init(); // starts handler thread on this socket
+				}
+				else
+				{
+					/*In addition to the accepted Sockets, we must registe 
+					 * sockets opend by this for OP_READ, because peer may
+					 * use the same socket to sends data using the same socket,
+					 * instead of opening a new connection. We can not register 
+					 * with this selectior from a different thread. set pending
+					 * and wakeup this selector.
+					 */
+					synchronized (conns)
+					{
+						Connection pendingConnection;
+						while( (pendingSocksList.size()>0) && (null != (pendingConnection = (Connection)pendingSocksList.remove(0))) )
+						{
+							pendingConnection.init();
+						}
+					}	
 				}
 			}
 			catch (SocketException sock_ex)
 			{
 				if (Trace.trace)
 					Trace.info(
-						""ConnectionTable.run()"",
+						""ConnectionTable1_4.run()"",
 						""exception is "" + sock_ex);
 				if (conn != null)
 					conn.destroy();
@@ -441,637 +423,447 @@ public void run()
 			catch (Throwable ex)
 			{
 				if (Trace.trace)
-					Trace.warn(""ConnectionTable.run()"", ""exception is "" + ex);
-			}
-		}
-	}
-
-	/**
-	 * Calls the receiver callback. We serialize access to this method because it may be called concurrently
-	 * by several Connection handler threads. Therefore the receiver doesn't need to synchronize.
-	 */
-	public void receive(Message msg)
-	{
-		if (receiver != null)
-		{
-			synchronized (recv_mutex)
-			{
-				receiver.receive(msg);
-			}
-		}
-		else
-			Trace.error(
-				""ConnectionTable.receive()"",
-				""receiver is null (not set) !"");
-	}
-
-	public String toString()
-	{
-		StringBuffer ret = new StringBuffer();
-		Address key;
-		Connection val;
-
-		synchronized (conns)
-		{
-			ret.append(""connections ("" + conns.size() + ""):\n"");
-			for (Enumeration e = conns.keys(); e.hasMoreElements();)
-			{
-				key = (Address) e.nextElement();
-				val = (Connection) conns.get(key);
-				ret.append(
-					""key: "" + key.toString() + "": "" + val.toString() + ""\n"");
-			}
-		}
-		ret.append(""\n"");
-		return ret.toString();
-	}
-
-	/** Finds first available port starting at start_port and returns server socket. Sets srv_port */
-	ServerSocketChannel createServerSocket(int start_port) throws Exception
-	{
-		ServerSocketChannel ret = ServerSocketChannel.open();
-		ret.configureBlocking(false);
-
-		while (true)
-		{
-			try
-			{
-				if (bind_addr == null)
-					ret.socket().bind(new InetSocketAddress(start_port));
-				else
-					ret.socket().bind(
-						new InetSocketAddress(bind_addr, start_port),
-						backlog);
-			}
-			catch (BindException bind_ex)
-			{
-				start_port++;
-				continue;
-			}
-			catch (IOException io_ex)
-			{
-				Trace.error(
-					""ConnectionTable.createServerSocket()"",
-					""exception is "" + io_ex);
-			}
-			srv_port = start_port;
-			break;
-		}
-		ret.register(this.connectSelector, SelectionKey.OP_ACCEPT);
-		return ret;
-	}
-
-	void notifyConnectionOpened(Address peer)
-	{
-		if (peer == null)
-			return;
-		for (int i = 0; i < conn_listeners.size(); i++)
-			(
-				(ConnectionListener) conn_listeners.elementAt(
-					i)).connectionOpened(
-				peer);
-	}
-
-	void notifyConnectionClosed(Address peer)
-	{
-		if (peer == null)
-			return;
-		for (int i = 0; i < conn_listeners.size(); i++)
-			(
-				(ConnectionListener) conn_listeners.elementAt(
-					i)).connectionClosed(
-				peer);
-	}
-
-	void addConnection(Address peer, Connection c)
-	{
-		conns.put(peer, c);
-		if (reaper != null && !reaper.isRunning())
-			reaper.start();
-	}
-
-	/* ----Receiver thread gets OP_READ events and reads from the channel ---*/
-	/**
-	 *  need to have multiple receiver threads for every 63 of channels(sockets)
-	 */
-
-	class ReceiverThread extends Thread
-	{
-		private Selector selector = null;
-		private static final int READ_BUFFER_SIZE = 256;
-		private ByteBuffer readBuffer = null;
-		public ReceiverThread(Selector selector)
-		{
-			this.selector = selector;
-			readBuffer = ByteBuffer.allocateDirect(READ_BUFFER_SIZE);
-		}
-
-		public void run()
-		{
-			Message msg;
-			while (true)
-			{
-				try
-				{
-					int keysReady = selector.select();
-
-					if (keysReady > 0)
-					{
-						Set readyKeys = selector.selectedKeys();
-
-						for (Iterator i = readyKeys.iterator(); i.hasNext();)
-						{
-							SelectionKey key = (SelectionKey) i.next();
-							i.remove();
-							SocketChannel incomingChannel =
-								(SocketChannel) key.channel();
-							Socket incomingSocket = incomingChannel.socket();
-							int bytesRead = incomingChannel.read(readBuffer);
-							readBuffer.flip();
-							byte[] recvBytes = readBuffer.array();
-							msg =
-								(Message) Util.objectFromByteBuffer(recvBytes);
-							receive(msg);
-							readBuffer.clear();
-
-						}
-					}
-				}
-				catch (Exception ex)
-				{
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-
-	class Connection
-	{
-		Socket sock = null;
-		// socket to/from peer (result of srv_sock.accept() or new Socket())
-		DataOutputStream out = null; // for sending messages
-		DataInputStream in = null; // for receiving messages
-		Address peer_addr = null;
-		// address of the 'other end' of the connection
-		Object send_mutex = new Object(); // serialize sends
-		long last_access = System.currentTimeMillis();
-		// last time a message was sent or received
-		// final byte[]     cookie={(byte)'b', (byte)'e', (byte)'l', (byte)'a'};
-
-		Connection(Socket s, Address peer_addr)
-		{
-			sock = s;
-			this.peer_addr = peer_addr;
-			try
-			{
-				out = new DataOutputStream(sock.getOutputStream());
-				in = new DataInputStream(sock.getInputStream());
-			}
-			catch (Exception ex)
-			{
-				Trace.error(
-					""ConnectionTable.Connection()"",
-					""exception is "" + ex);
-			}
-		}
-
-		void setPeerAddress(Address peer_addr)
-		{
-			this.peer_addr = peer_addr;
-		}
-
-		void updateLastAccessed()
-		{
-			//if(Trace.trace)
-			///Trace.info(""ConnectionTable.Connection.updateLastAccessed()"", ""connections are "" + conns);
-			last_access = System.currentTimeMillis();
-		}
-
-		void init()
-		{
-			if (Trace.trace)
-				Trace.info(
-					""ConnectionTable.Connection.init()"",
-					""connection was created to "" + peer_addr);
-			// TODO register channel with selector or creater should.
-		}
-
-		void destroy()
-		{
-			closeSocket(); // should terminate handler as well
-		}
-
-		void send(Message msg)
-		{
-			synchronized (send_mutex)
-			{
-				try
-				{
-					doSend(msg);
-					updateLastAccessed();
-				}
-				catch (IOException io_ex)
-				{
-					if (Trace.trace)
-						Trace.warn(
-							""ConnectionTable.Connection.send()"",
-							""peer closed connection, ""
-								+ ""trying to re-establish connection and re-send msg."");
-					try
-					{
-						doSend(msg);
-						updateLastAccessed();
-					}
-					catch (IOException io_ex2)
-					{
-						if (Trace.trace)
-							Trace.error(
-								""ConnectionTable.Connection.send()"",
-								""2nd attempt to send data failed too"");
-					}
-					catch (Exception ex2)
-					{
-						if (Trace.trace)
-							Trace.error(
-								""ConnectionTable.Connection.send()"",
-								""exception is "" + ex2);
-					}
-				}
-				catch (Exception ex)
-				{
-					if (Trace.trace)
-						Trace.error(
-							""ConnectionTable.Connection.send()"",
-							""exception is "" + ex);
-				}
-			}
-		}
-
-		void doSend(Message msg) throws Exception
-		{
-			IpAddress dst_addr = (IpAddress) msg.getDest();
-			byte[] buffie = null;
-
-			if (dst_addr == null || dst_addr.getIpAddress() == null)
-			{
-				Trace.error(
-					""ConnectionTable.Connection.doSend()"",
-					""the destination address is null; aborting send"");
-				return;
-			}
-
-			try
-			{
-				// set the source address if not yet set
-				if (msg.getSrc() == null)
-					msg.setSrc(local_addr);
-
-				buffie = Util.objectToByteBuffer(msg);
-				if (buffie.length <= 0)
-				{
-					Trace.error(
-						""ConnectionTable.Connection.doSend()"",
-						""buffer.length is 0. Will not send message"");
-					return;
-				}
-
-				// we're using 'double-writes', sending the buffer to the destination twice. this would
-				// ensure that, if the peer closed the connection while we were idle, we would get an exception.
-				// this won't happen if we use a single write (see Stevens, ch. 5.13).
-				if (out != null)
-				{
-					out.writeInt(buffie.length);
-					// write the length of the data buffer first
-					Util.doubleWrite(buffie, out);
-					out.flush(); // may not be very efficient (but safe)
-				}
-			}
-			catch (Exception ex)
-			{
-				if (Trace.trace)
-					Trace.error(
-						""ConnectionTable.Connection.doSend()"",
-						""to ""
-							+ dst_addr
-							+ "", exception is ""
-							+ ex
-							+ "", stack trace:\n""
-							+ Util.printStackTrace(ex));
-				remove(dst_addr);
-				throw ex;
-			}
-		}
-
-		/**
-		 * Reads the peer's address. First a cookie has to be sent which has to match my own cookie, otherwise
-		 * the connection will be refused
-		 */
-		Address readPeerAddress(Socket client_sock) throws Exception
-		{
-			Address peer_addr = null;
-			byte[] version, buf, input_cookie = new byte[cookie.length];
-			int len = 0,
-				client_port = client_sock != null ? client_sock.getPort() : 0;
-			InetAddress client_addr =
-				client_sock != null ? client_sock.getInetAddress() : null;
-
-			if (in != null)
-			{
-				initCookie(input_cookie);
-
-				// read the cookie first
-				in.read(input_cookie, 0, input_cookie.length);
-				if (!matchCookie(input_cookie))
-					throw new SocketException(
-						""ConnectionTable.Connection.readPeerAddress(): cookie sent by ""
-							+ peer_addr
-							+ "" does not match own cookie; terminating connection"");
-				// then read the version
-				version = new byte[Version.version_id.length];
-				in.read(version, 0, version.length);
-
-				if (Version.compareTo(version) == false)
-				{
 					Trace.warn(
-						""ConnectionTable.readPeerAddress()"",
-						""packet from ""
-							+ client_addr
-							+ "":""
-							+ client_port
-							+ "" has different version (""
-							+ Version.printVersionId(
-								version,
-								Version.version_id.length)
-							+ "") from ours (""
-							+ Version.printVersionId(Version.version_id)
-							+ ""). This may cause problems"");
-				}
-
-				// read the length of the address
-				len = in.readInt();
-
-				// finally read the address itself
-				buf = new byte[len];
-				in.readFully(buf, 0, len);
-				peer_addr = (Address) Util.objectFromByteBuffer(buf);
-				updateLastAccessed();
-			}
-			return peer_addr;
-		}
-
-		/**
-		 * Send the cookie first, then the our port number. If the cookie doesn't match the receiver's cookie,
-		 * the receiver will reject the connection and close it.
-		 */
-		void sendLocalAddress(Address local_addr)
-		{
-			byte[] buf;
-
-			if (local_addr == null)
-			{
-				Trace.warn(
-					""ConnectionTable.Connection.sendLocalAddress()"",
-					""local_addr is null"");
-				return;
-			}
-			if (out != null)
-			{
-				try
-				{
-					buf = Util.objectToByteBuffer(local_addr);
-
-					// write the cookie
-					out.write(cookie, 0, cookie.length);
-
-					// write the version
-					out.write(Version.version_id, 0, Version.version_id.length);
-
-					// write the length of the buffer
-					out.writeInt(buf.length);
-
-					// and finally write the buffer itself
-					out.write(buf, 0, buf.length);
-					out.flush(); // needed ?
-					updateLastAccessed();
-				}
-				catch (Throwable t)
-				{
-					Trace.error(
-						""ConnectionTable.Connection.sendLocalAddress()"",
-						""exception is "" + t);
-				}
-			}
-		}
-
-		void initCookie(byte[] c)
-		{
-			if (c != null)
-				for (int i = 0; i < c.length; i++)
-					c[i] = 0;
-		}
-
-		boolean matchCookie(byte[] input)
-		{
-			if (input == null || input.length < cookie.length)
-				return false;
-			if (Trace.trace)
-				Trace.info(
-					""ConnectionTable.Connection.matchCookie()"",
-					""input_cookie is "" + printCookie(input));
-			for (int i = 0; i < cookie.length; i++)
-				if (cookie[i] != input[i])
-					return false;
-			return true;
-		}
-
-		String printCookie(byte[] c)
-		{
-			if (c == null)
-				return """";
-			return new String(c);
-		}
-
-		public String toString()
-		{
-			StringBuffer ret = new StringBuffer();
-			InetAddress local = null, remote = null;
-			String local_str, remote_str;
-
-			if (sock == null)
-				ret.append(""<null socket>"");
-			else
-			{
-				//since the sock variable gets set to null we want to make
-				//make sure we make it through here without a nullpointer exception
-				Socket tmp_sock = sock;
-				local = tmp_sock.getLocalAddress();
-				remote = tmp_sock.getInetAddress();
-				local_str =
-					local != null
-						? Util.shortName(local.getHostName())
-						: ""<null>"";
-				remote_str =
-					remote != null
-						? Util.shortName(local.getHostName())
-						: ""<null>"";
-				ret.append(
-					""<""
-						+ local_str
-						+ "":""
-						+ tmp_sock.getLocalPort()
-						+ "" --> ""
-						+ remote_str
-						+ "":""
-						+ tmp_sock.getPort()
-						+ ""> (""
-						+ ((System.currentTimeMillis() - last_access) / 1000)
-						+ "" secs old)"");
-				tmp_sock = null;
-			}
-
-			return ret.toString();
-		}
-
-		void closeSocket()
-		{
-			if (sock != null)
-			{
-				try
-				{
-					sock.close();
-					// should actually close in/out (so we don't need to close them explicitly)
-				}
-				catch (Exception e)
-				{
-				}
-				sock = null;
-			}
-			if (out != null)
-			{
-				try
-				{
-					out.close(); // flushes data
-				}
-				catch (Exception e)
-				{
-				}
-				// removed 4/22/2003 (request by Roland Kurmann)
-				// out=null;
-			}
-			if (in != null)
-			{
-				try
-				{
-					in.close();
-				}
-				catch (Exception ex)
-				{
-				}
-				in = null;
+						""ConnectionTable1_4.run()"",
+						""exception is "" + ex);
 			}
 		}
 	}
 
-	class Reaper implements Runnable
-	{
-		Thread t = null;
 
-		Reaper()
-		{
-			;
-		}
-
-		public void start()
-		{
-			if (conns.size() == 0)
-				return;
-			if (t != null && !t.isAlive())
-				t = null;
-			if (t == null)
+    /**
+     * Calls the receiver callback. We serialize access to this method because it may be called concurrently
+     * by several Connection handler threads. Therefore the receiver doesn't need to synchronize.
+     */
+    public void receive(Message msg) {
+        if(receiver != null) {
+            synchronized(recv_mutex) {
+                receiver.receive(msg);
+            }
+        }
+        else
+            Trace.error(""ConnectionTable1_4.receive()"", ""receiver is null (not set) !"");
+    }
+
+
+    public String toString() {
+        StringBuffer ret=new StringBuffer();
+        Address key;
+        Connection val;
+
+        synchronized(conns) {
+            ret.append(""connections ("" + conns.size() + ""):\n"");
+            for(Enumeration e=conns.keys(); e.hasMoreElements();) {
+                key=(Address)e.nextElement();
+                val=(Connection)conns.get(key);
+                ret.append(""key: "" + key.toString() + "": "" + val.toString() + ""\n"");
+            }
+        }
+        ret.append(""\n"");
+        return ret.toString();
+    }
+
+
+    /** Finds first available port starting at start_port and returns server socket. Sets srv_port */
+    ServerSocket createServerSocket(int start_port) throws Exception {
+        srv_sock_ch = ServerSocketChannel.open();
+		srv_sock_ch.configureBlocking(false);
+        while(true) {
+            try {
+                if(bind_addr == null)
+				srv_sock_ch.socket().bind(new InetSocketAddress(start_port));
+                else
+				srv_sock_ch.socket().bind(new InetSocketAddress( bind_addr,start_port), backlog);
+            }
+            catch(BindException bind_ex) {
+                start_port++;
+                continue;
+            }
+            catch(IOException io_ex) {
+                Trace.error(""ConnectionTable1_4.createServerSocket()"", ""exception is "" + io_ex);
+            }
+            srv_port=start_port;
+            break;
+        }
+		srv_sock_ch.register(this.selector, SelectionKey.OP_ACCEPT);
+		return srv_sock_ch.socket();
+    }
+
+
+    void notifyConnectionOpened(Address peer) {
+        if(peer == null) return;
+        for(int i=0; i < conn_listeners.size(); i++)
+            ((ConnectionListener)conn_listeners.elementAt(i)).connectionOpened(peer);
+    }
+
+    void notifyConnectionClosed(Address peer) {
+        if(peer == null) return;
+        for(int i=0; i < conn_listeners.size(); i++)
+            ((ConnectionListener)conn_listeners.elementAt(i)).connectionClosed(peer);
+    }
+
+
+    void addConnection(Address peer, Connection c) {
+        conns.put(peer, c);
+        if(reaper != null && !reaper.isRunning())
+            reaper.start();
+    }
+    
+
+    class Connection {
+        Socket           sock=null;                // socket to/from peer (result of srv_sock.accept() or new Socket())
+        SocketChannel sock_ch = null;
+        DataOutputStream out=null;                 // for sending messages
+        DataInputStream  in=null;                  // for receiving messages
+        Address          peer_addr=null;           // address of the 'other end' of the connection
+        Object           send_mutex=new Object();  // serialize sends
+        long             last_access=System.currentTimeMillis(); // last time a message was sent or received
+        private static final int HEADER_SIZE = 4;
+        private static final int DEFAULT_BUFF_SIZE = 256;
+        ByteBuffer		 headerBuffer = ByteBuffer.allocate(HEADER_SIZE);
+        NBMessageForm1_4 	 nioMsgReader = null;
+        
+        Connection(SocketChannel s, Address peer_addr) {
+			sock_ch=s;
+			sock = sock_ch.socket();
+            this.peer_addr=peer_addr;
+            try {
+                out=new DataOutputStream(sock.getOutputStream());
+                in=new DataInputStream(sock.getInputStream());
+            }
+            catch(Exception ex) {
+                Trace.error(""ConnectionTable1_4.Connection()"", ""exception is "" + ex);
+            }
+        }
+
+        void setPeerAddress(Address peer_addr) {
+            this.peer_addr=peer_addr;
+        }
+
+        void updateLastAccessed() {
+            //if(Trace.trace)
+            ///Trace.info(""ConnectionTable1_4.Connection.updateLastAccessed()"", ""connections are "" + conns);
+            last_access=System.currentTimeMillis();
+        }
+
+        void init() {
+        	try
+        	{
+        		in = null;
+        		out = null;
+        	}
+        	catch(Exception ex)
+        	{
+        		ex.printStackTrace();
+        	}
+        	
+        	try
 			{
-				//RKU 7.4.2003, put in threadgroup
-				t =
-					new Thread(
-						thread_group,
-						this,
-						""ConnectionTable.ReaperThread"");
-				t.setDaemon(true);
-				// will allow us to terminate if all remaining threads are daemons
-				t.start();
+				sock_ch.configureBlocking(false);
+				nioMsgReader = new NBMessageForm1_4(DEFAULT_BUFF_SIZE,sock_ch);
+				sock_ch.register(selector, SelectionKey.OP_READ, this);
 			}
-		}
-
-		public void stop()
-		{
-			if (t != null)
-				t = null;
-		}
-
-		public boolean isRunning()
-		{
-			return t != null;
-		}
-
-		public void run()
-		{
-			Connection value;
-			Map.Entry entry;
-			long curr_time;
-
-			if (Trace.trace)
-				Trace.info(
-					""ConnectionTable.Reaper.run()"",
-					""connection reaper thread was started. Number of connections=""
-						+ conns.size()
-						+ "", reaper_interval=""
-						+ reaper_interval
-						+ "", conn_expire_time=""
-						+ conn_expire_time);
-
-			while (conns.size() > 0 && t != null)
+			catch (IOException e)
 			{
-				// first sleep
-				Util.sleep(reaper_interval);
-				synchronized (conns)
-				{
-					curr_time = System.currentTimeMillis();
-					for (Iterator it = conns.entrySet().iterator();
-						it.hasNext();
-						)
-					{
-						entry = (Map.Entry) it.next();
-						value = (Connection) entry.getValue();
-						if (Trace.trace)
-							Trace.info(
-								""ConnectionTable.Reaper.run()"",
-								""connection is ""
-									+ ((curr_time - value.last_access) / 1000)
-									+ "" seconds old (curr-time=""
-									+ curr_time
-									+ "", last_access=""
-									+ value.last_access
-									+ "")"");
-						if (value.last_access + conn_expire_time < curr_time)
-						{
-							if (Trace.trace)
-								Trace.info(
-									""ConnectionTable.Reaper.run()"",
-									""connection ""
-										+ value
-										+ "" has been idle for too long (conn_expire_time=""
-										+ conn_expire_time
-										+ ""), will be removed"");
-
-							value.destroy();
-							it.remove();
-						}
-					}
-				}
+				e.printStackTrace();
 			}
-			if (Trace.trace)
-				Trace.info(""ConnectionTable.Reaper.run()"", ""reaper terminated"");
-			t = null;
-		}
-	}
-
-}
+            if(Trace.trace)
+                Trace.info(""ConnectionTable1_4.Connection.init()"", ""connection was created to "" + peer_addr);
+
+        }
+
+
+        void destroy() {
+            closeSocket();
+            nioMsgReader = null;
+        }
+
+        void send(Message msg) {
+            synchronized(send_mutex) {
+                try {
+                    doSend(msg);
+                    updateLastAccessed();
+                }
+                catch(IOException io_ex) {
+                    if(Trace.trace)
+                        Trace.warn(""ConnectionTable1_4.Connection.send()"", ""peer closed connection, "" +
+                                                                        ""trying to re-establish connection and re-send msg."");
+                    try {
+                        doSend(msg);
+                        updateLastAccessed();
+                    }
+                    catch(IOException io_ex2) {
+                        if(Trace.trace) Trace.error(""ConnectionTable1_4.Connection.send()"", ""2nd attempt to send data failed too"");
+						io_ex2.printStackTrace();
+                    }
+                    catch(Exception ex2) {
+                        if(Trace.trace) Trace.error(""ConnectionTable1_4.Connection.send()"", ""exception is "" + ex2);
+                        ex2.printStackTrace();
+                    }
+                }
+                catch(Exception ex) {
+                    if(Trace.trace) Trace.error(""ConnectionTable1_4.Connection.send()"", ""exception is "" + ex);
+                    ex.printStackTrace();
+                }
+            }
+        }
+
+
+        void doSend(Message msg) throws Exception {
+            IpAddress dst_addr=(IpAddress)msg.getDest();
+            byte[]    buffie=null;
+
+            if(dst_addr == null || dst_addr.getIpAddress() == null) {
+                Trace.error(""ConnectionTable1_4.Connection.doSend()"", ""the destination address is null; aborting send"");
+                return;
+            }
+
+            try {
+                // set the source address if not yet set
+                if(msg.getSrc() == null)
+                    msg.setSrc(local_addr);
+
+                buffie=Util.objectToByteBuffer(msg);
+                if(buffie.length <= 0) {
+                    Trace.error(""ConnectionTable1_4.Connection.doSend()"", ""buffer.length is 0. Will not send message"");
+                    return;
+                }
+
+
+                // we're using 'double-writes', sending the buffer to the destination twice. this would
+                // ensure that, if the peer closed the connection while we were idle, we would get an exception.
+                // this won't happen if we use a single write (see Stevens, ch. 5.13).
+				headerBuffer.clear();
+				headerBuffer.putInt(buffie.length);
+				headerBuffer.flip();
+				Util1_4.writeFully(headerBuffer,sock_ch);
+				ByteBuffer sendBuffer = ByteBuffer.wrap(buffie);
+				Util1_4.writeFully(sendBuffer, sock_ch);
+            }
+            catch(Exception ex) {
+                if(Trace.trace)
+                    Trace.error(""ConnectionTable1_4.Connection.doSend()"",
+                                ""to "" + dst_addr + "", exception is "" + ex + "", stack trace:\n"" +
+                                Util.printStackTrace(ex));
+                ex.printStackTrace();
+                remove(dst_addr);
+                throw ex;
+            }
+        }
+
+
+        /**
+         * Reads the peer's address. First a cookie has to be sent which has to match my own cookie, otherwise
+         * the connection will be refused
+         */
+        Address readPeerAddress(Socket client_sock) throws Exception {
+            Address     peer_addr=null;
+            byte[]      version, buf, input_cookie=new byte[cookie.length];
+            int         len=0, client_port=client_sock != null? client_sock.getPort() : 0;
+            InetAddress client_addr=client_sock != null? client_sock.getInetAddress() : null;
+
+            if(in != null) {
+                initCookie(input_cookie);
+
+                // read the cookie first
+                in.read(input_cookie, 0, input_cookie.length);
+                if(!matchCookie(input_cookie))
+                    throw new SocketException(""ConnectionTable1_4.Connection.readPeerAddress(): cookie sent by "" +
+                                              peer_addr + "" does not match own cookie; terminating connection"");
+                // then read the version
+                version=new byte[Version.version_id.length];
+                in.read(version, 0, version.length);
+
+                if(Version.compareTo(version) == false) {
+                    Trace.warn(""ConnectionTable1_4.readPeerAddress()"",
+                               ""packet from "" + client_addr + "":"" + client_port +
+                               "" has different version ("" +
+                               Version.printVersionId(version, Version.version_id.length) +
+                               "") from ours ("" + Version.printVersionId(Version.version_id) +
+                               ""). This may cause problems"");
+                }
+
+                // read the length of the address
+                len=in.readInt();
+
+                // finally read the address itself
+                buf=new byte[len];
+                in.readFully(buf, 0, len);
+                peer_addr=(Address)Util.objectFromByteBuffer(buf);                
+                updateLastAccessed();
+            }
+            return peer_addr;
+        }
+
+
+        /**
+         * Send the cookie first, then the our port number. If the cookie doesn't match the receiver's cookie,
+         * the receiver will reject the connection and close it.
+         */
+        void sendLocalAddress(Address local_addr) {
+            byte[] buf;
+
+            if(local_addr == null) {
+                Trace.warn(""ConnectionTable1_4.Connection.sendLocalAddress()"", ""local_addr is null"");
+                return;
+            }
+            if(out != null) {
+                try {
+                    buf=Util.objectToByteBuffer(local_addr);
+
+                    // write the cookie
+                    out.write(cookie, 0, cookie.length);
+
+                    // write the version
+                    out.write(Version.version_id, 0, Version.version_id.length);
+
+                    // write the length of the buffer
+                    out.writeInt(buf.length);
+
+                    // and finally write the buffer itself
+                    out.write(buf, 0, buf.length);
+                    out.flush(); // needed ?
+                    updateLastAccessed();
+                }
+                catch(Throwable t) {
+                    Trace.error(""ConnectionTable1_4.Connection.sendLocalAddress()"", ""exception is "" + t);
+                }
+            }
+        }
+
+
+        void initCookie(byte[] c) {
+            if(c != null)
+                for(int i=0; i < c.length; i++)
+                    c[i]=0;
+        }
+
+        boolean matchCookie(byte[] input) {
+            if(input == null || input.length < cookie.length) return false;
+            if(Trace.trace)
+                Trace.info(""ConnectionTable1_4.Connection.matchCookie()"", ""input_cookie is "" + printCookie(input));
+            for(int i=0; i < cookie.length; i++)
+                if(cookie[i] != input[i]) return false;
+            return true;
+        }
+
+
+        String printCookie(byte[] c) {
+            if(c == null) return """";
+            return new String(c);
+        }
+
+        public String toString() {
+            StringBuffer ret=new StringBuffer();
+            InetAddress local=null, remote=null;
+            String local_str, remote_str;
+
+            if(sock == null)
+                ret.append(""<null socket>"");
+            else {
+                //since the sock variable gets set to null we want to make
+                //make sure we make it through here without a nullpointer exception
+                Socket tmp_sock=sock;
+                local=tmp_sock.getLocalAddress();
+                remote=tmp_sock.getInetAddress();
+                local_str=local != null ? Util.shortName(local.getHostName()) : ""<null>"";
+                remote_str=remote != null ? Util.shortName(local.getHostName()) : ""<null>"";
+                ret.append(""<"" + local_str + "":"" + tmp_sock.getLocalPort() +
+                           "" --> "" + remote_str + "":"" + tmp_sock.getPort() + ""> ("" +
+                           ((System.currentTimeMillis() - last_access) / 1000) + "" secs old)"");
+                tmp_sock=null;
+            }
+
+            return ret.toString();
+        }
+
+
+        void closeSocket() {
+            if(sock != null) {
+                try {
+                    sock_ch.close();
+                }
+                catch(Exception e) {
+                	e.printStackTrace();
+                }
+                sock=null;
+            }
+        }
+        
+        NBMessageForm1_4 getNIOMsgReader()
+        {
+        	return nioMsgReader;
+        }
+    }
+
+
+    class Reaper implements Runnable {
+        Thread t=null;
+
+        Reaper() {
+            ;
+        }
+
+        public void start() {
+            if(conns.size() == 0)
+                return;
+            if(t != null && !t.isAlive())
+                t=null;
+            if(t == null) {
+                //RKU 7.4.2003, put in threadgroup
+                t=new Thread(thread_group, this, ""ConnectionTable1_4.ReaperThread"");
+                t.setDaemon(true); // will allow us to terminate if all remaining threads are daemons
+                t.start();
+            }
+        }
+
+        public void stop() {
+            if(t != null)
+                t=null;
+        }
+
+
+        public boolean isRunning() {
+            return t != null;
+        }
+
+        public void run() {
+            Connection value;
+            Map.Entry entry;
+            long curr_time;
+
+            if(Trace.trace)
+                Trace.info(""ConnectionTable1_4.Reaper.run()"", ""connection reaper thread was started. Number of connections="" +
+                                                           conns.size() + "", reaper_interval="" + reaper_interval + "", conn_expire_time="" +
+                                                           conn_expire_time);
+
+            while(conns.size() > 0 && t != null) {
+                // first sleep
+                Util.sleep(reaper_interval);
+                synchronized(conns) {
+                    curr_time=System.currentTimeMillis();
+                    for(Iterator it=conns.entrySet().iterator(); it.hasNext();) {
+                        entry=(Map.Entry)it.next();
+                        value=(Connection)entry.getValue();
+                        if(Trace.trace)
+                            Trace.info(""ConnectionTable1_4.Reaper.run()"", ""connection is "" +
+                                                                       ((curr_time - value.last_access) / 1000) + "" seconds old (curr-time="" +
+                                                                       curr_time + "", last_access="" + value.last_access + "")"");
+                        if(value.last_access + conn_expire_time < curr_time) {
+                            if(Trace.trace)
+                                Trace.info(""ConnectionTable1_4.Reaper.run()"", ""connection "" + value +
+                                                                           "" has been idle for too long (conn_expire_time="" + conn_expire_time +
+                                                                           ""), will be removed"");
+
+                            value.destroy();
+                            it.remove();
+                        }
+                    }
+                }
+            }
+            if(Trace.trace)
+                Trace.info(""ConnectionTable1_4.Reaper.run()"", ""reaper terminated"");
+            t=null;
+        }
+    }    
+}
\ No newline at end of file
diff --git a/src/org/jgroups/blocks/NBMessageForm1_4.java b/src/org/jgroups/blocks/NBMessageForm1_4.java
new file mode 100644
index 00000000000..73559358a4c
--- /dev/null
+++ b/src/org/jgroups/blocks/NBMessageForm1_4.java
@@ -0,0 +1,76 @@
+// $Id: NBMessageForm1_4.java,v 1.1 2003/12/21 03:47:56 akbollu Exp $
+
+package org.jgroups.blocks;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+
+/**
+ * NBMessageForm - Message form for non-blocking message reads.
+ * @author akbollu
+ */
+public class NBMessageForm1_4
+{
+	ByteBuffer headerBuffer = null;
+	ByteBuffer dataBuffer = null;
+	static final int HEADER_SIZE = 4;
+	boolean isComplete = false;
+	int messageSize = 0;
+	boolean w_in_p = false;
+	SocketChannel channel = null;
+	
+	public NBMessageForm1_4(int dataBuffSize, SocketChannel ch)
+	{
+		headerBuffer = ByteBuffer.allocate(HEADER_SIZE);
+		dataBuffer = ByteBuffer.allocate(dataBuffSize);
+		channel = ch;
+	}
+	
+	public ByteBuffer readCompleteMsgBuffer() throws IOException
+	{
+		if (!w_in_p)
+		{
+			int rt = channel.read(headerBuffer);
+			if ( (rt == 0) || (rt == -1) )
+			{
+				channel.close();
+				return null;
+			}
+			if (rt == HEADER_SIZE)
+			{
+				headerBuffer.flip();
+				messageSize = headerBuffer.getInt();
+				if(dataBuffer.capacity() < messageSize)
+				{
+					dataBuffer = ByteBuffer.allocate(messageSize);
+				}
+				w_in_p = true;
+			}
+		}
+		else
+		{
+			//rt == 0 need not be checked twice in the same event
+			channel.read(dataBuffer);
+			if(isComplete())
+			{	
+				dataBuffer.flip();
+				return dataBuffer;
+			}
+		}
+		return null;
+	}
+	
+	public void reset()
+	{
+		dataBuffer.clear();
+		headerBuffer.clear();
+		messageSize = 0;
+		w_in_p = false;
+	}
+	
+	private boolean isComplete()
+	{
+		return ( dataBuffer.position() == messageSize );
+	}	
+}"
566090b5a7d4f50ac29e07c935fec79495458c24,tapiji,"Adapts the translator for using the messages editor.

",a,https://github.com/tapiji/tapiji,"diff --git a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/MessagesBundleGroup.java b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/MessagesBundleGroup.java
index f462d1c7..ccd353fd 100644
--- a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/MessagesBundleGroup.java
+++ b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/MessagesBundleGroup.java
@@ -32,490 +32,545 @@
 
 /**
  * Grouping of all messages bundle of the same kind.
+ * 
  * @author Pascal Essiembre (pascal@essiembre.com)
  */
-public class MessagesBundleGroup extends AbstractMessageModel implements IMessagesBundleGroup {
+public class MessagesBundleGroup extends AbstractMessageModel implements
+	IMessagesBundleGroup {
 
-	private String projectName;
-	
-    private static final IMessagesBundleGroupListener[]
-            EMPTY_GROUP_LISTENERS = new IMessagesBundleGroupListener[] {};
+    private String projectName;
+
+    private static final IMessagesBundleGroupListener[] EMPTY_GROUP_LISTENERS = new IMessagesBundleGroupListener[] {};
     private static final Message[] EMPTY_MESSAGES = new Message[] {};
-    
-    public static final String PROPERTY_MESSAGES_BUNDLE_COUNT =
-            ""messagesBundleCount""; //$NON-NLS-1$
-    public static final String PROPERTY_KEY_COUNT =
-        ""keyCount""; //$NON-NLS-1$
+
+    public static final String PROPERTY_MESSAGES_BUNDLE_COUNT = ""messagesBundleCount""; //$NON-NLS-1$
+    public static final String PROPERTY_KEY_COUNT = ""keyCount""; //$NON-NLS-1$
 
     /** For serialization. */
     private static final long serialVersionUID = -1977849534191384324L;
     /** Bundles forming the group (key=Locale; value=MessagesBundle). */
     private final Map<Locale, IMessagesBundle> localeBundles = new HashMap<Locale, IMessagesBundle>();
-    private final Set<String> keys = new TreeSet<String>(); 
-    private final IMessagesBundleListener messagesBundleListener =
-            new MessagesBundleListener();
-    
+    private final Set<String> keys = new TreeSet<String>();
+    private final IMessagesBundleListener messagesBundleListener = new MessagesBundleListener();
+
     private final IMessagesBundleGroupStrategy groupStrategy;
     private static final Locale[] EMPTY_LOCALES = new Locale[] {};
     private final String name;
     private final String resourceBundleId;
-    
+
     /**
      * Creates a new messages bundle group.
-     * @param groupStrategy a IMessagesBundleGroupStrategy instance
+     * 
+     * @param groupStrategy
+     *            a IMessagesBundleGroupStrategy instance
      */
     public MessagesBundleGroup(IMessagesBundleGroupStrategy groupStrategy) {
-        super();
-        this.groupStrategy = groupStrategy;
-        this.name = groupStrategy.createMessagesBundleGroupName();
-        this.resourceBundleId = groupStrategy.createMessagesBundleId();
-        
-        this.projectName = groupStrategy.getProjectName();
-        
-        MessagesBundle[] bundles = groupStrategy.loadMessagesBundles();
-        if (bundles != null) {
-            for (int i = 0; i < bundles.length; i++) {
-                addMessagesBundle(bundles[i]);
-            }
-        }
-        
-        RBManager.getInstance(this.projectName).notifyMessagesBundleCreated(this);
-    }
-    
+	super();
+	this.groupStrategy = groupStrategy;
+	this.name = groupStrategy.createMessagesBundleGroupName();
+	this.resourceBundleId = groupStrategy.createMessagesBundleId();
+
+	this.projectName = groupStrategy.getProjectName();
+
+	MessagesBundle[] bundles = groupStrategy.loadMessagesBundles();
+	if (bundles != null) {
+	    for (int i = 0; i < bundles.length; i++) {
+		addMessagesBundle(bundles[i]);
+	    }
+	}
+
+	RBManager.getInstance(this.projectName).notifyMessagesBundleCreated(
+		this);
+    }
+
     /**
-     * Called before this object will be discarded.
-     * Disposes the underlying MessageBundles
+     * Called before this object will be discarded. Disposes the underlying
+     * MessageBundles
      */
+    @Override
     public void dispose() {
-    	for (IMessagesBundle mb : getMessagesBundles()) {
-    		try {
-    			mb.dispose();
-    		} catch (Throwable t) {
-    			//FIXME: remove debug:
-    			System.err.println(""Error disposing message-bundle "" +
-    					((MessagesBundle)mb).getResource().getResourceLocationLabel());
-    			//disregard crashes: this is a best effort to dispose things.
-    		}
-    	}
-    	
-    	RBManager.getInstance(this.projectName).notifyMessagesBundleDeleted(this);
-    }
-
-    
+	for (IMessagesBundle mb : getMessagesBundles()) {
+	    try {
+		mb.dispose();
+	    } catch (Throwable t) {
+		// FIXME: remove debug:
+		System.err.println(""Error disposing message-bundle ""
+			+ ((MessagesBundle) mb).getResource()
+				.getResourceLocationLabel());
+		// disregard crashes: this is a best effort to dispose things.
+	    }
+	}
+
+	RBManager.getInstance(this.projectName).notifyMessagesBundleDeleted(
+		this);
+    }
+
     /**
      * Gets the messages bundle matching given locale.
-     * @param locale locale of bundle to retreive
+     * 
+     * @param locale
+     *            locale of bundle to retreive
      * @return a bundle
      */
+    @Override
     public IMessagesBundle getMessagesBundle(Locale locale) {
-        return localeBundles.get(locale);
+	return localeBundles.get(locale);
     }
 
     /**
-     * Gets the messages bundle matching given source object.  A source
-     * object being a context-specific concrete underlying implementation of a
+     * Gets the messages bundle matching given source object. A source object
+     * being a context-specific concrete underlying implementation of a
      * <code>MessagesBundle</code> as per defined in
-	 * <code>IMessageResource</code>.
-     * @param source the source object to match
+     * <code>IMessageResource</code>.
+     * 
+     * @param source
+     *            the source object to match
      * @return a messages bundle
      * @see IMessagesResource
      */
     public MessagesBundle getMessagesBundle(Object source) {
-    	for (IMessagesBundle messagesBundle : getMessagesBundles()) {
-            if (equals(source, ((MessagesBundle)messagesBundle).getResource().getSource())) {
-                return (MessagesBundle) messagesBundle;
-            }
-        }
-        return null;
-    }
-    
+	for (IMessagesBundle messagesBundle : getMessagesBundles()) {
+	    if (equals(source, ((MessagesBundle) messagesBundle).getResource()
+		    .getSource())) {
+		return (MessagesBundle) messagesBundle;
+	    }
+	}
+	return null;
+    }
+
     /**
-     * Adds an empty <code>MessagesBundle</code> to this group for the
-     * given locale.
-     * @param locale locale for the new bundle added
+     * Adds an empty <code>MessagesBundle</code> to this group for the given
+     * locale.
+     * 
+     * @param locale
+     *            locale for the new bundle added
      */
     public void addMessagesBundle(Locale locale) {
-        addMessagesBundle(groupStrategy.createMessagesBundle(locale));
+	addMessagesBundle(groupStrategy.createMessagesBundle(locale));
     }
 
     /**
      * Gets all locales making up this messages bundle group.
      */
     public Locale[] getLocales() {
-        return localeBundles.keySet().toArray(EMPTY_LOCALES);
+	return localeBundles.keySet().toArray(EMPTY_LOCALES);
     }
 
     /**
      * Gets all messages associated with the given message key.
-     * @param key a message key
+     * 
+     * @param key
+     *            a message key
      * @return messages
      */
+    @Override
     public IMessage[] getMessages(String key) {
-        List<IMessage> messages = new ArrayList<IMessage>();
-    	for (IMessagesBundle messagesBundle : getMessagesBundles()) {
-            IMessage message = messagesBundle.getMessage(key);
-            if (message != null) {
-                messages.add(message);
-            }
-        }
-        return messages.toArray(EMPTY_MESSAGES);
+	List<IMessage> messages = new ArrayList<IMessage>();
+	for (IMessagesBundle messagesBundle : getMessagesBundles()) {
+	    IMessage message = messagesBundle.getMessage(key);
+	    if (message != null) {
+		messages.add(message);
+	    }
+	}
+	return messages.toArray(EMPTY_MESSAGES);
     }
 
     /**
      * Gets the message matching given key and locale.
-     * @param locale locale for which to retrieve the message
-     * @param key key matching entry to retrieve the message
+     * 
+     * @param locale
+     *            locale for which to retrieve the message
+     * @param key
+     *            key matching entry to retrieve the message
      * @return a message
      */
+    @Override
     public IMessage getMessage(String key, Locale locale) {
-        IMessagesBundle messagesBundle = getMessagesBundle(locale);
-        if (messagesBundle != null) {
-            return messagesBundle.getMessage(key);
-        }
-        return null;
+	IMessagesBundle messagesBundle = getMessagesBundle(locale);
+	if (messagesBundle != null) {
+	    return messagesBundle.getMessage(key);
+	}
+	return null;
     }
 
-    
     /**
      * Adds a messages bundle to this group.
-     * @param messagesBundle bundle to add
-     * @throws MessageException if a messages bundle for the same locale
-     *         already exists.
+     * 
+     * @param messagesBundle
+     *            bundle to add
+     * @throws MessageException
+     *             if a messages bundle for the same locale already exists.
      */
     public void addMessagesBundle(IMessagesBundle messagesBundle) {
-        addMessagesBundle(messagesBundle.getLocale(), messagesBundle);
+	addMessagesBundle(messagesBundle.getLocale(), messagesBundle);
     }
-    
+
+    @Override
     public void addMessagesBundle(Locale locale, IMessagesBundle messagesBundle) {
-        MessagesBundle mb = (MessagesBundle) messagesBundle;
-        if (localeBundles.get(mb.getLocale()) != null) {
-            throw new MessageException(
-                 ""A bundle with the same locale already exists.""); //$NON-NLS-1$
-        }
-        
-        int oldBundleCount = localeBundles.size();
-        localeBundles.put(mb.getLocale(), mb);
-        
-        firePropertyChange(PROPERTY_MESSAGES_BUNDLE_COUNT,
-                oldBundleCount, localeBundles.size());
-        fireMessagesBundleAdded(mb);
-        
-        String[] bundleKeys = mb.getKeys();
-        for (int i = 0; i < bundleKeys.length; i++) {
-            String key = bundleKeys[i];
-            if (!keys.contains(key)) {
-                int oldKeyCount = keys.size();
-                keys.add(key);
-                firePropertyChange(
-                        PROPERTY_KEY_COUNT, oldKeyCount, keys.size());
-                fireKeyAdded(key);
-            }
-        }
-        mb.addMessagesBundleListener(messagesBundleListener);
-        
-    }
-    
+	MessagesBundle mb = (MessagesBundle) messagesBundle;
+	if (localeBundles.get(mb.getLocale()) != null) {
+	    throw new MessageException(
+		    ""A bundle with the same locale already exists.""); //$NON-NLS-1$
+	}
+
+	int oldBundleCount = localeBundles.size();
+	localeBundles.put(mb.getLocale(), mb);
+
+	firePropertyChange(PROPERTY_MESSAGES_BUNDLE_COUNT, oldBundleCount,
+		localeBundles.size());
+	fireMessagesBundleAdded(mb);
+
+	String[] bundleKeys = mb.getKeys();
+	for (int i = 0; i < bundleKeys.length; i++) {
+	    String key = bundleKeys[i];
+	    if (!keys.contains(key)) {
+		int oldKeyCount = keys.size();
+		keys.add(key);
+		firePropertyChange(PROPERTY_KEY_COUNT, oldKeyCount, keys.size());
+		fireKeyAdded(key);
+	    }
+	}
+	mb.addMessagesBundleListener(messagesBundleListener);
+
+    }
+
+    @Override
     public void removeMessagesBundle(IMessagesBundle messagesBundle) {
-    	Locale locale = messagesBundle.getLocale();
-    	
-    	if (localeBundles.containsKey(locale)) {
-    		localeBundles.remove(locale);
-    	}
-    	
-    	// which keys should I not remove?
-    	Set<String> keysNotToRemove = new TreeSet<String>();
-    	
-    	for (String key : messagesBundle.getKeys()) {
-    		for (IMessagesBundle bundle : localeBundles.values()) {
-    			if (bundle.getMessage(key) != null) {
-    				keysNotToRemove.add(key);
-    			}
-    		}
-    	}
-    	
-    	// remove keys
-    	for (String keyToRemove : messagesBundle.getKeys()) {
-    		if (!keysNotToRemove.contains(keyToRemove)) { // we can remove
-    			keys.remove(keyToRemove);
-    		}
-    	}
-    }
-    
+	Locale locale = messagesBundle.getLocale();
+
+	if (localeBundles.containsKey(locale)) {
+	    localeBundles.remove(locale);
+	}
+
+	// which keys should I not remove?
+	Set<String> keysNotToRemove = new TreeSet<String>();
+
+	for (String key : messagesBundle.getKeys()) {
+	    for (IMessagesBundle bundle : localeBundles.values()) {
+		if (bundle.getMessage(key) != null) {
+		    keysNotToRemove.add(key);
+		}
+	    }
+	}
+
+	// remove keys
+	for (String keyToRemove : messagesBundle.getKeys()) {
+	    if (!keysNotToRemove.contains(keyToRemove)) { // we can remove
+		keys.remove(keyToRemove);
+	    }
+	}
+    }
+
     /**
      * Gets this messages bundle group name.
+     * 
      * @return bundle group name
      */
+    @Override
     public String getName() {
-        return name;
+	return name;
     }
-    
+
     /**
      * Adds an empty message to every messages bundle of this group with the
      * given.
-     * @param key message key
+     * 
+     * @param key
+     *            message key
      */
+    @Override
     public void addMessages(String key) {
-        for (IMessagesBundle msgBundle : localeBundles.values()) {
-           	((MessagesBundle)msgBundle).addMessage(key);
-        }
+	for (IMessagesBundle msgBundle : localeBundles.values()) {
+	    ((MessagesBundle) msgBundle).addMessage(key);
+	}
     }
 
     /**
      * Renames a key in all messages bundles forming this group.
-     * @param sourceKey the message key to rename
-     * @param targetKey the new message name
+     * 
+     * @param sourceKey
+     *            the message key to rename
+     * @param targetKey
+     *            the new message name
      */
     public void renameMessageKeys(String sourceKey, String targetKey) {
-        for (IMessagesBundle msgBundle : localeBundles.values()) {
-        	msgBundle.renameMessageKey(
-            		sourceKey, targetKey);
-        }
-    }    
+	for (IMessagesBundle msgBundle : localeBundles.values()) {
+	    msgBundle.renameMessageKey(sourceKey, targetKey);
+	}
+    }
 
     /**
      * Removes messages matching the given key from all messages bundle.
-     * @param key key of messages to remove
+     * 
+     * @param key
+     *            key of messages to remove
      */
+    @Override
     public void removeMessages(String key) {
-        for (IMessagesBundle msgBundle : localeBundles.values()) {
-        	msgBundle.removeMessage(key);
-        }
+	for (IMessagesBundle msgBundle : localeBundles.values()) {
+	    msgBundle.removeMessage(key);
+	}
     }
-    
+
     /**
-     * Removes messages matching the given key from all messages bundle and add it's parent key to bundles.
-     * @param key key of messages to remove
+     * Removes messages matching the given key from all messages bundle and add
+     * it's parent key to bundles.
+     * 
+     * @param key
+     *            key of messages to remove
      */
+    @Override
     public void removeMessagesAddParentKey(String key) {
-        for (IMessagesBundle msgBundle : localeBundles.values()) {
-        	msgBundle.removeMessageAddParentKey(key);
-        }
+	for (IMessagesBundle msgBundle : localeBundles.values()) {
+	    msgBundle.removeMessageAddParentKey(key);
+	}
     }
-    
+
     /**
      * Sets whether messages matching the <code>key</code> are active or not.
-     * @param key key of messages
+     * 
+     * @param key
+     *            key of messages
      */
     public void setMessagesActive(String key, boolean active) {
-        for (IMessagesBundle msgBundle : localeBundles.values()) {
-            IMessage entry = msgBundle.getMessage(key);
-            if (entry != null) {
-                entry.setActive(active);
-            }
-        }
-    }
-    
+	for (IMessagesBundle msgBundle : localeBundles.values()) {
+	    IMessage entry = msgBundle.getMessage(key);
+	    if (entry != null) {
+		entry.setActive(active);
+	    }
+	}
+    }
+
     /**
-     * Duplicates each messages matching the <code>sourceKey</code> to
-     * the <code>newKey</code>.
-     * @param sourceKey original key
-     * @param targetKey new key
-     * @throws MessageException if a target key already exists
+     * Duplicates each messages matching the <code>sourceKey</code> to the
+     * <code>newKey</code>.
+     * 
+     * @param sourceKey
+     *            original key
+     * @param targetKey
+     *            new key
+     * @throws MessageException
+     *             if a target key already exists
      */
     public void duplicateMessages(String sourceKey, String targetKey) {
-        if (sourceKey.equals(targetKey)) {
-            return;
-        }
-        for (IMessagesBundle msgBundle : localeBundles.values()) {
-        	msgBundle.duplicateMessage(
-            		sourceKey, targetKey);
-        }
-    }
-    
+	if (sourceKey.equals(targetKey)) {
+	    return;
+	}
+	for (IMessagesBundle msgBundle : localeBundles.values()) {
+	    msgBundle.duplicateMessage(sourceKey, targetKey);
+	}
+    }
+
     /**
      * Returns a collection of all bundles in this group.
+     * 
      * @return the bundles in this group
      */
+    @Override
     public Collection<IMessagesBundle> getMessagesBundles() {
-        return localeBundles.values();
+	return localeBundles.values();
     }
-    
+
     /**
      * Gets all keys from all messages bundles.
+     * 
      * @return all keys from all messages bundles
      */
+    @Override
     public String[] getMessageKeys() {
-        return keys.toArray(BabelUtils.EMPTY_STRINGS);
+	return keys.toArray(BabelUtils.EMPTY_STRINGS);
     }
-    
+
     /**
      * Whether the given key is found in this messages bundle group.
-     * @param key the key to find
+     * 
+     * @param key
+     *            the key to find
      * @return <code>true</code> if the key exists in this bundle group.
      */
+    @Override
     public boolean isMessageKey(String key) {
-        return keys.contains(key);
+	return keys.contains(key);
     }
-    
+
     /**
      * Gets the number of messages bundles in this group.
+     * 
      * @return the number of messages bundles in this group
      */
+    @Override
     public int getMessagesBundleCount() {
-        return localeBundles.size();
+	return localeBundles.size();
     }
-    
+
     /**
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof MessagesBundleGroup)) {
-            return false;
-        }
-        MessagesBundleGroup messagesBundleGroup = (MessagesBundleGroup) obj;
-        return equals(localeBundles, messagesBundleGroup.localeBundles);
-    }    
-    
+	if (!(obj instanceof MessagesBundleGroup)) {
+	    return false;
+	}
+	MessagesBundleGroup messagesBundleGroup = (MessagesBundleGroup) obj;
+	return equals(localeBundles, messagesBundleGroup.localeBundles);
+    }
+
     public final synchronized void addMessagesBundleGroupListener(
-            final IMessagesBundleGroupListener listener) {
-        addPropertyChangeListener(listener);
+	    final IMessagesBundleGroupListener listener) {
+	addPropertyChangeListener(listener);
     }
+
     public final synchronized void removeMessagesBundleGroupListener(
-            final IMessagesBundleGroupListener listener) {
-        removePropertyChangeListener(listener);
-    }
-    public final synchronized IMessagesBundleGroupListener[] 
-                getMessagesBundleGroupListeners() {
-        //TODO find more efficient way to avoid class cast.
-        return Arrays.asList(
-                getPropertyChangeListeners()).toArray(
-                        EMPTY_GROUP_LISTENERS);
-    }
-    
-    
+	    final IMessagesBundleGroupListener listener) {
+	removePropertyChangeListener(listener);
+    }
+
+    public final synchronized IMessagesBundleGroupListener[] getMessagesBundleGroupListeners() {
+	// TODO find more efficient way to avoid class cast.
+	return Arrays.asList(getPropertyChangeListeners()).toArray(
+		EMPTY_GROUP_LISTENERS);
+    }
+
     private void fireKeyAdded(String key) {
-        IMessagesBundleGroupListener[] listeners =
-                getMessagesBundleGroupListeners();
-        for (int i = 0; i < listeners.length; i++) {
-            IMessagesBundleGroupListener listener = listeners[i];
-            listener.keyAdded(key);
-        }
+	IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	for (int i = 0; i < listeners.length; i++) {
+	    IMessagesBundleGroupListener listener = listeners[i];
+	    listener.keyAdded(key);
+	}
     }
+
     private void fireKeyRemoved(String key) {
-        IMessagesBundleGroupListener[] listeners =
-                getMessagesBundleGroupListeners();
-        for (int i = 0; i < listeners.length; i++) {
-            IMessagesBundleGroupListener listener = listeners[i];
-            listener.keyRemoved(key);
-        }
+	IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	for (int i = 0; i < listeners.length; i++) {
+	    IMessagesBundleGroupListener listener = listeners[i];
+	    listener.keyRemoved(key);
+	}
     }
+
     private void fireMessagesBundleAdded(MessagesBundle messagesBundle) {
-        IMessagesBundleGroupListener[] listeners =
-                getMessagesBundleGroupListeners();
-        for (int i = 0; i < listeners.length; i++) {
-            IMessagesBundleGroupListener listener = listeners[i];
-            listener.messagesBundleAdded(messagesBundle);
-        }
+	IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	for (int i = 0; i < listeners.length; i++) {
+	    IMessagesBundleGroupListener listener = listeners[i];
+	    listener.messagesBundleAdded(messagesBundle);
+	}
     }
+
     private void fireMessagesBundleRemoved(MessagesBundle messagesBundle) {
-        IMessagesBundleGroupListener[] listeners =
-                getMessagesBundleGroupListeners();
-        for (int i = 0; i < listeners.length; i++) {
-            IMessagesBundleGroupListener listener = listeners[i];
-            listener.messagesBundleRemoved(messagesBundle);
-        }
-    }
-    
+	IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	for (int i = 0; i < listeners.length; i++) {
+	    IMessagesBundleGroupListener listener = listeners[i];
+	    listener.messagesBundleRemoved(messagesBundle);
+	}
+    }
+
     /**
      * Returns true if the supplied key is already existing in this group.
      * 
-     * @param key   The key that shall be tested.
+     * @param key
+     *            The key that shall be tested.
      * 
-     * @return  true <=> The key is already existing.
+     * @return true <=> The key is already existing.
      */
+    @Override
     public boolean containsKey(String key) {
-        for (Locale locale : localeBundles.keySet()) {
-            IMessagesBundle messagesBundle = localeBundles.get(locale);
-            for (String k : messagesBundle.getKeys()) {
-                if (k.equals(key)) {
-                    return true;
-                } else {
-                    continue;
-                }
-            }
-        }
-        return false;
-    }
-    
+	for (Locale locale : localeBundles.keySet()) {
+	    IMessagesBundle messagesBundle = localeBundles.get(locale);
+	    for (String k : messagesBundle.getKeys()) {
+		if (k.equals(key)) {
+		    return true;
+		} else {
+		    continue;
+		}
+	    }
+	}
+	return false;
+    }
+
     /**
      * Is the given key found in this bundle group.
-     * @param key the key to find
+     * 
+     * @param key
+     *            the key to find
      * @return <code>true</code> if the key exists in this bundle group.
      */
+    @Override
     public boolean isKey(String key) {
-        return keys.contains(key);
+	return keys.contains(key);
     }
-    
-    
-    
+
+    @Override
     public String getResourceBundleId() {
-		return resourceBundleId;
-	}
+	return resourceBundleId;
+    }
 
+    @Override
     public String getProjectName() {
-    	return this.projectName;
+	return this.projectName;
     }
 
-	/**
-     * Class listening for changes in underlying messages bundle and 
-     * relays them to the listeners for MessagesBundleGroup.
+    /**
+     * Class listening for changes in underlying messages bundle and relays them
+     * to the listeners for MessagesBundleGroup.
      */
     private class MessagesBundleListener implements IMessagesBundleListener {
-        public void messageAdded(MessagesBundle messagesBundle,
-                Message message) {
-            int oldCount = keys.size();
-            IMessagesBundleGroupListener[] listeners =
-                    getMessagesBundleGroupListeners();
-            for (int i = 0; i < listeners.length; i++) {
-                IMessagesBundleGroupListener listener = listeners[i];
-                listener.messageAdded(messagesBundle, message);
-                if (getMessages(message.getKey()).length == 1) {
-                    keys.add(message.getKey());
-                    firePropertyChange(
-                            PROPERTY_KEY_COUNT, oldCount, keys.size());
-                    fireKeyAdded(message.getKey());
-                }
-            }
-        }
-        public void messageRemoved(MessagesBundle messagesBundle,
-                Message message) {
-            int oldCount = keys.size();
-            IMessagesBundleGroupListener[] listeners =
-                    getMessagesBundleGroupListeners();
-            for (int i = 0; i < listeners.length; i++) {
-                IMessagesBundleGroupListener listener = listeners[i];
-                listener.messageRemoved(messagesBundle, message);
-                int keyMessagesCount = getMessages(message.getKey()).length;
-                if (keyMessagesCount == 0 && keys.contains(message.getKey())) {
-                    keys.remove(message.getKey());
-                    firePropertyChange(
-                            PROPERTY_KEY_COUNT, oldCount, keys.size());
-                    fireKeyRemoved(message.getKey());
-                }
-            }
-        }
-        public void messageChanged(MessagesBundle messagesBundle,
-                PropertyChangeEvent changeEvent) {
-            IMessagesBundleGroupListener[] listeners =
-                    getMessagesBundleGroupListeners();
-            for (int i = 0; i < listeners.length; i++) {
-                IMessagesBundleGroupListener listener = listeners[i];
-                listener.messageChanged(messagesBundle, changeEvent);
-            }
-        }
-        // MessagesBundle property changes:
-        public void propertyChange(PropertyChangeEvent evt) {
-            MessagesBundle bundle = (MessagesBundle) evt.getSource();
-            IMessagesBundleGroupListener[] listeners =
-                    getMessagesBundleGroupListeners();
-            for (int i = 0; i < listeners.length; i++) {
-                IMessagesBundleGroupListener listener = listeners[i];
-                listener.messagesBundleChanged(bundle, evt);
-            }
-        }
-    }
-
-	public boolean hasPropertiesFileGroupStrategy() {
-		return groupStrategy instanceof PropertiesFileGroupStrategy;
+	@Override
+	public void messageAdded(MessagesBundle messagesBundle, Message message) {
+	    int oldCount = keys.size();
+	    IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	    for (int i = 0; i < listeners.length; i++) {
+		IMessagesBundleGroupListener listener = listeners[i];
+		listener.messageAdded(messagesBundle, message);
+		if (getMessages(message.getKey()).length == 1) {
+		    keys.add(message.getKey());
+		    firePropertyChange(PROPERTY_KEY_COUNT, oldCount,
+			    keys.size());
+		    fireKeyAdded(message.getKey());
+		}
+	    }
 	}
+
+	@Override
+	public void messageRemoved(MessagesBundle messagesBundle,
+		Message message) {
+	    int oldCount = keys.size();
+	    IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	    for (int i = 0; i < listeners.length; i++) {
+		IMessagesBundleGroupListener listener = listeners[i];
+		listener.messageRemoved(messagesBundle, message);
+		int keyMessagesCount = getMessages(message.getKey()).length;
+		if (keyMessagesCount == 0 && keys.contains(message.getKey())) {
+		    keys.remove(message.getKey());
+		    firePropertyChange(PROPERTY_KEY_COUNT, oldCount,
+			    keys.size());
+		    fireKeyRemoved(message.getKey());
+		}
+	    }
+	}
+
+	@Override
+	public void messageChanged(MessagesBundle messagesBundle,
+		PropertyChangeEvent changeEvent) {
+	    IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	    for (int i = 0; i < listeners.length; i++) {
+		IMessagesBundleGroupListener listener = listeners[i];
+		listener.messageChanged(messagesBundle, changeEvent);
+	    }
+	}
+
+	// MessagesBundle property changes:
+	@Override
+	public void propertyChange(PropertyChangeEvent evt) {
+	    MessagesBundle bundle = (MessagesBundle) evt.getSource();
+	    IMessagesBundleGroupListener[] listeners = getMessagesBundleGroupListeners();
+	    for (int i = 0; i < listeners.length; i++) {
+		IMessagesBundleGroupListener listener = listeners[i];
+		listener.messagesBundleChanged(bundle, evt);
+	    }
+	}
+    }
+
+    @Override
+    public boolean hasPropertiesFileGroupStrategy() {
+	return groupStrategy instanceof PropertiesFileGroupStrategy;
+    }
 }
diff --git a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/manager/RBManager.java b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/manager/RBManager.java
index ac73c955..7cbdd068 100644
--- a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/manager/RBManager.java
+++ b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/manager/RBManager.java
@@ -36,401 +36,453 @@
  */
 public class RBManager {
 
-	private static Map<IProject, RBManager> managerMap = new HashMap<IProject, RBManager>();
-	
-	private Map<String, IMessagesBundleGroup> resourceBundles;
-
-	private static RBManager INSTANCE;
-	
-	private List<IMessagesEditorListener> editorListeners;
-	
-	private IProject project;
-	
-	private RBManager() {
-		resourceBundles = new HashMap<String, IMessagesBundleGroup>();
-		editorListeners = new ArrayList<IMessagesEditorListener>(3);
-	}
-	
-	public IMessagesBundleGroup getMessagesBundleGroup(String name) {
-		if (!resourceBundles.containsKey(name)) {
-			System.out.println(""ohje""); // TODO log
-			return null;
-		} else {
-			return resourceBundles.get(name);
-		}
+    private static Map<IProject, RBManager> managerMap = new HashMap<IProject, RBManager>();
+
+    private Map<String, IMessagesBundleGroup> resourceBundles;
+
+    private static RBManager INSTANCE;
+
+    private List<IMessagesEditorListener> editorListeners;
+
+    private IProject project;
+
+    private RBManager() {
+	resourceBundles = new HashMap<String, IMessagesBundleGroup>();
+	editorListeners = new ArrayList<IMessagesEditorListener>(3);
+    }
+
+    public IMessagesBundleGroup getMessagesBundleGroup(String name) {
+	if (!resourceBundles.containsKey(name)) {
+	    System.out.println(""ohje""); // TODO log
+	    return null;
+	} else {
+	    return resourceBundles.get(name);
 	}
-	
-	public List<String> getMessagesBundleGroupNames() {
-		Set<String> keySet = resourceBundles.keySet();
-		List<String> bundleGroupNames = new ArrayList<String>();
-	
-		for (String key : keySet) {
-			bundleGroupNames.add(project.getName() + ""/"" + key);
-		}
-		return bundleGroupNames;
+    }
+
+    public List<String> getMessagesBundleGroupNames() {
+	Set<String> keySet = resourceBundles.keySet();
+	List<String> bundleGroupNames = new ArrayList<String>();
+
+	for (String key : keySet) {
+	    bundleGroupNames.add(project.getName() + ""/"" + key);
 	}
-	
-	public static List<String> getAllMessagesBundleGroupNames() {
-		Set<IProject> projects = getAllSupportedProjects();
-		List<String> bundleGroupNames = new ArrayList<String>();
-		
-		for (IProject project : projects) {
-			RBManager manager = getInstance(project);
-			bundleGroupNames.addAll(manager.getMessagesBundleGroupNames());
-		}		
-		return bundleGroupNames;
+	return bundleGroupNames;
+    }
+
+    public static List<String> getAllMessagesBundleGroupNames() {
+	Set<IProject> projects = getAllSupportedProjects();
+	List<String> bundleGroupNames = new ArrayList<String>();
+
+	for (IProject project : projects) {
+	    RBManager manager = getInstance(project);
+	    bundleGroupNames.addAll(manager.getMessagesBundleGroupNames());
 	}
-	
-	/**
-	 * Hier darf nur BABEL rein
-	 * @param bundleGroup
-	 */
-	public void notifyMessagesBundleCreated(IMessagesBundleGroup bundleGroup) {
-		if (resourceBundles.containsKey(bundleGroup.getResourceBundleId())) {
-			IMessagesBundleGroup oldbundleGroup = resourceBundles.get(bundleGroup.getResourceBundleId());
-			if (!equalHash(oldbundleGroup, bundleGroup)) {
-				boolean oldHasPropertiesStrategy = oldbundleGroup.hasPropertiesFileGroupStrategy();
-				boolean newHasPropertiesStrategy = bundleGroup.hasPropertiesFileGroupStrategy();
-				
-				// in this case, the old one is only writing to the property file, not the editor
-				// we have to sync them and store the bundle with the editor as resource
-				if (oldHasPropertiesStrategy && !newHasPropertiesStrategy) {
-					
-					syncBundles(bundleGroup, oldbundleGroup);
-					resourceBundles.put(bundleGroup.getResourceBundleId(), bundleGroup);
-					
-					oldbundleGroup.dispose();
-					
-				} else if ( (oldHasPropertiesStrategy && newHasPropertiesStrategy)
-							|| (!oldHasPropertiesStrategy && !newHasPropertiesStrategy) ) {
-					
-//					syncBundles(oldbundleGroup, bundleGroup); do not need that, because we take the new one
-					// and we do that, because otherwise we cache old Text-Editor instances, which we
-					// do not need -> read only phenomenon
-					resourceBundles.put(bundleGroup.getResourceBundleId(), bundleGroup);
-					
-					oldbundleGroup.dispose();
-				} else {
-					// in this case our old resource has an EditorSite, but not the new one
-					bundleGroup.dispose();
-				}
-			}
+	return bundleGroupNames;
+    }
+
+    /**
+     * Hier darf nur BABEL rein
+     * 
+     * @param bundleGroup
+     */
+    public void notifyMessagesBundleCreated(IMessagesBundleGroup bundleGroup) {
+	if (resourceBundles.containsKey(bundleGroup.getResourceBundleId())) {
+	    IMessagesBundleGroup oldbundleGroup = resourceBundles
+		    .get(bundleGroup.getResourceBundleId());
+	    if (!equalHash(oldbundleGroup, bundleGroup)) {
+		boolean oldHasPropertiesStrategy = oldbundleGroup
+			.hasPropertiesFileGroupStrategy();
+		boolean newHasPropertiesStrategy = bundleGroup
+			.hasPropertiesFileGroupStrategy();
+
+		// in this case, the old one is only writing to the property
+		// file, not the editor
+		// we have to sync them and store the bundle with the editor as
+		// resource
+		if (oldHasPropertiesStrategy && !newHasPropertiesStrategy) {
+
+		    syncBundles(bundleGroup, oldbundleGroup);
+		    resourceBundles.put(bundleGroup.getResourceBundleId(),
+			    bundleGroup);
+
+		    oldbundleGroup.dispose();
+
+		} else if ((oldHasPropertiesStrategy && newHasPropertiesStrategy)
+			|| (!oldHasPropertiesStrategy && !newHasPropertiesStrategy)) {
+
+		    // syncBundles(oldbundleGroup, bundleGroup); do not need
+		    // that, because we take the new one
+		    // and we do that, because otherwise we cache old
+		    // Text-Editor instances, which we
+		    // do not need -> read only phenomenon
+		    resourceBundles.put(bundleGroup.getResourceBundleId(),
+			    bundleGroup);
+
+		    oldbundleGroup.dispose();
 		} else {
-			resourceBundles.put(bundleGroup.getResourceBundleId(), bundleGroup);
+		    // in this case our old resource has an EditorSite, but not
+		    // the new one
+		    bundleGroup.dispose();
 		}
+	    }
+	} else {
+	    resourceBundles.put(bundleGroup.getResourceBundleId(), bundleGroup);
 	}
-	
-	/**
-	 * Hier darf nur BABEL rein
-	 * @param bundleGroup
-	 */
-	public void notifyMessagesBundleDeleted(IMessagesBundleGroup bundleGroup) {
-		if (resourceBundles.containsKey(bundleGroup.getResourceBundleId())) {
-			if (equalHash(resourceBundles.get(bundleGroup.getResourceBundleId()), bundleGroup)) {
-				resourceBundles.remove(bundleGroup.getResourceBundleId());
-				System.out.println(bundleGroup.getResourceBundleId() + "" deleted!"");
-			}
-		} 
-	}
-	
-	public void notifyResourceRemoved(IResource resourceBundle) {
-		//String parentName = resourceBundle.getParent().getName();
-		//String resourceBundleId = parentName + ""."" + getResourceBundleName(resourceBundle);
-		String resourceBundleId = PropertiesFileGroupStrategy.getResourceBundleId(resourceBundle);
-		IMessagesBundleGroup bundleGroup = resourceBundles.get(resourceBundleId);
-		if (bundleGroup != null) {
-			Locale locale = getLocaleByName(getResourceBundleName(resourceBundle), resourceBundle.getName());
-			IMessagesBundle messagesBundle = bundleGroup.getMessagesBundle(locale);
-			if (messagesBundle != null) {
-				bundleGroup.removeMessagesBundle(messagesBundle);
-			}
-			if (bundleGroup.getMessagesBundleCount() == 0) {
-				notifyMessagesBundleDeleted(bundleGroup);
-			}
-		}
-		
-		// TODO: maybe save and reinit the editor?
+    }
 
+    /**
+     * Hier darf nur BABEL rein
+     * 
+     * @param bundleGroup
+     */
+    public void notifyMessagesBundleDeleted(IMessagesBundleGroup bundleGroup) {
+	if (resourceBundles.containsKey(bundleGroup.getResourceBundleId())) {
+	    if (equalHash(
+		    resourceBundles.get(bundleGroup.getResourceBundleId()),
+		    bundleGroup)) {
+		resourceBundles.remove(bundleGroup.getResourceBundleId());
+		System.out.println(bundleGroup.getResourceBundleId()
+			+ "" deleted!"");
+	    }
 	}
-	
-	/**
-	 * Weil der BABEL-Builder nicht richtig funkt (added 1 x und removed 2 x das GLEICHE!)
-	 * @param oldBundleGroup
-	 * @param newBundleGroup
-	 * @return
-	 */
-	private boolean equalHash(IMessagesBundleGroup oldBundleGroup, IMessagesBundleGroup newBundleGroup) {
-		int oldHashCode = oldBundleGroup.hashCode();
-		int newHashCode = newBundleGroup.hashCode();
-		return oldHashCode == newHashCode;
+    }
+
+    public void notifyResourceRemoved(IResource resourceBundle) {
+	// String parentName = resourceBundle.getParent().getName();
+	// String resourceBundleId = parentName + ""."" +
+	// getResourceBundleName(resourceBundle);
+	String resourceBundleId = PropertiesFileGroupStrategy
+		.getResourceBundleId(resourceBundle);
+	IMessagesBundleGroup bundleGroup = resourceBundles
+		.get(resourceBundleId);
+	if (bundleGroup != null) {
+	    Locale locale = getLocaleByName(
+		    getResourceBundleName(resourceBundle),
+		    resourceBundle.getName());
+	    IMessagesBundle messagesBundle = bundleGroup
+		    .getMessagesBundle(locale);
+	    if (messagesBundle != null) {
+		bundleGroup.removeMessagesBundle(messagesBundle);
+	    }
+	    if (bundleGroup.getMessagesBundleCount() == 0) {
+		notifyMessagesBundleDeleted(bundleGroup);
+	    }
 	}
-	
-	private void syncBundles(IMessagesBundleGroup oldBundleGroup, IMessagesBundleGroup newBundleGroup) {
-		List<IMessagesBundle> bundlesToRemove = new ArrayList<IMessagesBundle>();
-		List<IMessage> keysToRemove = new ArrayList<IMessage>();
-		
-		DirtyHack.setFireEnabled(false); // hebelt AbstractMessageModel aus 
-		// sonst m�ssten wir in setText von EclipsePropertiesEditorResource ein asyncExec zulassen
-		
-		for (IMessagesBundle newBundle : newBundleGroup.getMessagesBundles()) {
-			IMessagesBundle oldBundle = oldBundleGroup.getMessagesBundle(newBundle.getLocale());
-			if (oldBundle == null) { // it's a new one
-				oldBundleGroup.addMessagesBundle(newBundle.getLocale(), newBundle);
-			} else { // check keys
-				for (IMessage newMsg : newBundle.getMessages()) {
-					if (oldBundle.getMessage(newMsg.getKey()) == null) { // new entry, create new message
-						oldBundle.addMessage(new Message(newMsg.getKey(), newMsg.getLocale()));
-					} else { // update old entries
-						IMessage oldMsg = oldBundle.getMessage(newMsg.getKey());
-						if (oldMsg == null) { // it's a new one
-							oldBundle.addMessage(newMsg);
-						} else { // check value
-							oldMsg.setComment(newMsg.getComment());
-							oldMsg.setText(newMsg.getValue());
-						}
-					}
-				}
-			}
-		}
-		
-		// check keys
-		for (IMessagesBundle oldBundle : oldBundleGroup.getMessagesBundles()) {
-			IMessagesBundle newBundle = newBundleGroup.getMessagesBundle(oldBundle.getLocale());
-			if (newBundle == null) { // we have an old one
-				bundlesToRemove.add(oldBundle);
-			} else {
-				for (IMessage oldMsg : oldBundle.getMessages()) {
-					if (newBundle.getMessage(oldMsg.getKey()) == null) {
-						keysToRemove.add(oldMsg);
-					}
-				}
-			}
-		}
-		
-		for (IMessagesBundle bundle : bundlesToRemove) {
-			oldBundleGroup.removeMessagesBundle(bundle);
-		}
-		
-		for (IMessage msg : keysToRemove) {
-			IMessagesBundle mb = oldBundleGroup.getMessagesBundle(msg.getLocale());
-			if (mb != null) {
-				mb.removeMessage(msg.getKey());
+
+	// TODO: maybe save and reinit the editor?
+
+    }
+
+    /**
+     * Weil der BABEL-Builder nicht richtig funkt (added 1 x und removed 2 x das
+     * GLEICHE!)
+     * 
+     * @param oldBundleGroup
+     * @param newBundleGroup
+     * @return
+     */
+    private boolean equalHash(IMessagesBundleGroup oldBundleGroup,
+	    IMessagesBundleGroup newBundleGroup) {
+	int oldHashCode = oldBundleGroup.hashCode();
+	int newHashCode = newBundleGroup.hashCode();
+	return oldHashCode == newHashCode;
+    }
+
+    private void syncBundles(IMessagesBundleGroup oldBundleGroup,
+	    IMessagesBundleGroup newBundleGroup) {
+	List<IMessagesBundle> bundlesToRemove = new ArrayList<IMessagesBundle>();
+	List<IMessage> keysToRemove = new ArrayList<IMessage>();
+
+	DirtyHack.setFireEnabled(false); // hebelt AbstractMessageModel aus
+	// sonst m�ssten wir in setText von EclipsePropertiesEditorResource ein
+	// asyncExec zulassen
+
+	for (IMessagesBundle newBundle : newBundleGroup.getMessagesBundles()) {
+	    IMessagesBundle oldBundle = oldBundleGroup
+		    .getMessagesBundle(newBundle.getLocale());
+	    if (oldBundle == null) { // it's a new one
+		oldBundleGroup.addMessagesBundle(newBundle.getLocale(),
+			newBundle);
+	    } else { // check keys
+		for (IMessage newMsg : newBundle.getMessages()) {
+		    if (oldBundle.getMessage(newMsg.getKey()) == null) { // new
+									 // entry,
+									 // create
+									 // new
+									 // message
+			oldBundle.addMessage(new Message(newMsg.getKey(),
+				newMsg.getLocale()));
+		    } else { // update old entries
+			IMessage oldMsg = oldBundle.getMessage(newMsg.getKey());
+			if (oldMsg == null) { // it's a new one
+			    oldBundle.addMessage(newMsg);
+			} else { // check value
+			    oldMsg.setComment(newMsg.getComment());
+			    oldMsg.setText(newMsg.getValue());
 			}
+		    }
 		}
-		
-		DirtyHack.setFireEnabled(true);
-		
-	}
-	
-	/**
-	 * Hier darf nur TAPIJI rein
-	 * @param bundleGroup
-	 */
-	public void deleteMessagesBundle(String name) {
-		if (resourceBundles.containsKey(name)) {
-			resourceBundles.remove(name);
-		} else {
-			System.out.println(""ohje"");
-		}
-	}
-	
-	public boolean containsMessagesBundleGroup(String name) {
-		return resourceBundles.containsKey(name);
+	    }
 	}
-	
-	public static RBManager getInstance(IProject project) {
-		// set host-project
-		if (PDEUtils.isFragment(project))
-			project =  PDEUtils.getFragmentHost(project);
-		
-		INSTANCE = managerMap.get(project);
-		
-		if (INSTANCE == null) {
-			INSTANCE = new RBManager();
-			INSTANCE.project = project;
-			managerMap.put(project, INSTANCE);
-			INSTANCE.detectResourceBundles();
+
+	// check keys
+	for (IMessagesBundle oldBundle : oldBundleGroup.getMessagesBundles()) {
+	    IMessagesBundle newBundle = newBundleGroup
+		    .getMessagesBundle(oldBundle.getLocale());
+	    if (newBundle == null) { // we have an old one
+		bundlesToRemove.add(oldBundle);
+	    } else {
+		for (IMessage oldMsg : oldBundle.getMessages()) {
+		    if (newBundle.getMessage(oldMsg.getKey()) == null) {
+			keysToRemove.add(oldMsg);
+		    }
 		}
-		
-		return INSTANCE;
+	    }
 	}
-	
-	public static RBManager getInstance(String projectName) {
-		for (IProject project : getAllSupportedProjects()) {
-			if (project.getName().equals(projectName)) {
-				//check if the projectName is a fragment and return the manager for the host
-				if(PDEUtils.isFragment(project)) {
-					return getInstance(PDEUtils.getFragmentHost(project));
-				} else {
-					return getInstance(project);
-				}
-			}
-		}
-		return null;
+
+	for (IMessagesBundle bundle : bundlesToRemove) {
+	    oldBundleGroup.removeMessagesBundle(bundle);
 	}
-	
-	public static Set<IProject> getAllSupportedProjects () {
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		Set<IProject> projs = new HashSet<IProject>();
-		
-		for (IProject p : projects) {
-			try {
-				if (p.hasNature(""org.eclipselabs.tapiji.tools.core.nature"")) {
-					projs.add(p);
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		return projs;
+
+	for (IMessage msg : keysToRemove) {
+	    IMessagesBundle mb = oldBundleGroup.getMessagesBundle(msg
+		    .getLocale());
+	    if (mb != null) {
+		mb.removeMessage(msg.getKey());
+	    }
 	}
-	
-	public void addMessagesEditorListener(IMessagesEditorListener listener) {
-		this.editorListeners.add(listener);
+
+	DirtyHack.setFireEnabled(true);
+
+    }
+
+    /**
+     * Hier darf nur TAPIJI rein
+     * 
+     * @param bundleGroup
+     */
+    public void deleteMessagesBundle(String name) {
+	if (resourceBundles.containsKey(name)) {
+	    resourceBundles.remove(name);
+	} else {
+	    System.out.println(""ohje"");
 	}
-	
-	public void removeMessagesEditorListener(IMessagesEditorListener listener) {
-		this.editorListeners.remove(listener);
+    }
+
+    public boolean containsMessagesBundleGroup(String name) {
+	return resourceBundles.containsKey(name);
+    }
+
+    public static RBManager getInstance(IProject project) {
+	// set host-project
+	if (PDEUtils.isFragment(project))
+	    project = PDEUtils.getFragmentHost(project);
+
+	INSTANCE = managerMap.get(project);
+
+	if (INSTANCE == null) {
+	    INSTANCE = new RBManager();
+	    INSTANCE.project = project;
+	    managerMap.put(project, INSTANCE);
+	    INSTANCE.detectResourceBundles();
 	}
-	
-	public void fireEditorSaved() {
-		for (IMessagesEditorListener listener : this.editorListeners) {
-			listener.onSave();
+
+	return INSTANCE;
+    }
+
+    public static RBManager getInstance(String projectName) {
+	for (IProject project : getAllWorkspaceProjects(true)) {
+	    if (project.getName().equals(projectName)) {
+		// check if the projectName is a fragment and return the manager
+		// for the host
+		if (PDEUtils.isFragment(project)) {
+		    return getInstance(PDEUtils.getFragmentHost(project));
+		} else {
+		    return getInstance(project);
 		}
+	    }
 	}
-	
-	public void fireEditorChanged() {
-		for (IMessagesEditorListener listener : this.editorListeners) {
-			listener.onModify();
+	return null;
+    }
+
+    public static Set<IProject> getAllWorkspaceProjects(boolean ignoreNature) {
+	IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
+		.getProjects();
+	Set<IProject> projs = new HashSet<IProject>();
+
+	for (IProject p : projects) {
+	    try {
+		if (ignoreNature
+			|| p.hasNature(""org.eclipselabs.tapiji.tools.core.nature"")) {
+		    projs.add(p);
 		}
+	    } catch (CoreException e) {
+		e.printStackTrace();
+	    }
 	}
-	
-	public void fireResourceChanged(IMessagesBundle bundle) {
-		for (IMessagesEditorListener listener : this.editorListeners) {
-			listener.onResourceChanged(bundle);
-		}
+	return projs;
+    }
+
+    public static Set<IProject> getAllSupportedProjects() {
+	return getAllWorkspaceProjects(false);
+    }
+
+    public void addMessagesEditorListener(IMessagesEditorListener listener) {
+	this.editorListeners.add(listener);
+    }
+
+    public void removeMessagesEditorListener(IMessagesEditorListener listener) {
+	this.editorListeners.remove(listener);
+    }
+
+    public void fireEditorSaved() {
+	for (IMessagesEditorListener listener : this.editorListeners) {
+	    listener.onSave();
 	}
-	
-	protected void detectResourceBundles () {
-		try {		
-			project.accept(new ResourceBundleDetectionVisitor(this));
-			
-			IProject[] fragments = PDEUtils.lookupFragment(project);
-			if (fragments != null){
-				for (IProject p :  fragments){
-					p.accept(new ResourceBundleDetectionVisitor(this));
-				}
-			}
-		} catch (CoreException e) {
-		}
+    }
+
+    public void fireEditorChanged() {
+	for (IMessagesEditorListener listener : this.editorListeners) {
+	    listener.onModify();
+	}
+    }
+
+    public void fireResourceChanged(IMessagesBundle bundle) {
+	for (IMessagesEditorListener listener : this.editorListeners) {
+	    listener.onResourceChanged(bundle);
 	}
-	
-	// passive loading -> see detectResourceBundles
-	public void addBundleResource(IResource resource) {
-		// create it with MessagesBundleFactory or read from resource!
-		// we can optimize that, now we create a bundle group for each bundle
-		// we should create a bundle group only once!
-		
-		String resourceBundleId = getResourceBundleId(resource);
-		if (!resourceBundles.containsKey(resourceBundleId)) {
-			// if we do not have this condition, then you will be doomed with
-			// resource out of syncs, because here we instantiate
-			// PropertiesFileResources, which have an evil setText-Method
-			MessagesBundleGroupFactory.createBundleGroup(resource);
+    }
+
+    protected void detectResourceBundles() {
+	try {
+	    project.accept(new ResourceBundleDetectionVisitor(this));
+
+	    IProject[] fragments = PDEUtils.lookupFragment(project);
+	    if (fragments != null) {
+		for (IProject p : fragments) {
+		    p.accept(new ResourceBundleDetectionVisitor(this));
 		}
+	    }
+	} catch (CoreException e) {
 	}
-	
-	public static String getResourceBundleId (IResource resource) {
-		String packageFragment = """";
-
-		IJavaElement propertyFile = JavaCore.create(resource.getParent());
-		if (propertyFile != null && propertyFile instanceof IPackageFragment)
-			packageFragment = ((IPackageFragment) propertyFile).getElementName();
-		
-		return (packageFragment.length() > 0 ? packageFragment  + ""."" : """") + 
-				getResourceBundleName(resource);
+    }
+
+    // passive loading -> see detectResourceBundles
+    public void addBundleResource(IResource resource) {
+	// create it with MessagesBundleFactory or read from resource!
+	// we can optimize that, now we create a bundle group for each bundle
+	// we should create a bundle group only once!
+
+	String resourceBundleId = getResourceBundleId(resource);
+	if (!resourceBundles.containsKey(resourceBundleId)) {
+	    // if we do not have this condition, then you will be doomed with
+	    // resource out of syncs, because here we instantiate
+	    // PropertiesFileResources, which have an evil setText-Method
+	    MessagesBundleGroupFactory.createBundleGroup(resource);
 	}
-	
-	 public static String getResourceBundleName(IResource res) {
-	        String name = res.getName();
-	    	String regex = ""^(.*?)"" //$NON-NLS-1$
-	                + ""((_[a-z]{2,3})|(_[a-z]{2,3}_[A-Z]{2})"" //$NON-NLS-1$
-	                + ""|(_[a-z]{2,3}_[A-Z]{2}_\\w*))?(\\."" //$NON-NLS-1$
-	                + res.getFileExtension() + "")$""; //$NON-NLS-1$
-	        return name.replaceFirst(regex, ""$1""); //$NON-NLS-1$
-	    }
-	
-	public void writeToFile(IMessagesBundleGroup bundleGroup) {
-		for (IMessagesBundle bundle : bundleGroup.getMessagesBundles()) {
-			writeToFile(bundle);
-		}
+    }
+
+    public static String getResourceBundleId(IResource resource) {
+	String packageFragment = """";
+
+	IJavaElement propertyFile = JavaCore.create(resource.getParent());
+	if (propertyFile != null && propertyFile instanceof IPackageFragment)
+	    packageFragment = ((IPackageFragment) propertyFile)
+		    .getElementName();
+
+	return (packageFragment.length() > 0 ? packageFragment + ""."" : """")
+		+ getResourceBundleName(resource);
+    }
+
+    public static String getResourceBundleName(IResource res) {
+	String name = res.getName();
+	String regex = ""^(.*?)"" //$NON-NLS-1$
+		+ ""((_[a-z]{2,3})|(_[a-z]{2,3}_[A-Z]{2})"" //$NON-NLS-1$
+		+ ""|(_[a-z]{2,3}_[A-Z]{2}_\\w*))?(\\."" //$NON-NLS-1$
+		+ res.getFileExtension() + "")$""; //$NON-NLS-1$
+	return name.replaceFirst(regex, ""$1""); //$NON-NLS-1$
+    }
+
+    public void writeToFile(IMessagesBundleGroup bundleGroup) {
+	for (IMessagesBundle bundle : bundleGroup.getMessagesBundles()) {
+	    writeToFile(bundle);
 	}
-	
-	public void writeToFile(IMessagesBundle bundle) {
-		DirtyHack.setEditorModificationEnabled(false);
-		
-		PropertiesSerializer ps = new PropertiesSerializer(ConfigurationManager.getInstance().getSerializerConfig());
-		String editorContent = ps.serialize(bundle);
-		IFile file = getFile(bundle);
-		try {
-			file.refreshLocal(IResource.DEPTH_ZERO, null);
-			file.setContents(new ByteArrayInputStream(editorContent.getBytes()), 
-					false, true, null);
-			file.refreshLocal(IResource.DEPTH_ZERO, null);
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			DirtyHack.setEditorModificationEnabled(true);
-		}
-		
-		fireResourceChanged(bundle);
-		
+    }
+
+    public void writeToFile(IMessagesBundle bundle) {
+	DirtyHack.setEditorModificationEnabled(false);
+
+	PropertiesSerializer ps = new PropertiesSerializer(ConfigurationManager
+		.getInstance().getSerializerConfig());
+	String editorContent = ps.serialize(bundle);
+	IFile file = getFile(bundle);
+	try {
+	    file.refreshLocal(IResource.DEPTH_ZERO, null);
+	    file.setContents(
+		    new ByteArrayInputStream(editorContent.getBytes()), false,
+		    true, null);
+	    file.refreshLocal(IResource.DEPTH_ZERO, null);
+	} catch (Exception e) {
+	    e.printStackTrace();
+	} finally {
+	    DirtyHack.setEditorModificationEnabled(true);
 	}
 
-	private IFile getFile(IMessagesBundle bundle) {
-		if (bundle.getResource() instanceof PropertiesFileResource) { // different ResourceLocationLabel
-			String path = bundle.getResource().getResourceLocationLabel(); // P:\Allianz\Workspace\AST\TEST\src\messages\Messages_de.properties
-			int index = path.indexOf(""src"");
-	    	String pathBeforeSrc = path.substring(0, index - 1);
-	    	int lastIndexOf = pathBeforeSrc.lastIndexOf(File.separatorChar);
-	    	String projectName = path.substring(lastIndexOf + 1, index - 1);
-	    	String relativeFilePath = path.substring(index, path.length());
-	    	
-	    	return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).getFile(relativeFilePath);
-		} else {
-			String location = bundle.getResource().getResourceLocationLabel(); ///TEST/src/messages/Messages_en_IN.properties
-			location = location.substring(project.getName().length() + 1, location.length());
-			return ResourcesPlugin.getWorkspace().getRoot().getProject(project.getName()).getFile(location);
-		}
+	fireResourceChanged(bundle);
+
+    }
+
+    private IFile getFile(IMessagesBundle bundle) {
+	if (bundle.getResource() instanceof PropertiesFileResource) { // different
+								      // ResourceLocationLabel
+	    String path = bundle.getResource().getResourceLocationLabel(); // P:\Allianz\Workspace\AST\TEST\src\messages\Messages_de.properties
+	    int index = path.indexOf(""src"");
+	    String pathBeforeSrc = path.substring(0, index - 1);
+	    int lastIndexOf = pathBeforeSrc.lastIndexOf(File.separatorChar);
+	    String projectName = path.substring(lastIndexOf + 1, index - 1);
+	    String relativeFilePath = path.substring(index, path.length());
+
+	    return ResourcesPlugin.getWorkspace().getRoot()
+		    .getProject(projectName).getFile(relativeFilePath);
+	} else {
+	    String location = bundle.getResource().getResourceLocationLabel(); // /TEST/src/messages/Messages_en_IN.properties
+	    location = location.substring(project.getName().length() + 1,
+		    location.length());
+	    return ResourcesPlugin.getWorkspace().getRoot()
+		    .getProject(project.getName()).getFile(location);
 	}
-	
-	protected Locale getLocaleByName (String bundleName, String localeID) {
-		// Check locale
-		Locale locale = null;
-		localeID = localeID.substring(0, localeID.length() - ""properties"".length() - 1);
-		if (localeID.length() == bundleName.length()) {
-			// default locale
-			return null;
-		} else {
-			localeID = localeID.substring(bundleName.length() + 1);
-			String[] localeTokens = localeID.split(""_"");
-			
-			switch (localeTokens.length) {
-			case 1:
-				locale = new Locale(localeTokens[0]);
-				break;
-			case 2:
-				locale = new Locale(localeTokens[0], localeTokens[1]);
-				break;
-			case 3:
-				locale = new Locale(localeTokens[0], localeTokens[1], localeTokens[2]);
-				break;
-				default:
-					locale = null;
-					break;
-			}
-		}
-		
-		return locale;
+    }
+
+    protected Locale getLocaleByName(String bundleName, String localeID) {
+	// Check locale
+	Locale locale = null;
+	localeID = localeID.substring(0,
+		localeID.length() - ""properties"".length() - 1);
+	if (localeID.length() == bundleName.length()) {
+	    // default locale
+	    return null;
+	} else {
+	    localeID = localeID.substring(bundleName.length() + 1);
+	    String[] localeTokens = localeID.split(""_"");
+
+	    switch (localeTokens.length) {
+	    case 1:
+		locale = new Locale(localeTokens[0]);
+		break;
+	    case 2:
+		locale = new Locale(localeTokens[0], localeTokens[1]);
+		break;
+	    case 3:
+		locale = new Locale(localeTokens[0], localeTokens[1],
+			localeTokens[2]);
+		break;
+	    default:
+		locale = null;
+		break;
+	    }
 	}
+
+	return locale;
+    }
 }
diff --git a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/PropertiesFileResource.java b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/PropertiesFileResource.java
index 7ad534b9..3dedd114 100644
--- a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/PropertiesFileResource.java
+++ b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/PropertiesFileResource.java
@@ -26,11 +26,10 @@
 import org.eclipse.babel.core.util.FileChangeListener;
 import org.eclipse.babel.core.util.FileMonitor;
 
-
 /**
- * Properties file, where the underlying storage is a regular {@link File}.
- * For files referenced through Eclipse workspace, implementors should
- * use {@link PropertiesIFileResource}.
+ * Properties file, where the underlying storage is a regular {@link File}. For
+ * files referenced through Eclipse workspace, implementors should use
+ * {@link PropertiesIFileResource}.
  * 
  * @author Pascal Essiembre
  * @see PropertiesIFileResource
@@ -38,145 +37,156 @@
 public class PropertiesFileResource extends AbstractPropertiesResource {
 
     private File file;
-    
+
     private FileChangeListenerImpl fileChangeListener;
-    
+
     /**
      * Constructor.
-     * @param locale the resource locale
-     * @param serializer resource serializer
-     * @param deserializer resource deserializer
-     * @param file the underlying file
-     * @throws FileNotFoundException 
+     * 
+     * @param locale
+     *            the resource locale
+     * @param serializer
+     *            resource serializer
+     * @param deserializer
+     *            resource deserializer
+     * @param file
+     *            the underlying file
+     * @throws FileNotFoundException
      */
-    public PropertiesFileResource(
-            Locale locale,
-            PropertiesSerializer serializer,
-            PropertiesDeserializer deserializer,
-            File file) throws FileNotFoundException {
-        super(locale, serializer, deserializer);
-        this.file = file;
-        this.fileChangeListener = new FileChangeListenerImpl();
-        
-        FileMonitor.getInstance().addFileChangeListener(this.fileChangeListener, file, 2000);  //TODO make file scan delay configurable
+    public PropertiesFileResource(Locale locale,
+	    PropertiesSerializer serializer,
+	    PropertiesDeserializer deserializer, File file)
+	    throws FileNotFoundException {
+	super(locale, serializer, deserializer);
+	this.file = file;
+	this.fileChangeListener = new FileChangeListenerImpl();
+
+	FileMonitor.getInstance().addFileChangeListener(
+		this.fileChangeListener, file, 2000); // TODO make file scan
+						      // delay configurable
     }
 
-    
     /**
      * @see org.eclipse.babel.core.message.resource.AbstractPropertiesResource
-     * 			#getText()
+     *      #getText()
      */
+    @Override
     public String getText() {
-        FileReader inputStream = null;
-        StringWriter outputStream = null;
-        try {
-        	if (!file.exists()) {
-        		return """";
-        	}
-            inputStream = new FileReader(file);
-            outputStream = new StringWriter();
-            int c;
-            while ((c = inputStream.read()) != -1) {
-                outputStream.write(c);
-            }
-        } catch (IOException e) {
-            //TODO handle better.
-            throw new RuntimeException(
-                    ""Cannot get properties file text. Handle better."", e);
-        } finally {
-            closeReader(inputStream);
-            closeWriter(outputStream);
-        }
-        return outputStream.toString();
+	FileReader inputStream = null;
+	StringWriter outputStream = null;
+	try {
+	    if (!file.exists()) {
+		return """";
+	    }
+	    inputStream = new FileReader(file);
+	    outputStream = new StringWriter();
+	    int c;
+	    while ((c = inputStream.read()) != -1) {
+		outputStream.write(c);
+	    }
+	} catch (IOException e) {
+	    // TODO handle better.
+	    throw new RuntimeException(
+		    ""Cannot get properties file text. Handle better."", e);
+	} finally {
+	    closeReader(inputStream);
+	    closeWriter(outputStream);
+	}
+	return outputStream.toString();
     }
 
     /**
      * @see org.eclipse.babel.core.message.resource.AbstractPropertiesResource
-     * 		#setText(java.lang.String)
+     *      #setText(java.lang.String)
      */
+    @Override
     public void setText(String content) {
-        StringReader inputStream = null;
-        FileWriter outputStream = null;
-        try {
-            inputStream = new StringReader(content);
-            outputStream = new FileWriter(file);
-            int c;
-            while ((c = inputStream.read()) != -1) {
-                outputStream.write(c);
-            }
-        } catch (IOException e) {
-            //TODO handle better.
-            throw new RuntimeException(
-                    ""Cannot get properties file text. Handle better."", e);
-        } finally {
-            closeReader(inputStream);
-            closeWriter(outputStream);
-            
-//            IFile file =
-//                ResourcesPlugin.getWorkspace().getRoot().getFileForLocation( new
-//                Path(getResourceLocationLabel()));
-//            try {
-//                file.refreshLocal(IResource.DEPTH_ZERO, null);
-//            } catch (CoreException e) {
-//                // TODO Auto-generated catch block
-//                e.printStackTrace();
-//            }
-        }
+	StringReader inputStream = null;
+	FileWriter outputStream = null;
+	try {
+	    inputStream = new StringReader(content);
+	    outputStream = new FileWriter(file);
+	    int c;
+	    while ((c = inputStream.read()) != -1) {
+		outputStream.write(c);
+	    }
+	} catch (IOException e) {
+	    // TODO handle better.
+	    throw new RuntimeException(
+		    ""Cannot get properties file text. Handle better."", e);
+	} finally {
+	    closeReader(inputStream);
+	    closeWriter(outputStream);
+
+	    // IFile file =
+	    // ResourcesPlugin.getWorkspace().getRoot().getFileForLocation( new
+	    // Path(getResourceLocationLabel()));
+	    // try {
+	    // file.refreshLocal(IResource.DEPTH_ZERO, null);
+	    // } catch (CoreException e) {
+	    // // TODO Auto-generated catch block
+	    // e.printStackTrace();
+	    // }
+	}
     }
 
     /**
      * @see org.eclipse.babel.core.message.resource
-     * 			.IMessagesResource#getSource()
+     *      .IMessagesResource#getSource()
      */
+    @Override
     public Object getSource() {
-        return file;
+	return file;
     }
-    
+
     /**
      * @return The resource location label. or null if unknown.
      */
+    @Override
     public String getResourceLocationLabel() {
-    	return file.getAbsolutePath();
+	return file.getAbsolutePath();
     }
-    
-    //TODO move to util class for convinience???
+
+    // TODO move to util class for convinience???
     private void closeWriter(Writer writer) {
-        if (writer != null) {
-            try {
-                writer.close();
-            } catch (IOException e) {
-                //TODO handle better.
-                throw new RuntimeException(""Cannot close writer stream."", e);
-            }
-        }
+	if (writer != null) {
+	    try {
+		writer.close();
+	    } catch (IOException e) {
+		// TODO handle better.
+		throw new RuntimeException(""Cannot close writer stream."", e);
+	    }
+	}
     }
-    
-    //TODO move to util class for convinience???
+
+    // TODO move to util class for convinience???
     public void closeReader(Reader reader) {
-        if (reader != null) {
-            try {
-                reader.close();
-            } catch (IOException e) {
-                //TODO handle better.
-                throw new RuntimeException(""Cannot close reader."", e);
-            }
-        }
+	if (reader != null) {
+	    try {
+		reader.close();
+	    } catch (IOException e) {
+		// TODO handle better.
+		throw new RuntimeException(""Cannot close reader."", e);
+	    }
+	}
     }
-    
+
     /**
-     * Called before this object will be discarded.
-     * Nothing to do: we were not listening to changes to this file.
+     * Called before this object will be discarded. Nothing to do: we were not
+     * listening to changes to this file.
      */
+    @Override
     public void dispose() {
-    	FileMonitor.getInstance().removeFileChangeListener(this.fileChangeListener, file);
+	FileMonitor.getInstance().removeFileChangeListener(
+		this.fileChangeListener, file);
     }
-    
+
     private class FileChangeListenerImpl implements FileChangeListener {
-    	
-    	@Override
-    	public void fileChanged(final File changedFile) {
-            fireResourceChange(PropertiesFileResource.this);
-        }
-    	
+
+	@Override
+	public void fileChanged(final File changedFile) {
+	    fireResourceChange(PropertiesFileResource.this);
+	}
+
     }
 }
diff --git a/org.eclipse.babel.editor/src/org/eclipse/pde/nls/internal/ui/model/ResourceBundleModel.java b/org.eclipse.babel.editor/src/org/eclipse/pde/nls/internal/ui/model/ResourceBundleModel.java
index f0bf4d97..0123378e 100644
--- a/org.eclipse.babel.editor/src/org/eclipse/pde/nls/internal/ui/model/ResourceBundleModel.java
+++ b/org.eclipse.babel.editor/src/org/eclipse/pde/nls/internal/ui/model/ResourceBundleModel.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2008 Stefan Mücke and others.
+ * Copyright (c) 2008 Stefan M�cke and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Stefan Mücke - initial API and implementation
+ *     Stefan M�cke - initial API and implementation
  *******************************************************************************/
 package org.eclipse.pde.nls.internal.ui.model;
 
@@ -37,484 +37,509 @@
 import org.eclipse.pde.core.plugin.PluginRegistry;
 
 /**
- * A <code>ResourceBundleModel</code> is the host for all {@link ResourceBundleFamily} elements. 
+ * A <code>ResourceBundleModel</code> is the host for all
+ * {@link ResourceBundleFamily} elements.
  */
 public class ResourceBundleModel extends ResourceBundleElement {
 
-	private static final String PROPERTIES_SUFFIX = "".properties""; //$NON-NLS-1$
+    private static final String PROPERTIES_SUFFIX = "".properties""; //$NON-NLS-1$
 
-	private static final String JAVA_NATURE = ""org.eclipse.jdt.core.javanature""; //$NON-NLS-1$
+    private static final String JAVA_NATURE = ""org.eclipse.jdt.core.javanature""; //$NON-NLS-1$
 
-	private ArrayList<ResourceBundleFamily> bundleFamilies = new ArrayList<ResourceBundleFamily>();
+    private ArrayList<ResourceBundleFamily> bundleFamilies = new ArrayList<ResourceBundleFamily>();
 
-	/**
-	 * The locales for which all bundles have been loaded.
-	 */
-	// TODO Perhaps we should add reference counting to prevent unexpected unloading of bundles 
-	private HashSet<Locale> loadedLocales = new HashSet<Locale>();
+    /**
+     * The locales for which all bundles have been loaded.
+     */
+    // TODO Perhaps we should add reference counting to prevent unexpected
+    // unloading of bundles
+    private HashSet<Locale> loadedLocales = new HashSet<Locale>();
 
-	public ResourceBundleModel(IProgressMonitor monitor) {
-		super(null);
-		try {
-			populateFromWorkspace(monitor);
-		} catch (CoreException e) {
-			MessagesEditorPlugin.log(e);
-		}
+    public ResourceBundleModel(IProgressMonitor monitor) {
+	super(null);
+	try {
+	    populateFromWorkspace(monitor);
+	} catch (CoreException e) {
+	    MessagesEditorPlugin.log(e);
 	}
-
-	/**
-	 * Returns all resource bundle families contained in this model.
-	 * 
-	 * @return all resource bundle families contained in this model
-	 */
-	public ResourceBundleFamily[] getFamilies() {
-		return bundleFamilies.toArray(new ResourceBundleFamily[bundleFamilies.size()]);
+    }
+
+    /**
+     * Returns all resource bundle families contained in this model.
+     * 
+     * @return all resource bundle families contained in this model
+     */
+    public ResourceBundleFamily[] getFamilies() {
+	return bundleFamilies.toArray(new ResourceBundleFamily[bundleFamilies
+		.size()]);
+    }
+
+    public ResourceBundleFamily[] getFamiliesForPluginId(String pluginId) {
+	ArrayList<ResourceBundleFamily> found = new ArrayList<ResourceBundleFamily>();
+	for (ResourceBundleFamily family : bundleFamilies) {
+	    if (family.getPluginId().equals(pluginId)) {
+		found.add(family);
+	    }
 	}
-
-	public ResourceBundleFamily[] getFamiliesForPluginId(String pluginId) {
-		ArrayList<ResourceBundleFamily> found = new ArrayList<ResourceBundleFamily>();
-		for (ResourceBundleFamily family : bundleFamilies) {
-			if (family.getPluginId().equals(pluginId)) {
-				found.add(family);
-			}
-		}
-		return found.toArray(new ResourceBundleFamily[found.size()]);
+	return found.toArray(new ResourceBundleFamily[found.size()]);
+    }
+
+    public ResourceBundleFamily[] getFamiliesForProjectName(String projectName) {
+	ArrayList<ResourceBundleFamily> found = new ArrayList<ResourceBundleFamily>();
+	for (ResourceBundleFamily family : bundleFamilies) {
+	    if (family.getProjectName().equals(projectName)) {
+		found.add(family);
+	    }
 	}
-
-	public ResourceBundleFamily[] getFamiliesForProjectName(String projectName) {
-		ArrayList<ResourceBundleFamily> found = new ArrayList<ResourceBundleFamily>();
-		for (ResourceBundleFamily family : bundleFamilies) {
-			if (family.getProjectName().equals(projectName)) {
-				found.add(family);
-			}
-		}
-		return found.toArray(new ResourceBundleFamily[found.size()]);
+	return found.toArray(new ResourceBundleFamily[found.size()]);
+    }
+
+    public ResourceBundleFamily[] getFamiliesForProject(IProject project) {
+	return getFamiliesForProjectName(project.getName());
+    }
+
+    /**
+     * Returns an array of all currently known bundle keys. This always includes
+     * the keys from the default bundles and may include some additional keys
+     * from bundles that have been loaded sometime and that contain keys not
+     * found in a bundle's default bundle. When a bundle is unloaded, these
+     * additional keys will not be removed from the model.
+     * 
+     * @return the array of bundles keys
+     * @throws CoreException
+     */
+    public ResourceBundleKey[] getAllKeys() throws CoreException {
+	Locale root = new Locale("""", """", """");
+
+	// Ensure default bundle is loaded and count keys
+	int size = 0;
+	for (ResourceBundleFamily family : bundleFamilies) {
+	    ResourceBundle bundle = family.getBundle(root);
+	    if (bundle != null)
+		bundle.load();
+	    size += family.getKeyCount();
 	}
 
-	public ResourceBundleFamily[] getFamiliesForProject(IProject project) {
-		return getFamiliesForProjectName(project.getName());
-	}
-
-	/**
-	 * Returns an array of all currently known bundle keys. This always includes
-	 * the keys from the default bundles and may include some additional keys
-	 * from bundles that have been loaded sometime and that contain keys not found in
-	 * a bundle's default bundle. When a bundle is unloaded, these additional keys
-	 * will not be removed from the model.
-	 * 
-	 * @return the array of bundles keys
-	 * @throws CoreException 
-	 */
-	public ResourceBundleKey[] getAllKeys() throws CoreException {
-		Locale root = new Locale("""", """", """");
-		
-		// Ensure default bundle is loaded and count keys  
-		int size = 0;
-		for (ResourceBundleFamily family : bundleFamilies) {
-			ResourceBundle bundle = family.getBundle(root);
-			if (bundle != null)
-				bundle.load();
-			size += family.getKeyCount();
-		}
-
-		ArrayList<ResourceBundleKey> allKeys = new ArrayList<ResourceBundleKey>(size);
-		for (ResourceBundleFamily family : bundleFamilies) {
-			ResourceBundleKey[] keys = family.getKeys();
-			for (ResourceBundleKey key : keys) {
-				allKeys.add(key);
-			}
-		}
-
-		return allKeys.toArray(new ResourceBundleKey[allKeys.size()]);
+	ArrayList<ResourceBundleKey> allKeys = new ArrayList<ResourceBundleKey>(
+		size);
+	for (ResourceBundleFamily family : bundleFamilies) {
+	    ResourceBundleKey[] keys = family.getKeys();
+	    for (ResourceBundleKey key : keys) {
+		allKeys.add(key);
+	    }
 	}
 
-	/**
-	 * Loads all the bundles for the given locale into memory.
-	 * 
-	 * @param locale the locale of the bundles to load
-	 * @throws CoreException 
-	 */
-	public void loadBundles(Locale locale) throws CoreException {
-		ResourceBundleFamily[] families = getFamilies();
-		for (ResourceBundleFamily family : families) {
-			ResourceBundle bundle = family.getBundle(locale);
-			if (bundle != null)
-				bundle.load();
-		}
-		loadedLocales.add(locale);
+	return allKeys.toArray(new ResourceBundleKey[allKeys.size()]);
+    }
+
+    /**
+     * Loads all the bundles for the given locale into memory.
+     * 
+     * @param locale
+     *            the locale of the bundles to load
+     * @throws CoreException
+     */
+    public void loadBundles(Locale locale) throws CoreException {
+	ResourceBundleFamily[] families = getFamilies();
+	for (ResourceBundleFamily family : families) {
+	    ResourceBundle bundle = family.getBundle(locale);
+	    if (bundle != null)
+		bundle.load();
 	}
-
-	/**
-	 * Unloads all the bundles for the given locale from this model. The default
-	 * bundle cannot be unloaded. Such a request will be ignored.
-	 * 
-	 * @param locale the locale of the bundles to unload
-	 */
-	public void unloadBundles(Locale locale) {
-		if ("""".equals(locale.getLanguage()))
-			return; // never unload the default bundles
-
-		ResourceBundleFamily[] families = getFamilies();
-		for (ResourceBundleFamily family : families) {
-			ResourceBundle bundle = family.getBundle(locale);
-			if (bundle != null)
-				bundle.unload();
-		}
-		loadedLocales.remove(locale);
+	loadedLocales.add(locale);
+    }
+
+    /**
+     * Unloads all the bundles for the given locale from this model. The default
+     * bundle cannot be unloaded. Such a request will be ignored.
+     * 
+     * @param locale
+     *            the locale of the bundles to unload
+     */
+    public void unloadBundles(Locale locale) {
+	if ("""".equals(locale.getLanguage()))
+	    return; // never unload the default bundles
+
+	ResourceBundleFamily[] families = getFamilies();
+	for (ResourceBundleFamily family : families) {
+	    ResourceBundle bundle = family.getBundle(locale);
+	    if (bundle != null)
+		bundle.unload();
 	}
-
-	private void populateFromWorkspace(IProgressMonitor monitor) throws CoreException {
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		IProject[] projects = root.getProjects();
-		for (IProject project : projects) {
-			try {
-				if (!project.isOpen())
-					continue;
-
-				IJavaProject javaProject = (IJavaProject) project.getNature(JAVA_NATURE);
-
-				// Plugin and fragment projects
-				IPluginModelBase pluginModel = PluginRegistry.findModel(project);
-				String pluginId = null;
-				if (pluginModel != null) {
-					// Get plugin id
-					pluginId = pluginModel.getBundleDescription().getName(); // OSGi bundle name
-					if (pluginId == null) {
-						pluginId = pluginModel.getPluginBase().getId(); // non-OSGi plug-in id
-					}
-					boolean isFragment = pluginModel instanceof IFragmentModel;
-					if (isFragment) {
-						IFragmentModel fragmentModel = (IFragmentModel) pluginModel;
-						pluginId = fragmentModel.getFragment().getPluginId();
+	loadedLocales.remove(locale);
+    }
+
+    /**
+     * @param monitor
+     * @throws CoreException
+     */
+    private void populateFromWorkspace(IProgressMonitor monitor)
+	    throws CoreException {
+	IWorkspace workspace = ResourcesPlugin.getWorkspace();
+	IWorkspaceRoot root = workspace.getRoot();
+	IProject[] projects = root.getProjects();
+	for (IProject project : projects) {
+	    try {
+		if (!project.isOpen())
+		    continue;
+
+		IJavaProject javaProject = (IJavaProject) project
+			.getNature(JAVA_NATURE);
+
+		// Plugin and fragment projects
+		IPluginModelBase pluginModel = PluginRegistry
+			.findModel(project);
+		String pluginId = null;
+		if (pluginModel != null) {
+		    // Get plugin id
+		    pluginId = pluginModel.getBundleDescription().getName(); //
+		    // OSGi bundle name
+		    if (pluginId == null) {
+			pluginId = pluginModel.getPluginBase().getId(); // non-OSGi
+			// plug-in id
+		    }
+		    boolean isFragment = pluginModel instanceof IFragmentModel;
+		    if (isFragment) {
+			IFragmentModel fragmentModel = (IFragmentModel) pluginModel;
+			pluginId = fragmentModel.getFragment().getPluginId();
+		    }
+
+		    // Look for additional 'nl' resources
+		    IFolder nl = project.getFolder(""nl""); //$NON-NLS-1$
+		    if (isFragment && nl.exists()) {
+			IResource[] members = nl.members();
+			for (IResource member : members) {
+			    if (member instanceof IFolder) {
+				IFolder langFolder = (IFolder) member;
+				String language = langFolder.getName();
+
+				// Collect property files
+				IFile[] propertyFiles = collectPropertyFiles(langFolder);
+				for (IFile file : propertyFiles) {
+				    // Compute path name
+				    IPath path = file.getProjectRelativePath();
+				    String country = """"; //$NON-NLS-1$
+				    String packageName = null;
+				    int segmentCount = path.segmentCount();
+				    if (segmentCount > 1) {
+					StringBuilder builder = new StringBuilder();
+
+					// Segment 0: 'nl'
+					// Segment 1: language code
+					// Segment 2: (country code)
+					int begin = 2;
+					if (segmentCount > 2
+						&& isCountry(path.segment(2))) {
+					    begin = 3;
+					    country = path.segment(2);
 					}
 
-					// Look for additional 'nl' resources
-					IFolder nl = project.getFolder(""nl""); //$NON-NLS-1$
-					if (isFragment && nl.exists()) {
-						IResource[] members = nl.members();
-						for (IResource member : members) {
-							if (member instanceof IFolder) {
-								IFolder langFolder = (IFolder) member;
-								String language = langFolder.getName();
-
-								// Collect property files
-								IFile[] propertyFiles = collectPropertyFiles(langFolder);
-								for (IFile file : propertyFiles) {
-									// Compute path name
-									IPath path = file.getProjectRelativePath();
-									String country = """"; //$NON-NLS-1$
-									String packageName = null;
-									int segmentCount = path.segmentCount();
-									if (segmentCount > 1) {
-										StringBuilder builder = new StringBuilder();
-
-										// Segment 0: 'nl'
-										// Segment 1: language code
-										// Segment 2: (country code)
-										int begin = 2;
-										if (segmentCount > 2 && isCountry(path.segment(2))) {
-											begin = 3;
-											country = path.segment(2);
-										}
-
-										for (int i = begin; i < segmentCount - 1; i++) {
-											if (i > begin)
-												builder.append('.');
-											builder.append(path.segment(i));
-										}
-										packageName = builder.toString();
-									}
-
-									String baseName = getBaseName(file.getName());
-
-									ResourceBundleFamily family = getOrCreateFamily(
-											project.getName(),
-											pluginId,
-											packageName,
-											baseName);
-									addBundle(family, getLocale(language, country), file);
-								}
-							}
-						}
+					for (int i = begin; i < segmentCount - 1; i++) {
+					    if (i > begin)
+						builder.append('.');
+					    builder.append(path.segment(i));
 					}
+					packageName = builder.toString();
+				    }
 
-					// Collect property files
-					if (isFragment || javaProject == null) {
-						IFile[] propertyFiles = collectPropertyFiles(project);
-						for (IFile file : propertyFiles) {
-							IPath path = file.getProjectRelativePath();
-							int segmentCount = path.segmentCount();
-
-							if (segmentCount > 0 && path.segment(0).equals(""nl"")) //$NON-NLS-1$
-								continue; // 'nl' resource have been processed above
-
-							// Guess package name
-							String packageName = null;
-							if (segmentCount > 1) {
-								StringBuilder builder = new StringBuilder();
-								for (int i = 0; i < segmentCount - 1; i++) {
-									if (i > 0)
-										builder.append('.');
-									builder.append(path.segment(i));
-								}
-								packageName = builder.toString();
-							}
-
-							String baseName = getBaseName(file.getName());
-							String language = getLanguage(file.getName());
-							String country = getCountry(file.getName());
-
-							ResourceBundleFamily family = getOrCreateFamily(
-									project.getName(),
-									pluginId,
-									packageName,
-									baseName);
-							addBundle(family, getLocale(language, country), file);
-						}
-					}
+				    String baseName = getBaseName(file
+					    .getName());
 
+				    ResourceBundleFamily family = getOrCreateFamily(
+					    project.getName(), pluginId,
+					    packageName, baseName);
+				    addBundle(family,
+					    getLocale(language, country), file);
+				}
+			    }
+			}
+		    }
+
+		    // Collect property files
+		    if (isFragment || javaProject == null) {
+			IFile[] propertyFiles = collectPropertyFiles(project);
+			for (IFile file : propertyFiles) {
+			    IPath path = file.getProjectRelativePath();
+			    int segmentCount = path.segmentCount();
+
+			    if (segmentCount > 0
+				    && path.segment(0).equals(""nl"")) //$NON-NLS-1$
+				continue; // 'nl' resource have been processed
+					  // above
+
+			    // Guess package name
+			    String packageName = null;
+			    if (segmentCount > 1) {
+				StringBuilder builder = new StringBuilder();
+				for (int i = 0; i < segmentCount - 1; i++) {
+				    if (i > 0)
+					builder.append('.');
+				    builder.append(path.segment(i));
 				}
+				packageName = builder.toString();
+			    }
+
+			    String baseName = getBaseName(file.getName());
+			    String language = getLanguage(file.getName());
+			    String country = getCountry(file.getName());
+
+			    ResourceBundleFamily family = getOrCreateFamily(
+				    project.getName(), pluginId, packageName,
+				    baseName);
+			    addBundle(family, getLocale(language, country),
+				    file);
+			}
+		    }
 
-				// Look for resource bundles in Java packages (output folders, e.g. 'bin', will be ignored)
-				if (javaProject != null) {
-					IClasspathEntry[] classpathEntries = javaProject.getResolvedClasspath(true);
-					for (IClasspathEntry entry : classpathEntries) {
-						if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-							IPath path = entry.getPath();
-							IFolder folder = workspace.getRoot().getFolder(path);
-							IFile[] propertyFiles = collectPropertyFiles(folder);
-
-							for (IFile file : propertyFiles) {
-								String name = file.getName();
-								String baseName = getBaseName(name);
-								String language = getLanguage(name);
-								String country = getCountry(name);
-								IPackageFragment pf = javaProject.findPackageFragment(file.getParent()
-										.getFullPath());
-								String packageName = pf.getElementName();
-
-								ResourceBundleFamily family = getOrCreateFamily(
-										project.getName(),
-										pluginId,
-										packageName,
-										baseName);
-
-								addBundle(family, getLocale(language, country), file);
-							}
-						} else if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-							IPackageFragmentRoot[] findPackageFragmentRoots = javaProject.findPackageFragmentRoots(entry);
-							for (IPackageFragmentRoot packageFragmentRoot : findPackageFragmentRoots) {
-								IJavaElement[] children = packageFragmentRoot.getChildren();
-								for (IJavaElement child : children) {
-									IPackageFragment pf = (IPackageFragment) child;
-									Object[] nonJavaResources = pf.getNonJavaResources();
-
-									for (Object resource : nonJavaResources) {
-										if (resource instanceof IJarEntryResource) {
-											IJarEntryResource jarEntryResource = (IJarEntryResource) resource;
-											String name = jarEntryResource.getName();
-											if (name.endsWith(PROPERTIES_SUFFIX)) {
-												String baseName = getBaseName(name);
-												String language = getLanguage(name);
-												String country = getCountry(name);
-												String packageName = pf.getElementName();
-
-												ResourceBundleFamily family = getOrCreateFamily(
-														project.getName(),
-														pluginId,
-														packageName,
-														baseName);
-
-												addBundle(
-														family,
-														getLocale(language, country),
-														jarEntryResource);
-											}
-										}
-									}
-								}
-							}
-						}
-					}
+		}
 
-					// Collect non-Java resources 
-					Object[] nonJavaResources = javaProject.getNonJavaResources();
-					ArrayList<IFile> files = new ArrayList<IFile>();
-					for (Object resource : nonJavaResources) {
-						if (resource instanceof IContainer) {
-							IContainer container = (IContainer) resource;
-							collectPropertyFiles(container, files);
-						} else if (resource instanceof IFile) {
-							IFile file = (IFile) resource;
-							String name = file.getName();
-							if (isIgnoredFilename(name))
-								continue;
-							if (name.endsWith(PROPERTIES_SUFFIX)) {
-								files.add(file);
-							}
-						}
-					}
-					for (IFile file : files) {
-
-						// Convert path to package name format
-						IPath path = file.getProjectRelativePath();
-						String packageName = null;
-						int segmentCount = path.segmentCount();
-						if (segmentCount > 1) {
-							StringBuilder builder = new StringBuilder();
-							for (int i = 0; i < segmentCount - 1; i++) {
-								if (i > 0)
-									builder.append('.');
-								builder.append(path.segment(i));
-							}
-							packageName = builder.toString();
-						}
-
-						String baseName = getBaseName(file.getName());
-						String language = getLanguage(file.getName());
-						String country = getCountry(file.getName());
+		// Look for resource bundles in Java packages (output folders,
+		// e.g. 'bin', will be ignored)
+		if (javaProject != null) {
+		    IClasspathEntry[] classpathEntries = javaProject
+			    .getResolvedClasspath(true);
+		    for (IClasspathEntry entry : classpathEntries) {
+			if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+			    IPath path = entry.getPath();
+			    IFolder folder = workspace.getRoot()
+				    .getFolder(path);
+			    IFile[] propertyFiles = collectPropertyFiles(folder);
+
+			    for (IFile file : propertyFiles) {
+				String name = file.getName();
+				String baseName = getBaseName(name);
+				String language = getLanguage(name);
+				String country = getCountry(name);
+				IPackageFragment pf = javaProject
+					.findPackageFragment(file.getParent()
+						.getFullPath());
+				String packageName = pf.getElementName();
+
+				ResourceBundleFamily family = getOrCreateFamily(
+					project.getName(), pluginId,
+					packageName, baseName);
+
+				addBundle(family, getLocale(language, country),
+					file);
+			    }
+			} else if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+			    IPackageFragmentRoot[] findPackageFragmentRoots = javaProject
+				    .findPackageFragmentRoots(entry);
+			    for (IPackageFragmentRoot packageFragmentRoot : findPackageFragmentRoots) {
+				IJavaElement[] children = packageFragmentRoot
+					.getChildren();
+				for (IJavaElement child : children) {
+				    IPackageFragment pf = (IPackageFragment) child;
+				    Object[] nonJavaResources = pf
+					    .getNonJavaResources();
+
+				    for (Object resource : nonJavaResources) {
+					if (resource instanceof IJarEntryResource) {
+					    IJarEntryResource jarEntryResource = (IJarEntryResource) resource;
+					    String name = jarEntryResource
+						    .getName();
+					    if (name.endsWith(PROPERTIES_SUFFIX)) {
+						String baseName = getBaseName(name);
+						String language = getLanguage(name);
+						String country = getCountry(name);
+						String packageName = pf
+							.getElementName();
 
 						ResourceBundleFamily family = getOrCreateFamily(
-								project.getName(),
-								pluginId,
-								packageName,
-								baseName);
-						addBundle(family, getLocale(language, country), file);
+							project.getName(),
+							pluginId, packageName,
+							baseName);
+
+						addBundle(
+							family,
+							getLocale(language,
+								country),
+							jarEntryResource);
+					    }
 					}
-
+				    }
 				}
-			} catch (Exception e) {
-				MessagesEditorPlugin.log(e);
+			    }
 			}
-		}
-	}
-
-	private IFile[] collectPropertyFiles(IContainer container) throws CoreException {
-		ArrayList<IFile> files = new ArrayList<IFile>();
-		collectPropertyFiles(container, files);
-		return files.toArray(new IFile[files.size()]);
-	}
+		    }
 
-	private void collectPropertyFiles(IContainer container, ArrayList<IFile> files) throws CoreException {
-		IResource[] members = container.members();
-		for (IResource resource : members) {
-			if (!resource.exists())
-				continue;
+		    // Collect non-Java resources
+		    Object[] nonJavaResources = javaProject
+			    .getNonJavaResources();
+		    ArrayList<IFile> files = new ArrayList<IFile>();
+		    for (Object resource : nonJavaResources) {
 			if (resource instanceof IContainer) {
-				IContainer childContainer = (IContainer) resource;
-				collectPropertyFiles(childContainer, files);
+			    IContainer container = (IContainer) resource;
+			    collectPropertyFiles(container, files);
 			} else if (resource instanceof IFile) {
-				IFile file = (IFile) resource;
-				String name = file.getName();
-				if (file.getProjectRelativePath().segmentCount() == 0 && isIgnoredFilename(name))
-					continue;
-				if (name.endsWith(PROPERTIES_SUFFIX)) {
-					files.add(file);
-				}
+			    IFile file = (IFile) resource;
+			    String name = file.getName();
+			    if (isIgnoredFilename(name))
+				continue;
+			    if (name.endsWith(PROPERTIES_SUFFIX)) {
+				files.add(file);
+			    }
+			}
+		    }
+		    for (IFile file : files) {
+
+			// Convert path to package name format
+			IPath path = file.getProjectRelativePath();
+			String packageName = null;
+			int segmentCount = path.segmentCount();
+			if (segmentCount > 1) {
+			    StringBuilder builder = new StringBuilder();
+			    for (int i = 0; i < segmentCount - 1; i++) {
+				if (i > 0)
+				    builder.append('.');
+				builder.append(path.segment(i));
+			    }
+			    packageName = builder.toString();
 			}
-		}
-	}
 
-	private boolean isCountry(String name) {
-		if (name == null || name.length() != 2)
-			return false;
-		char c1 = name.charAt(0);
-		char c2 = name.charAt(1);
-		return 'A' <= c1 && c1 <= 'Z' && 'A' <= c2 && c2 <= 'Z';
-	}
+			String baseName = getBaseName(file.getName());
+			String language = getLanguage(file.getName());
+			String country = getCountry(file.getName());
 
-	private Locale getLocale(String language, String country) {
-		if (language == null)
-			language = """"; //$NON-NLS-1$
-		if (country == null)
-			country = """"; //$NON-NLS-1$
-		return new Locale(language, country);
-	}
+			ResourceBundleFamily family = getOrCreateFamily(
+				project.getName(), pluginId, packageName,
+				baseName);
+			addBundle(family, getLocale(language, country), file);
+		    }
 
-	private void addBundle(ResourceBundleFamily family, Locale locale, Object resource) throws CoreException {
-		ResourceBundle bundle = new ResourceBundle(family, resource, locale);
-		if ("""".equals(locale.getLanguage()))
-			bundle.load();
-		family.addBundle(bundle);
-	}
-
-	private String getBaseName(String filename) {
-		if (!filename.endsWith(PROPERTIES_SUFFIX))
-			throw new IllegalArgumentException();
-		String name = filename.substring(0, filename.length() - 11);
-		int len = name.length();
-		if (len > 3 && name.charAt(len - 3) == '_') {
-			if (len > 6 && name.charAt(len - 6) == '_') {
-				return name.substring(0, len - 6);
-			} else {
-				return name.substring(0, len - 3);
-			}
 		}
-		return name;
+	    } catch (Exception e) {
+		MessagesEditorPlugin.log(e);
+	    }
 	}
-
-	private String getLanguage(String filename) {
-		if (!filename.endsWith(PROPERTIES_SUFFIX))
-			throw new IllegalArgumentException();
-		String name = filename.substring(0, filename.length() - 11);
-		int len = name.length();
-		if (len > 3 && name.charAt(len - 3) == '_') {
-			if (len > 6 && name.charAt(len - 6) == '_') {
-				return name.substring(len - 5, len - 3);
-			} else {
-				return name.substring(len - 2);
-			}
+    }
+
+    private IFile[] collectPropertyFiles(IContainer container)
+	    throws CoreException {
+	ArrayList<IFile> files = new ArrayList<IFile>();
+	collectPropertyFiles(container, files);
+	return files.toArray(new IFile[files.size()]);
+    }
+
+    private void collectPropertyFiles(IContainer container,
+	    ArrayList<IFile> files) throws CoreException {
+	IResource[] members = container.members();
+	for (IResource resource : members) {
+	    if (!resource.exists())
+		continue;
+	    if (resource instanceof IContainer) {
+		IContainer childContainer = (IContainer) resource;
+		collectPropertyFiles(childContainer, files);
+	    } else if (resource instanceof IFile) {
+		IFile file = (IFile) resource;
+		String name = file.getName();
+		if (file.getProjectRelativePath().segmentCount() == 0
+			&& isIgnoredFilename(name))
+		    continue;
+		if (name.endsWith(PROPERTIES_SUFFIX)) {
+		    files.add(file);
 		}
-		return """"; //$NON-NLS-1$
+	    }
 	}
-
-	private String getCountry(String filename) {
-		if (!filename.endsWith(PROPERTIES_SUFFIX))
-			throw new IllegalArgumentException();
-		String name = filename.substring(0, filename.length() - 11);
-		int len = name.length();
-		if (len > 3 && name.charAt(len - 3) == '_') {
-			if (len > 6 && name.charAt(len - 6) == '_') {
-				return name.substring(len - 2);
-			} else {
-				return """"; //$NON-NLS-1$
-			}
-		}
+    }
+
+    private boolean isCountry(String name) {
+	if (name == null || name.length() != 2)
+	    return false;
+	char c1 = name.charAt(0);
+	char c2 = name.charAt(1);
+	return 'A' <= c1 && c1 <= 'Z' && 'A' <= c2 && c2 <= 'Z';
+    }
+
+    private Locale getLocale(String language, String country) {
+	if (language == null)
+	    language = """"; //$NON-NLS-1$
+	if (country == null)
+	    country = """"; //$NON-NLS-1$
+	return new Locale(language, country);
+    }
+
+    private void addBundle(ResourceBundleFamily family, Locale locale,
+	    Object resource) throws CoreException {
+	ResourceBundle bundle = new ResourceBundle(family, resource, locale);
+	if ("""".equals(locale.getLanguage()))
+	    bundle.load();
+	family.addBundle(bundle);
+    }
+
+    private String getBaseName(String filename) {
+	if (!filename.endsWith(PROPERTIES_SUFFIX))
+	    throw new IllegalArgumentException();
+	String name = filename.substring(0, filename.length() - 11);
+	int len = name.length();
+	if (len > 3 && name.charAt(len - 3) == '_') {
+	    if (len > 6 && name.charAt(len - 6) == '_') {
+		return name.substring(0, len - 6);
+	    } else {
+		return name.substring(0, len - 3);
+	    }
+	}
+	return name;
+    }
+
+    private String getLanguage(String filename) {
+	if (!filename.endsWith(PROPERTIES_SUFFIX))
+	    throw new IllegalArgumentException();
+	String name = filename.substring(0, filename.length() - 11);
+	int len = name.length();
+	if (len > 3 && name.charAt(len - 3) == '_') {
+	    if (len > 6 && name.charAt(len - 6) == '_') {
+		return name.substring(len - 5, len - 3);
+	    } else {
+		return name.substring(len - 2);
+	    }
+	}
+	return """"; //$NON-NLS-1$
+    }
+
+    private String getCountry(String filename) {
+	if (!filename.endsWith(PROPERTIES_SUFFIX))
+	    throw new IllegalArgumentException();
+	String name = filename.substring(0, filename.length() - 11);
+	int len = name.length();
+	if (len > 3 && name.charAt(len - 3) == '_') {
+	    if (len > 6 && name.charAt(len - 6) == '_') {
+		return name.substring(len - 2);
+	    } else {
 		return """"; //$NON-NLS-1$
+	    }
 	}
+	return """"; //$NON-NLS-1$
+    }
 
-	private ResourceBundleFamily getOrCreateFamily(String projectName, String pluginId, String packageName,
-			String baseName) {
+    private ResourceBundleFamily getOrCreateFamily(String projectName,
+	    String pluginId, String packageName, String baseName) {
 
-		// Ignore project name
-		if (pluginId != null)
-			projectName = null;
+	// Ignore project name
+	if (pluginId != null)
+	    projectName = null;
 
-		for (ResourceBundleFamily family : bundleFamilies) {
-			if (areEqual(family.getProjectName(), projectName)
-					&& areEqual(family.getPluginId(), pluginId)
-					&& areEqual(family.getPackageName(), packageName)
-					&& areEqual(family.getBaseName(), baseName)) {
-				return family;
-			}
-		}
-		ResourceBundleFamily family = new ResourceBundleFamily(
-			this,
-			projectName,
-			pluginId,
-			packageName,
-			baseName);
-		bundleFamilies.add(family);
+	for (ResourceBundleFamily family : bundleFamilies) {
+	    if (areEqual(family.getProjectName(), projectName)
+		    && areEqual(family.getPluginId(), pluginId)
+		    && areEqual(family.getPackageName(), packageName)
+		    && areEqual(family.getBaseName(), baseName)) {
 		return family;
+	    }
 	}
-
-	private boolean isIgnoredFilename(String filename) {
-		return filename.equals(""build.properties"") || filename.equals(""logging.properties""); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private boolean areEqual(String str1, String str2) {
-		return str1 == null && str2 == null || str1 != null && str1.equals(str2);
-	}
+	ResourceBundleFamily family = new ResourceBundleFamily(this,
+		projectName, pluginId, packageName, baseName);
+	bundleFamilies.add(family);
+	return family;
+    }
+
+    private boolean isIgnoredFilename(String filename) {
+	return filename.equals(""build.properties"") || filename.equals(""logging.properties""); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    private boolean areEqual(String str1, String str2) {
+	return str1 == null && str2 == null || str1 != null
+		&& str1.equals(str2);
+    }
 
 }
diff --git a/org.eclipselabs.tapiji.tools.core.ui/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.core.ui/META-INF/MANIFEST.MF
index 3d0b91f9..3b9f7b16 100644
--- a/org.eclipselabs.tapiji.tools.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.core.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ui
+Bundle-Name: TapiJI Tools Core UI
 Bundle-SymbolicName: org.eclipselabs.tapiji.tools.core.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.0.2.qualifier
 Bundle-Activator: org.eclipselabs.tapiji.tools.core.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -33,3 +33,4 @@ Export-Package: org.eclipselabs.tapiji.tools.core.ui,
  org.eclipselabs.tapiji.tools.core.ui.widgets.sorter
 Import-Package: org.eclipse.core.filebuffers,
  org.eclipse.ui.texteditor
+Bundle-Vendor: Vienna University of Technology
diff --git a/org.eclipselabs.tapiji.tools.core.ui/build.properties b/org.eclipselabs.tapiji.tools.core.ui/build.properties
index 6f20375d..285b8bf4 100644
--- a/org.eclipselabs.tapiji.tools.core.ui/build.properties
+++ b/org.eclipselabs.tapiji.tools.core.ui/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               icons/
diff --git a/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
index 77d8cc50..233c52cf 100644
--- a/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.jdt.ui;bundle-version=""3.6.0"",
  org.eclipse.jface,
  org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.2"",
- org.eclipselabs.tapiji.tools.core.ui;bundle-version=""1.0.0""
+ org.eclipselabs.tapiji.tools.core.ui;bundle-version=""0.0.2""
 Import-Package: org.eclipse.core.filebuffers,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.text,
diff --git a/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
index 9022be10..89d0622f 100644
--- a/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.jst.jsp.core;bundle-version=""1.2.300"",
  org.eclipse.wst.sse.ui,
  org.eclipse.core.runtime;bundle-version=""3.6.0"",
- org.eclipselabs.tapiji.tools.core.ui;bundle-version=""1.0.0""
+ org.eclipselabs.tapiji.tools.core.ui;bundle-version=""0.0.2""
 Import-Package: org.eclipse.core.filebuffers,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
diff --git a/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product b/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
index 49e3c0f0..d9599269 100644
--- a/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
+++ b/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
@@ -1,29 +1,29 @@
-<?xml version=""1.0"" encoding=""UTF-8""?>
-<?pde version=""3.5""?>
-
-<product name=""TapiJI Translator"" uid=""org.eclipselabs.tapiji.translator.product"" id=""org.eclipselabs.tapiji.translator.app"" application=""org.eclipselabs.tapiji.translator.application"" version=""0.0.1"" useFeatures=""false"" includeLaunchers=""true"">
-
-   <aboutInfo>
-      <image path=""/org.eclipselabs.tapiji.translator/icons/TapiJI_128.png""/>
-      <text>
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<?pde version=""3.5""?>
+
+<product name=""TapiJI Translator"" uid=""org.eclipselabs.tapiji.translator.product"" id=""org.eclipselabs.tapiji.translator.app"" application=""org.eclipselabs.tapiji.translator.application"" version=""0.0.1"" useFeatures=""false"" includeLaunchers=""true"">
+
+   <aboutInfo>
+      <image path=""/org.eclipselabs.tapiji.translator/icons/TapiJI_128.png""/>
+      <text>
          TapiJI - Translator 
 Version 1.0.0
-by Stefan Strobl &amp; Martin Reiterer
-      </text>
-   </aboutInfo>
-
-   <configIni use=""default"">
-   </configIni>
-
-   <launcherArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16=""/org.eclipselabs.tapiji.translator/icons/TapiJI_16.png"" i32=""/org.eclipselabs.tapiji.translator/icons/TapiJI_32.png"" i48=""/org.eclipselabs.tapiji.translator/icons/TapiJI_48.png"" i64=""/org.eclipselabs.tapiji.translator/icons/TapiJI_64.png"" i128=""/org.eclipselabs.tapiji.translator/icons/TapiJI_128.png""/>
-
-   <license>
-        <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        <text>
+by Stefan Strobl &amp; Martin Reiterer
+      </text>
+   </aboutInfo>
+
+   <configIni use=""default"">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16=""/org.eclipselabs.tapiji.translator/icons/TapiJI_16.png"" i32=""/org.eclipselabs.tapiji.translator/icons/TapiJI_32.png"" i48=""/org.eclipselabs.tapiji.translator/icons/TapiJI_48.png"" i64=""/org.eclipselabs.tapiji.translator/icons/TapiJI_64.png"" i128=""/org.eclipselabs.tapiji.translator/icons/TapiJI_128.png""/>
+
+   <license>
+        <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        <text>
    Eclipse Public License - v 1.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
 ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
@@ -219,72 +219,98 @@ and the intellectual property laws of the United States of America.
 No party to this Agreement will bring a legal action under this
 Agreement more than one year after the cause of action arose.
 Each party waives its rights to a jury trial in any resulting
-litigation.
-         </text>
-   </license>
-
-   <plugins>
-      <plugin id=""com.essiembre.eclipse.i18n.resourcebundle""/>
-      <plugin id=""com.ibm.icu""/>
-      <plugin id=""org.eclipse.compare.core""/>
-      <plugin id=""org.eclipse.core.commands""/>
-      <plugin id=""org.eclipse.core.contenttype""/>
-      <plugin id=""org.eclipse.core.databinding""/>
-      <plugin id=""org.eclipse.core.databinding.observable""/>
-      <plugin id=""org.eclipse.core.databinding.property""/>
-      <plugin id=""org.eclipse.core.expressions""/>
-      <plugin id=""org.eclipse.core.filebuffers""/>
-      <plugin id=""org.eclipse.core.filesystem""/>
-      <plugin id=""org.eclipse.core.filesystem.win32.x86"" fragment=""true""/>
-      <plugin id=""org.eclipse.core.filesystem.win32.x86_64"" fragment=""true""/>
-      <plugin id=""org.eclipse.core.jobs""/>
-      <plugin id=""org.eclipse.core.resources""/>
-      <plugin id=""org.eclipse.core.resources.win32.x86"" fragment=""true""/>
-      <plugin id=""org.eclipse.core.runtime""/>
-      <plugin id=""org.eclipse.core.runtime.compatibility.registry"" fragment=""true""/>
-      <plugin id=""org.eclipse.ecf""/>
-      <plugin id=""org.eclipse.ecf.filetransfer""/>
-      <plugin id=""org.eclipse.ecf.identity""/>
-      <plugin id=""org.eclipse.ecf.provider.filetransfer""/>
-      <plugin id=""org.eclipse.ecf.provider.filetransfer.ssl"" fragment=""true""/>
-      <plugin id=""org.eclipse.ecf.ssl"" fragment=""true""/>
-      <plugin id=""org.eclipse.equinox.app""/>
-      <plugin id=""org.eclipse.equinox.common""/>
-      <plugin id=""org.eclipse.equinox.p2.core""/>
-      <plugin id=""org.eclipse.equinox.p2.engine""/>
-      <plugin id=""org.eclipse.equinox.p2.metadata""/>
-      <plugin id=""org.eclipse.equinox.p2.metadata.repository""/>
-      <plugin id=""org.eclipse.equinox.p2.repository""/>
-      <plugin id=""org.eclipse.equinox.preferences""/>
-      <plugin id=""org.eclipse.equinox.registry""/>
-      <plugin id=""org.eclipse.equinox.security""/>
-      <plugin id=""org.eclipse.equinox.security.win32.x86"" fragment=""true""/>
-      <plugin id=""org.eclipse.equinox.security.win32.x86_64"" fragment=""true""/>
-      <plugin id=""org.eclipse.help""/>
-      <plugin id=""org.eclipse.jdt.compiler.apt"" fragment=""true""/>
-      <plugin id=""org.eclipse.jdt.compiler.tool"" fragment=""true""/>
-      <plugin id=""org.eclipse.jdt.core""/>
-      <plugin id=""org.eclipse.jface""/>
-      <plugin id=""org.eclipse.jface.databinding""/>
-      <plugin id=""org.eclipse.jface.text""/>
-      <plugin id=""org.eclipse.osgi""/>
-      <plugin id=""org.eclipse.osgi.services""/>
-      <plugin id=""org.eclipse.swt""/>
-      <plugin id=""org.eclipse.swt.win32.win32.x86"" fragment=""true""/>
-      <plugin id=""org.eclipse.swt.win32.win32.x86_64"" fragment=""true""/>
-      <plugin id=""org.eclipse.text""/>
-      <plugin id=""org.eclipse.ui""/>
-      <plugin id=""org.eclipse.ui.editors""/>
-      <plugin id=""org.eclipse.ui.ide""/>
-      <plugin id=""org.eclipse.ui.views""/>
-      <plugin id=""org.eclipse.ui.win32"" fragment=""true""/>
-      <plugin id=""org.eclipse.ui.workbench""/>
-      <plugin id=""org.eclipse.ui.workbench.texteditor""/>
-      <plugin id=""org.eclipselabs.tapiji.translator""/>
-      <plugin id=""org.eclipselabs.tapiji.translator.rbe""/>
-      <plugin id=""org.hamcrest.core""/>
-      <plugin id=""org.junit""/>
-   </plugins>
-
-
-</product>
+litigation.
+         </text>
+   </license>
+
+   <plugins>
+      <plugin id=""com.ibm.icu""/>
+      <plugin id=""javax.transaction"" fragment=""true""/>
+      <plugin id=""org.eclipse.ant.core""/>
+      <plugin id=""org.eclipse.babel.core""/>
+      <plugin id=""org.eclipse.babel.editor""/>
+      <plugin id=""org.eclipse.babel.editor.nls"" fragment=""true""/>
+      <plugin id=""org.eclipse.compare""/>
+      <plugin id=""org.eclipse.compare.core""/>
+      <plugin id=""org.eclipse.core.commands""/>
+      <plugin id=""org.eclipse.core.contenttype""/>
+      <plugin id=""org.eclipse.core.databinding""/>
+      <plugin id=""org.eclipse.core.databinding.observable""/>
+      <plugin id=""org.eclipse.core.databinding.property""/>
+      <plugin id=""org.eclipse.core.expressions""/>
+      <plugin id=""org.eclipse.core.filebuffers""/>
+      <plugin id=""org.eclipse.core.filesystem""/>
+      <plugin id=""org.eclipse.core.filesystem.linux.x86_64"" fragment=""true""/>
+      <plugin id=""org.eclipse.core.jobs""/>
+      <plugin id=""org.eclipse.core.resources""/>
+      <plugin id=""org.eclipse.core.runtime""/>
+      <plugin id=""org.eclipse.core.runtime.compatibility.registry"" fragment=""true""/>
+      <plugin id=""org.eclipse.core.variables""/>
+      <plugin id=""org.eclipse.debug.core""/>
+      <plugin id=""org.eclipse.ecf""/>
+      <plugin id=""org.eclipse.ecf.filetransfer""/>
+      <plugin id=""org.eclipse.ecf.identity""/>
+      <plugin id=""org.eclipse.ecf.provider.filetransfer""/>
+      <plugin id=""org.eclipse.ecf.provider.filetransfer.ssl"" fragment=""true""/>
+      <plugin id=""org.eclipse.ecf.ssl"" fragment=""true""/>
+      <plugin id=""org.eclipse.equinox.app""/>
+      <plugin id=""org.eclipse.equinox.common""/>
+      <plugin id=""org.eclipse.equinox.frameworkadmin""/>
+      <plugin id=""org.eclipse.equinox.frameworkadmin.equinox""/>
+      <plugin id=""org.eclipse.equinox.p2.artifact.repository""/>
+      <plugin id=""org.eclipse.equinox.p2.core""/>
+      <plugin id=""org.eclipse.equinox.p2.director""/>
+      <plugin id=""org.eclipse.equinox.p2.director.app""/>
+      <plugin id=""org.eclipse.equinox.p2.engine""/>
+      <plugin id=""org.eclipse.equinox.p2.garbagecollector""/>
+      <plugin id=""org.eclipse.equinox.p2.jarprocessor""/>
+      <plugin id=""org.eclipse.equinox.p2.metadata""/>
+      <plugin id=""org.eclipse.equinox.p2.metadata.repository""/>
+      <plugin id=""org.eclipse.equinox.p2.publisher""/>
+      <plugin id=""org.eclipse.equinox.p2.publisher.eclipse""/>
+      <plugin id=""org.eclipse.equinox.p2.repository""/>
+      <plugin id=""org.eclipse.equinox.p2.touchpoint.eclipse""/>
+      <plugin id=""org.eclipse.equinox.preferences""/>
+      <plugin id=""org.eclipse.equinox.registry""/>
+      <plugin id=""org.eclipse.equinox.security""/>
+      <plugin id=""org.eclipse.equinox.simpleconfigurator""/>
+      <plugin id=""org.eclipse.equinox.simpleconfigurator.manipulator""/>
+      <plugin id=""org.eclipse.help""/>
+      <plugin id=""org.eclipse.jdt.compiler.apt"" fragment=""true""/>
+      <plugin id=""org.eclipse.jdt.compiler.tool"" fragment=""true""/>
+      <plugin id=""org.eclipse.jdt.core""/>
+      <plugin id=""org.eclipse.jdt.debug""/>
+      <plugin id=""org.eclipse.jdt.launching""/>
+      <plugin id=""org.eclipse.jface""/>
+      <plugin id=""org.eclipse.jface.databinding""/>
+      <plugin id=""org.eclipse.jface.text""/>
+      <plugin id=""org.eclipse.ltk.core.refactoring""/>
+      <plugin id=""org.eclipse.ltk.ui.refactoring""/>
+      <plugin id=""org.eclipse.osgi""/>
+      <plugin id=""org.eclipse.osgi.services""/>
+      <plugin id=""org.eclipse.pde.build""/>
+      <plugin id=""org.eclipse.pde.core""/>
+      <plugin id=""org.eclipse.swt""/>
+      <plugin id=""org.eclipse.swt.gtk.linux.x86_64"" fragment=""true""/>
+      <plugin id=""org.eclipse.team.core""/>
+      <plugin id=""org.eclipse.team.ui""/>
+      <plugin id=""org.eclipse.text""/>
+      <plugin id=""org.eclipse.ui""/>
+      <plugin id=""org.eclipse.ui.editors""/>
+      <plugin id=""org.eclipse.ui.forms""/>
+      <plugin id=""org.eclipse.ui.ide""/>
+      <plugin id=""org.eclipse.ui.navigator""/>
+      <plugin id=""org.eclipse.ui.views""/>
+      <plugin id=""org.eclipse.ui.workbench""/>
+      <plugin id=""org.eclipse.ui.workbench.texteditor""/>
+      <plugin id=""org.eclipse.update.configurator""/>
+      <plugin id=""org.eclipselabs.tapiji.translator""/>
+      <plugin id=""org.eclipselabs.tapiji.translator.rbe""/>
+      <plugin id=""org.hamcrest.core""/>
+      <plugin id=""org.junit""/>
+      <plugin id=""org.sat4j.core""/>
+      <plugin id=""org.sat4j.pb""/>
+   </plugins>
+
+
+</product>
diff --git a/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java
index 4bb6865c..c2378edf 100644
--- a/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java
+++ b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java
@@ -12,49 +12,54 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipselabs.tapiji.translator.utils.FileUtils;
 
+public class FileOpenAction extends Action implements
+	IWorkbenchWindowActionDelegate {
 
-public class FileOpenAction extends Action implements IWorkbenchWindowActionDelegate {
-
-	/** Editor ids **/
-	public static final String RESOURCE_BUNDLE_EDITOR = ""com.essiembre.eclipse.rbe.ui.editor.ResourceBundleEditor"";
-	
-	private IWorkbenchWindow window;
-	
-	@Override
-	public void run(IAction action) {
-		String fileName= FileUtils.queryFileName(window.getShell(), ""Open Resource-Bundle"", SWT.OPEN, new String[] {""*.properties""} );
-		if (!FileUtils.isResourceBundle(fileName)) {
-			MessageDialog.openError(window.getShell(), 
-					""Cannot open Resource-Bundle"", ""The choosen file does not represent a Resource-Bundle!"");
-			return;
-		}
-		
-		if (fileName != null) {
-			IWorkbenchPage page= window.getActivePage();
-			try {
-				page.openEditor(new FileEditorInput(FileUtils.getResourceBundleRef(fileName)), 
-						RESOURCE_BUNDLE_EDITOR);
-			
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		} 
-	}
-	
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		// TODO Auto-generated method stub
-		
-	}
+    /** Editor ids **/
+    public static final String RESOURCE_BUNDLE_EDITOR = ""com.essiembre.rbe.eclipse.editor.ResourceBundleEditor"";
 
-	@Override
-	public void dispose() {
-		window = null;
+    private IWorkbenchWindow window;
+
+    @Override
+    public void run(IAction action) {
+	String fileName = FileUtils.queryFileName(window.getShell(),
+		""Open Resource-Bundle"", SWT.OPEN,
+		new String[] { ""*.properties"" });
+	if (!FileUtils.isResourceBundle(fileName)) {
+	    MessageDialog.openError(window.getShell(),
+		    ""Cannot open Resource-Bundle"",
+		    ""The choosen file does not represent a Resource-Bundle!"");
+	    return;
 	}
 
-	@Override
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
+	if (fileName != null) {
+	    IWorkbenchPage page = window.getActivePage();
+	    try {
+		page.openEditor(
+			new FileEditorInput(FileUtils
+				.getResourceBundleRef(fileName)),
+			RESOURCE_BUNDLE_EDITOR);
+
+	    } catch (CoreException e) {
+		e.printStackTrace();
+	    }
 	}
+    }
+
+    @Override
+    public void selectionChanged(IAction action, ISelection selection) {
+	// TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void dispose() {
+	window = null;
+    }
+
+    @Override
+    public void init(IWorkbenchWindow window) {
+	this.window = window;
+    }
 
 }"
b32aa01a3f9294fc219e8e3b9f274607ebc7ff20,restlet-framework-java,Fixed code generation for the GAE edition.--,c,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/org.restlet/src/org/restlet/engine/io/ByteUtils.java b/modules/org.restlet/src/org/restlet/engine/io/ByteUtils.java
index 65f15820e0..8b11da2da4 100644
--- a/modules/org.restlet/src/org/restlet/engine/io/ByteUtils.java
+++ b/modules/org.restlet/src/org/restlet/engine/io/ByteUtils.java
@@ -128,25 +128,37 @@ public static WritableByteChannel getChannel(OutputStream outputStream) {
      */
     public static ReadableByteChannel getChannel(
             final Representation representation) throws IOException {
-        final Pipe pipe = Pipe.open();
-        final Application application = Application.getCurrent();
-
-        // Get a thread that will handle the task of continuously
-        // writing the representation into the input side of the pipe
-        application.getTaskService().execute(new Runnable() {
-            public void run() {
-                try {
-                    WritableByteChannel wbc = pipe.sink();
-                    representation.write(wbc);
-                    wbc.close();
-                } catch (IOException ioe) {
-                    Context.getCurrentLogger().log(Level.FINE,
-                            ""Error while writing to the piped channel."", ioe);
+        if (Edition.CURRENT != Edition.GAE) {
+            // [ifndef gae]
+            final Pipe pipe = Pipe.open();
+            final Application application = Application.getCurrent();
+
+            // Get a thread that will handle the task of continuously
+            // writing the representation into the input side of the pipe
+            application.getTaskService().execute(new Runnable() {
+                public void run() {
+                    try {
+                        WritableByteChannel wbc = pipe.sink();
+                        representation.write(wbc);
+                        wbc.close();
+                    } catch (IOException ioe) {
+                        Context.getCurrentLogger().log(Level.FINE,
+                                ""Error while writing to the piped channel."",
+                                ioe);
+                    }
                 }
-            }
-        });
+            });
 
-        return pipe.source();
+            return pipe.source();
+            // [enddef]
+        } else {
+            Context
+                    .getCurrentLogger()
+                    .log(
+                            Level.WARNING,
+                            ""The GAE edition is unable to return a channel for a representation given its write(WritableByteChannel) method."");
+            return null;
+        }
     }
 
     /**
@@ -180,25 +192,40 @@ public static Reader getReader(InputStream stream, CharacterSet characterSet)
      */
     public static Reader getReader(final WriterRepresentation representation)
             throws IOException {
-        final PipedWriter pipedWriter = new PipedWriter();
-        final PipedReader pipedReader = new PipedReader(pipedWriter);
-        final Application application = Application.getCurrent();
-
-        // Gets a thread that will handle the task of continuously
-        // writing the representation into the input side of the pipe
-        application.getTaskService().execute(new Runnable() {
-            public void run() {
-                try {
-                    representation.write(pipedWriter);
-                    pipedWriter.close();
-                } catch (IOException ioe) {
-                    Context.getCurrentLogger().log(Level.FINE,
-                            ""Error while writing to the piped reader."", ioe);
+        if (Edition.CURRENT != Edition.GAE) {
+            // [ifndef gae]
+
+            final PipedWriter pipedWriter = new PipedWriter();
+            final PipedReader pipedReader = new PipedReader(pipedWriter);
+            final Application application = Application.getCurrent();
+
+            // Gets a thread that will handle the task of continuously
+            // writing the representation into the input side of the pipe
+            application.getTaskService().execute(new Runnable() {
+                public void run() {
+                    try {
+                        representation.write(pipedWriter);
+                        pipedWriter.close();
+                    } catch (IOException ioe) {
+                        Context
+                                .getCurrentLogger()
+                                .log(
+                                        Level.FINE,
+                                        ""Error while writing to the piped reader."",
+                                        ioe);
+                    }
                 }
-            }
-        });
+            });
 
-        return pipedReader;
+            return pipedReader;
+            // [enddef]
+        } else {
+            Context
+                    .getCurrentLogger()
+                    .log(Level.WARNING,
+                            ""The GAE edition is unable to return a reader for a writer representation."");
+            return null;
+        }
     }
 
     /**"
cf60c6c5c3913aa655c3e138f7bd52f96209f781,fozziethebeat$s-space,"Lots and lots of bug fixes with a few minor functionality enhancements.
modified:   src/main/java/edu/ucla/sspace/common/Similarity.java
- Added warnings for invalid KL-divergence computations
- Added Kruskal-Goodman Gamma
- Discovered Spearman's rho and Kendall's tau are both wrong (not fixed)  :(
modified:   src/main/java/edu/ucla/sspace/common/statistics/LogLikelihoodTest.java
- Fixed implementation
new file:   src/main/java/edu/ucla/sspace/graph/ChineseWhispersClustering.java
- Added CW clustering, but it doesn't appear to produce the same results as the
existing code (needs investigation)
modified:   src/main/java/edu/ucla/sspace/graph/GraphIO.java
- Tweaked logging
modified:   src/main/java/edu/ucla/sspace/graph/LinkClustering.java
- Made thread count based on processors instead of fixed
new file:   src/main/java/edu/ucla/sspace/graph/SimpleWeightedDirectedTypedEdge.java
new file:   src/main/java/edu/ucla/sspace/graph/SimpleWeightedTypedEdge.java
new file:   src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedEdgeSet.java
new file:   src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSet.java
new file:   src/main/java/edu/ucla/sspace/graph/WeightedDirectedMultigraph.java
modified:   src/main/java/edu/ucla/sspace/graph/WeightedDirectedTypedEdge.java
- Added partial support for weighted multigraphs.  More features are probably needed eventually
modified:   src/main/java/edu/ucla/sspace/graph/io/EdgeListReader.java
- Added better logging instead of printf
new file:   src/main/java/edu/ucla/sspace/graph/io/GraphMLReader.java
- Added initial GraphML implementation for reading large GraphML files.  Only partial support is in place
modified:   src/main/java/edu/ucla/sspace/index/DefaultPermutationFunction.java
- Fixed outstanding bug.  Not sure how the bug was there in the first place, as
the code was currently very broken in an odd way.
new file:   src/main/java/edu/ucla/sspace/text/AnnotatedDocument.java
- Added support for a new document that has a creation date and a label
new file:   src/main/java/edu/ucla/sspace/text/BufferedFileListDocumentIterator.java
- Added a new iterator that pre-caches the contents of files in a file list
using a separate thread to cut down on disk I/O
modified:   src/main/java/edu/ucla/sspace/text/FileDocument.java
- Added support for a document back by a file whose contents are loaded into memory on demand
new file:   src/main/java/edu/ucla/sspace/tools/IterativeBigramExtractor.java
- Added a tool for finding statistical associations between terms in an
iterative pair-wise manner
new file:   src/main/java/edu/ucla/sspace/tools/LinkClusteringTool.java
- Copied over code from the SVN branch for running link clustering from a jar
modified:   src/main/java/edu/ucla/sspace/util/CombinedIterator.java
- Corrected the Exception to be thrown in remove()
modified:   src/main/java/edu/ucla/sspace/util/HashMultiMap.java
- Correct a few errors in removing keys during iterator
- Fixed a bug where null was returned instead of the empty set
new file:   src/main/java/edu/ucla/sspace/util/KrippendorffsAlpha.java
- Added a partial implementation of Krippendorff's alpha for ordinal-valued data
modified:   src/main/java/edu/ucla/sspace/util/MultiMap.java
- Clarified the javadoc
modified:   src/main/java/edu/ucla/sspace/util/ObjectCounter.java
- Implemented max() and min()
modified:   src/main/java/edu/ucla/sspace/util/Pair.java
- Made Serializable
modified:   src/main/java/edu/ucla/sspace/util/SetDecorator.java
- Clarified javadoc
new file:   src/test/java/edu/ucla/sspace/graph/ChineseWhispersTest.java
new file:   src/test/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSetTest.java
new file:   src/test/java/edu/ucla/sspace/graph/WeightedDirectedMultigraphTest.java
- More unit tests
modified:   src/test/java/edu/ucla/sspace/index/DefaultPermutationFunctionTest.java
- Added some debugging output
",p,https://github.com/fozziethebeat/s-space,"diff --git a/src/main/java/edu/ucla/sspace/common/Similarity.java b/src/main/java/edu/ucla/sspace/common/Similarity.java
index 114d3adb..95ab5278 100644
--- a/src/main/java/edu/ucla/sspace/common/Similarity.java
+++ b/src/main/java/edu/ucla/sspace/common/Similarity.java
@@ -1763,9 +1763,14 @@ public static double klDivergence(DoubleVector a, DoubleVector b) {
                 double aValue = a.get(i);
                 double bValue = b.get(i);
 
+                if (bValue == 0)
+                    throw new IllegalArgumentException(
+                        ""The KL-divergence is not defined when a[i] > 0 and "" +
+                        ""b[i] == 0."");
+
                 // Ignore values from b that are zero, since they would cause a
                 // divide by zero error.
-                if (aValue != 0d && bValue != 0d)
+                else if (aValue != 0d)
                     divergence += aValue * Math.log(aValue / bValue);
             }
         }
@@ -1803,9 +1808,14 @@ public static double klDivergence(IntegerVector a, IntegerVector b) {
                 double aValue = a.get(index);
                 double bValue = b.get(index);
 
+                if (bValue == 0)
+                    throw new IllegalArgumentException(
+                        ""The KL-divergence is not defined when a[i] > 0 and "" +
+                        ""b[i] == 0."");
+
                 // Ignore values from b that are zero, since they would cause a
                 // divide by zero error.
-                if (bValue != 0d)
+                else if (aValue != 0d)
                     divergence += aValue * Math.log(aValue / bValue);
             }
         }
@@ -1815,9 +1825,14 @@ public static double klDivergence(IntegerVector a, IntegerVector b) {
                 double aValue = a.get(i);
                 double bValue = b.get(i);
 
+                if (bValue == 0)
+                    throw new IllegalArgumentException(
+                        ""The KL-divergence is not defined when a[i] > 0 and "" +
+                        ""b[i] == 0."");
+
                 // Ignore values from b that are zero, since they would cause a
                 // divide by zero error.
-                if (aValue != 0d && bValue != 0d)
+                else if (aValue != 0d)
                     divergence += aValue * Math.log(aValue / bValue);
             }
         }
@@ -1855,9 +1870,14 @@ public static double klDivergence(Vector a, Vector b) {
                 double aValue = a.getValue(index).doubleValue();
                 double bValue = b.getValue(index).doubleValue();
 
+                if (bValue == 0)
+                    throw new IllegalArgumentException(
+                        ""The KL-divergence is not defined when a[i] > 0 and "" +
+                        ""b[i] == 0."");
+
                 // Ignore values from b that are zero, since they would cause a
                 // divide by zero error.
-                if (bValue != 0d)
+                else if (aValue != 0d)
                     divergence += aValue * Math.log(aValue / bValue);
             }
         }
@@ -1866,10 +1886,13 @@ public static double klDivergence(Vector a, Vector b) {
             for (int i = 0; i < a.length(); ++i) {
                 double aValue = a.getValue(i).doubleValue();
                 double bValue = b.getValue(i).doubleValue();
-
-                // Ignore values from b that are zero, since they would cause a
+                if (bValue == 0)
+                    throw new IllegalArgumentException(
+                        ""The KL-divergence is not defined when a[i] > 0 and "" +
+                        ""b[i] == 0."");
+                // Ignore values from a that are zero, since they would cause a
                 // divide by zero error.
-                if (aValue != 0d && bValue != 0d)
+                else if (aValue != 0d)
                     divergence += aValue * Math.log(aValue / bValue);
             }
         }
@@ -1900,9 +1923,13 @@ public static double klDivergence(double[] a, double[] b) {
 
         // Iterate over all values and ignore any that are zero.
         for (int i = 0; i < a.length; ++i) {
-            // Ignore values from b that are zero, since they would cause a
+            // Ignore values from a that are zero, since they would cause a
             // divide by zero error.
-            if (a[i] != 0d && b[i] != 0d)
+            if (b[i] == 0d) 
+                throw new IllegalArgumentException(
+                    ""The KL-divergence is not defined when a[i] > 0 and "" +
+                    ""b[i] == 0."");
+            else if (a[i] != 0d)
                 divergence += a[i] * Math.log(a[i]/ b[i]);
         }
 
@@ -1932,10 +1959,14 @@ public static double klDivergence(int[] a, int[] b) {
 
         // Iterate over all values and ignore any that are zero.
         for (int i = 0; i < a.length; ++i) {
-            // Ignore values from b that are zero, since they would cause a
+            // Ignore values from a that are zero, since they would cause a
             // divide by zero error.
-            if (a[i] != 0d && b[i] != 0d)
-                divergence += a[i] * Math.log(a[i]/ (double)(b[i]));
+            if (b[i] == 0d) 
+                throw new IllegalArgumentException(
+                    ""The KL-divergence is not defined when a[i] > 0 and "" +
+                    ""b[i] == 0."");
+            else if (a[i] != 0d)
+                divergence += a[i] * Math.log(a[i]/ b[i]);
         }
 
         return divergence;
@@ -2149,6 +2180,56 @@ public static double kendallsTau(IntegerVector a, IntegerVector b) {
             return n / d;
     }
 
+
+    /**
+     * Computes the <a
+     * href=""http://www.unesco.org/webworld/idams/advguide/Chapt4_2.htm"">Goodman-Kruskal
+     * Gamma coefficient</a>, which is preferrable to Kendall's &tau; and
+     * Spearman's &rho; when there are many ties in the data.
+     *
+     * @throws IllegalArgumentException when the length of the two vectors are
+     *                                   not the same.
+     */
+    public static double goodmanKruskalGamma(DoubleVector a, DoubleVector b) {
+        check(a, b);
+        // NOTE: slow n^2 version.  Needs to be replaced at some point with the
+        // n-log-n method and to take into account sparse vectors. -jurgens
+        int length = a.length();
+        double numerator = 0;
+        
+        int concordant = 0;
+        int discordant = 0;
+
+        // For all pairs, track how many pairs satisfy the ordering
+        for (int i = 0; i < length; ++i) {
+            for (int j = i+1; j < length; ++j) {
+                // NOTE: this value will be 1 if there exists an match or
+                // ""concordance"" in the ordering of the two pairs.  Otherwise
+                // it, will be a -1 of the pairs are not matched or are
+                // ""discordant.
+                double ai = a.get(i);
+                double aj = a.get(j);
+                double bi = b.get(i);
+                double bj = b.get(j);
+
+                // If there was a tied rank, don't count the comparisons towards
+                // the concordance totals
+                if (ai != aj && bi != bj) {
+                    if ((ai < aj && bi < bj) || (ai > aj && bi > bj))
+                        concordant++;
+                    else
+                        discordant++;
+                }
+            }
+        }
+        
+        int cd = concordant + discordant;
+        return (cd == 0) 
+            ? 0
+            : ((double)(concordant - discordant)) / cd;
+    }
+
+
     /**
      * Returns the Tanimoto coefficient of the two {@code double} array instances.
      *
diff --git a/src/main/java/edu/ucla/sspace/common/statistics/LogLikelihoodTest.java b/src/main/java/edu/ucla/sspace/common/statistics/LogLikelihoodTest.java
index 9d53cb7f..c1c65939 100644
--- a/src/main/java/edu/ucla/sspace/common/statistics/LogLikelihoodTest.java
+++ b/src/main/java/edu/ucla/sspace/common/statistics/LogLikelihoodTest.java
@@ -27,6 +27,56 @@ public class LogLikelihoodTest implements SignificanceTest {
      * Returns the log-likelihood test statistic
      */
     public double score (int both, int justA, int justB, int neither) {
+       
+        double rowEntropy = entropy(both, justA) + entropy(justB, neither);
+        double columnEntropy = entropy(both, justB) + entropy(justA, neither);
+        double matrixEntropy = entropy(both, justA, justB, neither);
+        return 2 * (matrixEntropy - rowEntropy - columnEntropy);
+    }             
+
+    private static double entropy(int x, int y) {
+        assert x >= 0 && y >= 0 : ""negative counts"";
+        double sum = x + y;
+
+        double result = 0.0;        
+        result += (x == 0) ? 0 : x * (Math.log(x) / sum);
+        result += (y == 0) ? 0 : y * (Math.log(y) / sum);
+        return -result;
+    }
+
+    private static double entropy(int a, int b, int c, int d) {
+        assert a >= 0 && b >= 0 && c >= 0 && d >= 0 : ""negative counts"";
+        double sum = a + b + c + d;
+
+        double result = 0.0;        
+        result += (a == 0) ? 0 : a * (Math.log(a) / sum);
+        result += (b == 0) ? 0 : b * (Math.log(b) / sum);
+        result += (c == 0) ? 0 : c * (Math.log(c) / sum);
+        result += (d == 0) ? 0 : d * (Math.log(d) / sum);
+        return -result;
+    }
+       
+        /*
+
+        double ll = 2 *
+            both    * Math.log( (both / (double)row1sum) / (col1sum / sum)) +
+            justA   * Math.log( (justA / (double)row1sum) / (col2sum / sum)) +
+            justB   * Math.log( (justB / (double)row2sum) / (col1sum / sum)) +
+            neither * Math.log( (neither / (double)row2sum) / (col2sum / sum));
+
+        System.out.printf(""%d\t%d%n%d\t%d%n  = 2 * (%f + %f + %f + %f)%n"",
+                          both, justA, justB, neither, 
+                          both    * Math.log( (both / (double)row1sum) / (col1sum / sum)),
+                          justA   * Math.log( (justA / (double)row1sum) / (col2sum / sum)),
+                          justB   * Math.log( (justB / (double)row2sum) / (col1sum / sum)),
+                          neither * Math.log( (neither / (double)row2sum) / (col2sum / sum)));
+                                                    
+
+
+        return ll;        
+        */    
+
+        /*
         int col1sum = both + justA;    // t[0] + t[2];
         int col2sum = justB + neither; // t[1] + t[3];
         int row1sum = both + justB;    // t[0] + t[1];
@@ -44,5 +94,8 @@ public double score (int both, int justA, int justB, int neither) {
              (justB * Math.log(justB - bExp))  +
              (justA * Math.log(justA - cExp))  +
              (neither * Math.log(neither - dExp)));
-    }
+        */
+
+        
+
 }
diff --git a/src/main/java/edu/ucla/sspace/graph/ChineseWhispersClustering.java b/src/main/java/edu/ucla/sspace/graph/ChineseWhispersClustering.java
new file mode 100644
index 00000000..8b96e766
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/ChineseWhispersClustering.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2011 David Jurgens 
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import edu.ucla.sspace.common.Similarity;
+
+import edu.ucla.sspace.clustering.Assignment;
+import edu.ucla.sspace.clustering.Merge;
+import edu.ucla.sspace.clustering.SoftAssignment;
+
+import edu.ucla.sspace.util.Counter;
+import edu.ucla.sspace.util.HashMultiMap;
+import edu.ucla.sspace.util.HashIndexer;
+import edu.ucla.sspace.util.Indexer;
+import edu.ucla.sspace.util.MultiMap;
+import edu.ucla.sspace.util.ObjectCounter;
+import edu.ucla.sspace.util.Pair;
+import edu.ucla.sspace.util.WorkQueue;
+
+import edu.ucla.sspace.util.primitive.IntIterator;
+import edu.ucla.sspace.util.primitive.IntSet;
+import edu.ucla.sspace.util.primitive.IntIntMultiMap;
+import edu.ucla.sspace.util.primitive.IntIntHashMultiMap;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import gnu.trove.iterator.TIntDoubleIterator;
+import gnu.trove.map.TIntDoubleMap;
+import gnu.trove.map.hash.TIntDoubleHashMap;
+import gnu.trove.set.TIntSet;
+import gnu.trove.set.hash.TIntHashSet;
+
+import static edu.ucla.sspace.util.LoggerUtil.verbose;
+import static edu.ucla.sspace.util.LoggerUtil.veryVerbose;
+
+/**
+ * @author David Jurgens 
+ */
+public class ChineseWhispersClustering implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The logger to which clustering status updates will be written.
+     */
+    private static final Logger LOGGER =
+        Logger.getLogger(LinkClustering.class.getName());
+       
+    private static final String PROPERTY_PREFIX =
+        ""edu.ucla.sspace.graph.LinkClustering"";
+
+    private static final int DEFAULT_MAX_ITERATIONS = 100;
+
+    private static final double DEFAULT_RANDOM_ASSIGNMENT_PROB = 0d;
+
+    private static final Random RANDOM = new Random();
+
+    /**
+     *
+     */
+    public <E extends Edge> MultiMap<Integer,Integer> cluster(Graph<E> graph) {
+        return cluster(graph, DEFAULT_MAX_ITERATIONS, 
+                       DEFAULT_RANDOM_ASSIGNMENT_PROB);
+    }
+
+    /**
+     *
+     */
+    public <E extends Edge> MultiMap<Integer,Integer> 
+                      cluster(Graph<E> graph, int maxIterations) {
+        return cluster(graph, maxIterations, DEFAULT_RANDOM_ASSIGNMENT_PROB);
+    }
+
+    /**
+     *
+     */
+    public <E extends Edge> MultiMap<Integer,Integer> 
+                      cluster(Graph<E> graph, int maxIterations, 
+                              double randomAssignmentProb) {
+        if (!areVerticesContiguous(graph))
+            throw new IllegalArgumentException(
+                ""Graph vertex indices must be contiguous"");
+
+        int[] vertexAssignments = new int[graph.order()];
+        int[] vertices = new int[graph.order()];
+        for (int i = 0; i < vertices.length; ++i) {
+            vertices[i] = i;
+            vertexAssignments[i] = i;
+        }
+
+        boolean assignmentsChanged = true;
+        for (int iter = 0; iter < maxIterations && assignmentsChanged; ++iter) {
+            assignmentsChanged = false;
+            
+            // Shuffle the order in which the vertices will be accessed
+            shuffle(vertices);
+
+            for (int i = 0; i < vertices.length; ++i) {
+                int vertex = vertices[i];
+                // Get the neighbors of the current vertex and identify which
+                // class label is the maximum from the neighbors
+                int maxClass = (graph instanceof WeightedGraph) 
+                    ? getMaxClassWeighted(vertex, vertexAssignments,
+                        (WeightedGraph<? extends WeightedEdge>)graph)
+                    : getMaxClass(vertex, vertexAssignments, graph);
+                int oldClass = vertexAssignments[vertex];
+                if (oldClass != maxClass) {
+                    vertexAssignments[vertex] = maxClass;
+                    assignmentsChanged = true;
+                }
+            }
+        }
+
+        MultiMap<Integer,Integer> toReturn = 
+            new HashMultiMap<Integer,Integer>();
+        for (int i = 0; i < vertices.length; ++i) 
+            toReturn.put(i, vertexAssignments[i]);
+        return toReturn;
+    }
+
+    static <E extends Edge> boolean areVerticesContiguous(Graph<E> g) {
+        return true;
+    }
+
+    static int getMaxClass(int v, int[] vertexAssignments, Graph g) {
+        IntSet neighbors = g.getNeighbors(v);
+        IntIterator iter = neighbors.iterator();
+        Counter<Integer> classes = new ObjectCounter<Integer>();
+        classes.count(vertexAssignments[v]);
+        while (iter.hasNext()) {
+            int n = iter.nextInt();
+            classes.count(vertexAssignments[n]);
+        }
+
+        TIntSet ties = new TIntHashSet();
+        int max = 0;
+        for (Map.Entry<Integer,Integer> e : classes) {
+            int clazz = e.getKey();
+            int count = e.getValue();
+            if (count > max) {
+                ties.clear();
+                max = count;
+            }
+            if (count == max)
+                ties.add(clazz);
+        }
+
+        int[] options = ties.toArray(new int[ties.size()]);
+        return (options.length == 1)
+            ? options[0]
+            : options[RANDOM.nextInt(options.length)];
+    }
+
+    static <E extends WeightedEdge> int 
+                      getMaxClassWeighted(int v, int[] vertexAssignments, 
+                                          WeightedGraph<E> g) {
+        Set<E> edges = g.getAdjacencyList(v);
+        TIntDoubleMap classSums = new TIntDoubleHashMap();
+        for (WeightedEdge e : edges) {
+            int n = (e.to() == v) ? e.from() : e.to();
+            int nClass = vertexAssignments[n];
+            double weight = e.weight();
+            if (classSums.containsKey(nClass)) {
+                double curWeight = classSums.get(nClass);
+                classSums.put(nClass, weight + curWeight);
+            }
+            else {
+                classSums.put(nClass, weight);
+            }
+        }
+
+        double maxSum = -1d;
+        TIntSet ties = new TIntHashSet();
+        TIntDoubleIterator iter = classSums.iterator();
+        while (iter.hasNext()) {
+            iter.advance();
+            double weight = iter.value();
+            if (weight > maxSum) {
+                maxSum = weight;
+                ties.clear();
+            }
+            if (weight == maxSum)
+                ties.add(iter.key());
+            
+        }
+        
+        // If there wasn't a tie after all
+        int[] options = ties.toArray();
+        return (options.length == 1)
+            ? options[0]
+            : options[RANDOM.nextInt(options.length)];
+    }
+
+    /**
+     * Randomly shuffles the contents of the provided array
+     */
+    static void shuffle(int[] arr) {
+        int size = arr.length;
+        for (int i = size; i > 1; i--) {
+            int tmp = arr[i-1];
+            int r = RANDOM.nextInt(i);
+            arr[i-1] = arr[r];
+            arr[r] = tmp;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/graph/GraphIO.java b/src/main/java/edu/ucla/sspace/graph/GraphIO.java
index 8d3eba4f..c2ea24c9 100644
--- a/src/main/java/edu/ucla/sspace/graph/GraphIO.java
+++ b/src/main/java/edu/ucla/sspace/graph/GraphIO.java
@@ -214,7 +214,8 @@ else if (line.length() == 0)
                 g.add(new SimpleEdge(v1, v2));
 
             if (lineNo % 100000 == 0)
-                veryVerbose(LOGGER, ""Read %d lines from %s"", lineNo, f);
+                veryVerbose(LOGGER, ""Read %d lines from %s, kept %d edges"", 
+                            lineNo, f, g.size());
         }
         verbose(LOGGER, ""Read directed graph with %d vertices and %d edges"", 
                 g.order(), g.size());
diff --git a/src/main/java/edu/ucla/sspace/graph/LinkClustering.java b/src/main/java/edu/ucla/sspace/graph/LinkClustering.java
index efb0f40b..ab63fac8 100644
--- a/src/main/java/edu/ucla/sspace/graph/LinkClustering.java
+++ b/src/main/java/edu/ucla/sspace/graph/LinkClustering.java
@@ -122,7 +122,7 @@ public class LinkClustering implements java.io.Serializable {
      * The work used by all {@code LinkClustering} instances to perform
      * multi-threaded operations.
      */
-    private static final WorkQueue WORK_QUEUE = WorkQueue.getWorkQueue(8);    
+    private static final WorkQueue WORK_QUEUE = WorkQueue.getWorkQueue();    
 
     /**
      * Instantiates a new {@code LinkClustering} instance.
diff --git a/src/main/java/edu/ucla/sspace/graph/SimpleWeightedDirectedTypedEdge.java b/src/main/java/edu/ucla/sspace/graph/SimpleWeightedDirectedTypedEdge.java
new file mode 100644
index 00000000..000d4299
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/SimpleWeightedDirectedTypedEdge.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+/**
+ * An implementation of a {@link TypedEdge}.
+ */
+public class SimpleWeightedDirectedTypedEdge<T> 
+    implements WeightedDirectedTypedEdge<T>, java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final int from;
+
+    private final int to;
+
+    private final T type;
+
+    private final double weight;
+
+    public SimpleWeightedDirectedTypedEdge(T edgeType, int from, 
+                                           int to, double weight) {
+        this.type = edgeType;
+        if (type == null)
+            throw new NullPointerException(""edge type cannot be null"");
+        this.from = from;
+        this.to = to;
+        this.weight = weight;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings(""unchecked"")
+    public <E extends Edge> E clone(int from, int to) {
+        return (E)(new SimpleWeightedDirectedTypedEdge<T>(
+                       type, from, to, weight));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public T edgeType() {
+        return type;
+    }
+    
+    /**
+     * Returns {@code true} if {@code o} is an {@link TypedEdge} with the same
+     * edge type and has the same vertices (independent of that edge's
+     * orientation).
+     */
+    public boolean equals(Object o) {
+        if (o instanceof Edge) {
+            WeightedDirectedTypedEdge<?> e = (WeightedDirectedTypedEdge)o;
+            return e.weight() == weight
+                && e.from() == from
+                && e.to() == to
+                && e.edgeType().equals(type);
+        }
+        return false;
+    }
+
+    public int hashCode() {
+        return from ^ to;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings(""unchecked"")
+    public <E extends Edge> E flip() {
+        return (E)(new SimpleWeightedDirectedTypedEdge<T>(
+                       type, to, from, weight));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int from() {
+        return from;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int to() { 
+        return to;
+    }
+
+    public String toString() {
+        return ""("" + from + ""<-->"" + to + "")["" + weight + ""]:"" + type;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public double weight() {
+        return weight;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/graph/SimpleWeightedTypedEdge.java b/src/main/java/edu/ucla/sspace/graph/SimpleWeightedTypedEdge.java
new file mode 100644
index 00000000..67c78a9d
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/SimpleWeightedTypedEdge.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+/**
+ * An implementation of a {@link TypedEdge}.
+ */
+public class SimpleWeightedTypedEdge<T> 
+    implements WeightedTypedEdge<T>, java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final int from;
+
+    private final int to;
+
+    private final T type;
+
+    private final double weight;
+
+    public SimpleWeightedTypedEdge(T edgeType, int from, 
+                                   int to, double weight) {
+        this.type = edgeType;
+        if (type == null)
+            throw new NullPointerException(""edge type cannot be null"");
+        this.from = from;
+        this.to = to;
+        this.weight = weight;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings(""unchecked"")
+    public <E extends Edge> E clone(int from, int to) {
+        return (E)(new SimpleWeightedDirectedTypedEdge<T>(
+                       type, from, to, weight));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public T edgeType() {
+        return type;
+    }
+    
+    /**
+     * Returns {@code true} if {@code o} is an {@link TypedEdge} with the same
+     * edge type and has the same vertices (independent of that edge's
+     * orientation).
+     */
+    public boolean equals(Object o) {
+        if (o instanceof Edge) {
+            WeightedDirectedTypedEdge<?> e = (WeightedDirectedTypedEdge)o;
+            return e.weight() == weight
+                && e.from() == from
+                && e.to() == to
+                && e.edgeType().equals(type);
+        }
+        return false;
+    }
+
+    public int hashCode() {
+        return from ^ to;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings(""unchecked"")
+    public <E extends Edge> E flip() {
+        return (E)(new SimpleWeightedDirectedTypedEdge<T>(
+                       type, to, from, weight));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int from() {
+        return from;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int to() { 
+        return to;
+    }
+
+    public String toString() {
+        return ""("" + from + ""<-->"" + to + "")["" + weight + ""]:"" + type;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public double weight() {
+        return weight;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedEdgeSet.java b/src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedEdgeSet.java
new file mode 100644
index 00000000..72ef5ba8
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedEdgeSet.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import edu.ucla.sspace.util.CombinedIterator;
+
+import edu.ucla.sspace.util.primitive.IntIterator;
+import edu.ucla.sspace.util.primitive.IntSet;
+import edu.ucla.sspace.util.primitive.TroveIntSet;
+
+import gnu.trove.TDecorators;
+import gnu.trove.iterator.TIntDoubleIterator;
+import gnu.trove.map.TIntDoubleMap;
+import gnu.trove.map.hash.TIntDoubleHashMap;
+import gnu.trove.set.TIntSet;
+
+
+/**
+ * A set for containing {@link WeightedEdge} instances.  Note that the equality
+ * condition for {@link WeightedEdge} is treated specially in this set such that
+ * two vertices will only have at most one edge between them.  If an edge exists
+ * for vertices {@code i} and {@code j} with weight {@code w}<sub>1</sub>, then
+ * adding a new edge to the same vertices with weight {@code w}<sub>2</sub> will
+ * not add a parallel edge and increase the size of this set, even though the
+ * edges are not equal.  Rather, the weight on the edge between the two vertices
+ * is changed to {@code w}<sub>2</sub>.  Similarly, any contains or removal
+ * operation will return its value based on the {@code WeightedEdge}'s vertices
+ * but not on the weight of the edge itself.
+ */
+public abstract class SparseWeightedDirectedEdgeSet extends AbstractSet<WeightedEdge> 
+        implements EdgeSet<WeightedEdge>, java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+//     // IMPLEMENTATION NOTE: the TIntDoubleMap operations will return 0 for
+//     // methods that would normally return null if the key was not present.  For
+//     // example, remove() could return 0 if either the key was mapped to 0, or if
+//     // the key was not already present.  Therefore, we precede most of these
+//     // calls with a containsKey operation to ensure that this class's return
+//     // values are correct.
+
+//     /**
+//      * The vertex that is connected to all the edges in this set
+//      */
+//     private final int rootVertex;
+
+//     /**
+//      * The mapping from set of vertices that have an edge to the root vertex,
+//      * with the weight associated with each connection.
+//      */
+//     private final TIntDoubleMap inEges;
+
+//     /**
+//      * The mapping from set of vertices that have an edge from the root vertex,
+//      * with the weight associated with each connection.
+//      */
+//     private final TIntDoubleMap outEges;
+    
+//     /**
+//      * Creates a new {@code SparseWeightedEdgeSet} where all edges in this set
+//      * must connect to {@code rootVertex}.
+//      */
+//     public SparseWeightedEdgeSet(int rootVertex) {
+//         this.rootVertex = rootVertex;
+//         inEdges = new TIntDoubleHashMap();
+//         outEdges = new TIntDoubleHashMap();
+//     }
+    
+//     /**
+//      * Adds the edge to this set if one of the vertices is the root vertex.
+//      * 
+//      * @return {@code true} if e was added or if the weight was changed for the
+//      *         conenction between an existing edge that matched
+//      */
+//     public boolean add(WeightedEdge e) {
+//         if (e.from() == rootVertex) {
+//             double w = e.weight();
+//             int toAdd = e.to();
+//             if (edges.containsKey(toAdd)) {
+//                 double w2 = edges.put(toAdd, w);
+//                 // The weight was changed but a new edge was not added
+//                 return false;
+//             }
+//             else {
+//                 edges.put(toAdd, w);
+//                 return true;
+//             }
+//         }
+//         else if (e.to() == rootVertex) {
+//             double w = e.weight();
+//             int toAdd = e.from();
+//             if (edges.containsKey(toAdd)) {
+//                 double w2 = edges.put(toAdd, w);
+//                 // The weight was changed but a new edge was not added
+//                 return false;
+//             }
+//             else {
+//                 edges.put(toAdd, w);
+//                 return true;
+//         }
+//         else 
+//             return false;
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public IntSet connected() {
+//         return new CombinedSet();
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public boolean connects(int vertex) {
+//         return inEdges.contains(vertex) || outEdges.contains(vertex);
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public boolean contains(Object o) {
+//         if (o instanceof WeightedEdge && o instanceof DirectedEdge) {
+//             WeightedEdge e = (WeightedEdge)o;
+//             int toFind = 0;
+//             if (e.to() == rootVertex) {
+//                 return inEdge.containsKey(e.from()) 
+//                     && inEdges.get(e.from()) == e.weight();
+//             }
+//             else if (e.from() == rootVertex) {
+//                 return outEdge.containsKey(e.to()) 
+//                     && outEdges.get(e.to()) == e.weight();
+//             }
+//             else 
+//                 return false;            
+//         }
+//         return false;
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public SparseWeightedEdgeSet copy(IntSet vertices) {        
+//         // REMINDER: optimize this
+//         SparseWeightedDirectedEdgeSet copy = new SparseWeightedDirectedEdgeSet(rootVertex);
+//         IntIterator iter = vertices.iterator();
+//         while (iter.hasNext()) {
+//             int v = iter.nextInt();
+//             if (inEdges.containsKey(v))
+//                 copy.inEdges.put(v, inEdges.get(v));
+//             if (ouEdges.containsKey(v))
+//                 copy.outEdges.put(v, outedges.get(v));
+//         }
+//         return copy;
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public int disconnect(int vertex) {
+//         int removed = 0;
+//         if (inEdges.remove(vertex))
+//             removed++;
+//         if (outEdges.remove(vertex))
+//             removed++;
+//         return removed;
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public Set<WeightedEdge> getEdges(int vertex) {
+//         return new VertexEdgeSet(vertex);
+//     }    
+
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public int getRoot() {
+//         return rootVertex;
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */ 
+//     public Iterator<WeightedEdge> iterator() {
+//         return new WeightedEdgeIterator();
+//     }
+    
+//     /**
+//      * {@inheritDoc}
+//      */
+//     public boolean remove(Object o) {
+//         if (o instanceof WeightedEdge && o instanceof DirectedEdge) {
+//             WeightedEdge e = (WeightedEdge)o;
+//             if (e.to() == rootVertex) 
+//                 return inEdge.remove(e.from());
+//             else if (e.from() == rootVertex) 
+//                 return outEdge.remove(e.to()) 
+//         }
+//         return false;
+//     }
+
+//     /**
+//      * {@inheritDoc}
+//      */    
+//     public int size() {
+//         return inEdges.size() + outEdges.size();
+//     }
+
+//     /**
+//      * Returns the sum of the weights of the edges contained in this set.
+//      */
+//     public double sum() {
+//         double sum = 0;
+//         TIntDoubleIterator iter = inEdges.iterator();
+//         while (iter.hasNext()) {
+//             iter.advance();
+//             sum += iter.value();
+//         }
+//         iter = outEdges.iterator();
+//         while (iter.hasNext()) {
+//             iter.advance();
+//             sum += iter.value();
+//         }
+//         return sum;
+//     }
+
+//     /**
+//      * An iterator over the edges in this set that constructs {@link WeightedEdge}
+//      * instances as it traverses through the set of connected vertices.
+//      */
+//     private class WeightedEdgeIterator implements Iterator<WeightedEdge> {
+
+//         private TIntDoubleIterator iter;
+
+//         private boolean alreadyRemoved;
+        
+//         public WeightedEdgeIterator() {
+//             iter = edges.iterator();
+//             alreadyRemoved = false;
+//         }
+
+//         public boolean hasNext() {
+//             return iter.hasNext();
+//         }
+
+//         public WeightedEdge next() {
+//             iter.advance();
+//             alreadyRemoved = false;
+//             return new SimpleWeightedEdge(rootVertex, iter.key(), iter.value());
+//         }
+
+//         public void remove() {
+//             if (alreadyRemoved)
+//                 throw new IllegalStateException();
+//             // For some reason this doesn't through the expected Iterator API
+//             // exception, so we try/rethrow as necessary.
+//             try {
+//                 iter.remove();
+//                 alreadyRemoved = true;
+//             } catch (ArrayIndexOutOfBoundsException aioobe) {
+//                 throw new IllegalStateException();
+//             }
+//         }
+//     }    
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSet.java b/src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSet.java
new file mode 100644
index 00000000..cf3ff01d
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSet.java
@@ -0,0 +1,423 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import edu.ucla.sspace.util.CombinedIterator;
+import edu.ucla.sspace.util.DisjointSets;
+import edu.ucla.sspace.util.HashMultiMap;
+import edu.ucla.sspace.util.MultiMap;
+
+import edu.ucla.sspace.util.primitive.AbstractIntSet;
+import edu.ucla.sspace.util.primitive.IntIterator;
+import edu.ucla.sspace.util.primitive.IntSet;
+import edu.ucla.sspace.util.primitive.TroveIntSet;
+
+
+/**
+ * An {@link EdgeSet} implementation that stores {@link DirectedEdge} instances
+ * for a vertex.
+ *
+ * @author David Jurgens
+ */
+public class SparseWeightedDirectedTypedEdgeSet<T> 
+        extends AbstractSet<WeightedDirectedTypedEdge<T>> 
+        implements EdgeSet<WeightedDirectedTypedEdge<T>>, java.io.Serializable {
+
+    private final int rootVertex;
+
+    MultiMap<Integer,WeightedDirectedTypedEdge<T>> inEdges;
+    MultiMap<Integer,WeightedDirectedTypedEdge<T>> outEdges;
+
+    public SparseWeightedDirectedTypedEdgeSet(int root) {
+        this.rootVertex = root;
+        inEdges = new HashMultiMap<Integer,WeightedDirectedTypedEdge<T>>();
+        outEdges = new HashMultiMap<Integer,WeightedDirectedTypedEdge<T>>();
+    }
+
+    /**
+     * Adds the edge to this set if one of the vertices is the root vertex and
+     * if the non-root vertex has a greater index that this vertex.
+     */
+    public boolean add(WeightedDirectedTypedEdge<T> e) {
+        if (e.from() == rootVertex) {
+            Set<WeightedDirectedTypedEdge<T>> edges = outEdges.get(e.to());
+            if (edges.contains(e))
+                return false;
+
+            // We can't rely on the edge's equality method since that uses the
+            // edge weight, so we'll have to iterate over the edges to see if we
+            // have one that matches the type, and if so replace it with the
+            // different weight
+            if (!edges.isEmpty()) {
+                Iterator<WeightedDirectedTypedEdge<T>> iter = edges.iterator();
+                WeightedDirectedTypedEdge<T> existing = null;
+                while (iter.hasNext()) {
+                    WeightedDirectedTypedEdge<T> n = iter.next();
+                    if (n.to() == e.to() 
+                            && n.edgeType().equals(e.edgeType())) {
+                        existing = n;
+                        break;
+                    }
+                }
+                if (existing == null) {
+                    outEdges.put(e.to(), e);
+                    return true;                    
+                }
+                // Check if has the same weight;
+                else if (e.weight() != existing.weight()) {
+                    outEdges.remove(e.to(), existing);
+                    outEdges.put(e.to(), e);
+                    return true;
+                }
+                else 
+                    return false;
+            }
+            else 
+                return  outEdges.put(e.to(), e);
+        }
+
+        else if (e.to() == rootVertex) {
+            Set<WeightedDirectedTypedEdge<T>> edges = inEdges.get(e.from());
+            if (edges.contains(e))
+                return false;
+
+            // We can't rely on the edge's equality method since that uses the
+            // edge weight, so we'll have to iterate over the edges to see if we
+            // have one that matches the type, and if so replace it with the
+            // different weight
+            if (!edges.isEmpty()) {
+                Iterator<WeightedDirectedTypedEdge<T>> iter = edges.iterator();
+                WeightedDirectedTypedEdge<T> existing = null;
+                while (iter.hasNext()) {
+                    WeightedDirectedTypedEdge<T> n = iter.next();
+                    if (n.from() == e.from() 
+                            && n.edgeType().equals(e.edgeType())) {
+                        existing = n;
+                        break;
+                    }
+                }
+
+                if (existing == null) {
+                    inEdges.put(e.from(), e);
+                    return true;                    
+                }
+                // Check if has the same weight;
+                else if (e.weight() != existing.weight()) {
+                    inEdges.remove(e.from(), existing);
+                    inEdges.put(e.from(), e);
+                    return true;
+                }
+                return false;
+            }
+            else 
+                return inEdges.put(e.from(), e);
+        }
+        return false;
+    }    
+
+    /**
+     * {@inheritDoc}
+     */
+    public void clear() {
+        inEdges.clear();
+        outEdges.clear();
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public IntSet connected() {
+        TroveIntSet t = new TroveIntSet();
+        t.addAll(inEdges.keySet());
+        t.addAll(outEdges.keySet());
+        return t;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean connects(int vertex) {
+        return inEdges.containsKey(vertex) || outEdges.containsKey(vertex);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean connects(int vertex, T type) {
+        if (inEdges.containsKey(vertex)) {
+            for (WeightedDirectedTypedEdge<T> e : inEdges.get(vertex)) {
+                if (e.edgeType().equals(type))
+                    return true;
+            }
+        }
+        else if (outEdges.containsKey(vertex)) {
+            for (WeightedDirectedTypedEdge<T> e : outEdges.get(vertex)) {
+                if (e.edgeType().equals(type))
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean contains(Object o) {
+        if (!(o instanceof WeightedDirectedTypedEdge))
+            return false;
+
+        @SuppressWarnings(""unchecked"")
+        WeightedDirectedTypedEdge<T> e = (WeightedDirectedTypedEdge<T>)o;
+
+        if (e.from() == rootVertex) {
+            Set<WeightedDirectedTypedEdge<T>> edges = outEdges.get(e.to());
+            return edges.contains(e);
+        }
+
+        else if (e.to() == rootVertex) {
+            Set<WeightedDirectedTypedEdge<T>> edges = inEdges.get(e.from());
+            return edges.contains(e);
+        }
+        return false;
+        
+    }
+
+    public SparseWeightedDirectedTypedEdgeSet<T> copy(IntSet vertices) {
+        throw new Error();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int disconnect(int vertex) {
+        Set<WeightedDirectedTypedEdge<T>> in = inEdges.remove(vertex);
+        Set<WeightedDirectedTypedEdge<T>> out = outEdges.remove(vertex);
+        return in.size() + out.size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getEdges(T type) {
+        Set<WeightedDirectedTypedEdge<T>> edges =
+            new HashSet<WeightedDirectedTypedEdge<T>>();
+        for (WeightedDirectedTypedEdge<T> e : inEdges.values())
+            if (e.edgeType().equals(type))
+                edges.add(e);
+        for (WeightedDirectedTypedEdge<T> e : outEdges.values())
+            if (e.edgeType().equals(type))
+                edges.add(e);
+        return edges;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getEdges(Set<T> types) {
+        Set<WeightedDirectedTypedEdge<T>> edges =
+            new HashSet<WeightedDirectedTypedEdge<T>>();
+        for (WeightedDirectedTypedEdge<T> e : inEdges.values())
+            if (types.contains(e.edgeType()))
+                edges.add(e);
+        for (WeightedDirectedTypedEdge<T> e : outEdges.values())
+            if (types.contains(e.edgeType()))
+                edges.add(e);
+        return edges;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getEdges(int vertex) {
+        DisjointSets<WeightedDirectedTypedEdge<T>> edges =
+            new DisjointSets<WeightedDirectedTypedEdge<T>>();
+        edges.append(inEdges.get(vertex));
+        edges.append(outEdges.get(vertex));
+        return edges;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getEdges(int vertex, Set<T> types) {
+        Set<WeightedDirectedTypedEdge<T>> edges =
+            new HashSet<WeightedDirectedTypedEdge<T>>();
+        for (WeightedDirectedTypedEdge<T> e : inEdges.get(vertex))
+            if (types.contains(e.edgeType()))
+                edges.add(e);
+        for (WeightedDirectedTypedEdge<T> e : outEdges.get(vertex))
+            if (types.contains(e.edgeType()))
+                edges.add(e);
+        return edges;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getRoot() {
+        return rootVertex;
+    }
+
+    public Set<WeightedDirectedTypedEdge<T>> incoming() {
+        return Collections.<WeightedDirectedTypedEdge<T>>unmodifiableSet(
+            new HashSet<WeightedDirectedTypedEdge<T>>(inEdges.values()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isEmpty() {
+        return inEdges.isEmpty() && outEdges.isEmpty();
+    }
+
+    /**
+     * {@inheritDoc}
+     */ 
+    public Iterator<WeightedDirectedTypedEdge<T>> iterator() {
+        List<Iterator<WeightedDirectedTypedEdge<T>>> iters =
+            new ArrayList<Iterator<WeightedDirectedTypedEdge<T>>>();
+        iters.add(Collections.<WeightedDirectedTypedEdge<T>>
+                      unmodifiableCollection(inEdges.values()).iterator());
+        iters.add(Collections.<WeightedDirectedTypedEdge<T>>
+                      unmodifiableCollection(outEdges.values()).iterator());
+        return new CombinedIterator(iters);
+    }
+
+    public Set<WeightedDirectedTypedEdge<T>> outgoing() {
+        return Collections.<WeightedDirectedTypedEdge<T>>unmodifiableSet(
+            new HashSet<WeightedDirectedTypedEdge<T>>(outEdges.values()));
+    }
+
+    public IntSet predecessors() {
+        return new TroveIntSet(inEdges.keySet());
+    }
+
+    /**
+     * {@inheritDoc}
+     */    
+    public int size() {
+        return inEdges.range() + outEdges.range();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean remove(Object o) {
+        if (!(o instanceof WeightedDirectedTypedEdge))
+            return false;
+        
+        @SuppressWarnings(""unchecked"")
+        WeightedDirectedTypedEdge<T> e = (WeightedDirectedTypedEdge<T>)o;
+
+        if (e.from() == rootVertex) {
+            return outEdges.remove(e.to(), e);
+        }
+
+        else if (e.to() == rootVertex) {
+            return inEdges.remove(e.from(), e);
+        }
+        return false;
+    }
+
+    public IntSet successors() {
+        return new TroveIntSet(outEdges.keySet());
+    }
+
+    /**
+     * Returns the sum of the weights of the edges contained in this set.
+     */
+    public double sum() {
+        double sum = 0;
+        for (WeightedDirectedTypedEdge<T> e : inEdges.values())
+            sum += e.weight();
+        for (WeightedDirectedTypedEdge<T> e : outEdges.values())
+            sum += e.weight();
+        return sum;
+    }
+
+    /**
+     *
+     */
+    public Iterator<WeightedDirectedTypedEdge<T>> uniqueIterator() {
+        return new UniqueEdgeIterator();
+    }
+
+    /**
+     * An iterator over the edges in this set that constructs {@link
+     * DirectedTypedEdge} instances as it traverses through the set of connected
+     * vertices.
+     */
+    private class UniqueEdgeIterator 
+        implements Iterator<WeightedDirectedTypedEdge<T>> {
+
+        Iterator<WeightedDirectedTypedEdge<T>> iter;
+
+        WeightedDirectedTypedEdge<T> next;
+
+        public UniqueEdgeIterator() {
+            this.iter = iterator();
+            next = null;
+            advance();
+        }
+
+        private void advance() {
+            next = null;
+            while (next == null && iter.hasNext()) {
+                WeightedDirectedTypedEdge<T> e = iter.next();
+                boolean isInEdge = e.to() == rootVertex;
+                int otherVertex = (isInEdge) ? e.from() : e.to();
+                if (!((isInEdge && rootVertex < otherVertex)
+                      || (!isInEdge && rootVertex < otherVertex))) {
+                    continue;
+                }
+                next = e;
+            }
+        }
+
+        public boolean hasNext() {
+            return next != null;
+        }
+
+        public WeightedDirectedTypedEdge<T> next() {
+            if (next == null)
+                throw new NoSuchElementException();
+            WeightedDirectedTypedEdge<T> n = next;
+//             System.out.println(""next: "" + n);
+            advance();
+            return n;
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/src/main/java/edu/ucla/sspace/graph/WeightedDirectedMultigraph.java b/src/main/java/edu/ucla/sspace/graph/WeightedDirectedMultigraph.java
new file mode 100644
index 00000000..7c413171
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/WeightedDirectedMultigraph.java
@@ -0,0 +1,1454 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import java.lang.ref.WeakReference;
+
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+
+import edu.ucla.sspace.util.CombinedIterator;
+import edu.ucla.sspace.util.CombinedSet;
+import edu.ucla.sspace.util.DisjointSets;
+import edu.ucla.sspace.util.SetDecorator;
+
+import edu.ucla.sspace.util.primitive.AbstractIntSet;
+import edu.ucla.sspace.util.primitive.IntIterator;
+import edu.ucla.sspace.util.primitive.IntSet;
+import edu.ucla.sspace.util.primitive.PrimitiveCollections;
+import edu.ucla.sspace.util.primitive.TroveIntSet;
+
+import gnu.trove.TDecorators;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.TObjectIntMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.TIntSet;
+import gnu.trove.set.hash.TIntHashSet;
+
+
+/**
+ * A {@link WeightedGraph weighted}, {@link DirectedGraph directed} {@link
+ * Multigraph} implementation.
+ *
+ * @param T a class type whose values are used to distinguish between edge types
+ * 
+ * @author David Jurgens
+ */
+public class WeightedDirectedMultigraph<T> 
+    implements Multigraph<T,WeightedDirectedTypedEdge<T>>, 
+               DirectedGraph<WeightedDirectedTypedEdge<T>>, 
+               WeightedGraph<WeightedDirectedTypedEdge<T>>,
+               java.io.Serializable {
+    
+    private static final long serialVersionUID = 1L;
+   
+    /**
+     * The count of the type distribution for all edges in the graph.
+     */
+    private final TObjectIntMap<T> typeCounts;
+    
+    /**
+     * The set of vertices in this mutligraph.  This set is maintained
+     * independently of the vertex sets in the type-specific edge graphs to
+     * provide a fast, type independent state of which vertices are in the
+     * graph.
+     */
+    private final TIntObjectMap<SparseWeightedDirectedTypedEdgeSet<T>> vertexToEdges;
+
+    /**
+     * A collection of all the subgraphs that have been returned from this
+     * graph.  This collection is necessary to inform subgraphs of any vertex
+     * changes (removals) to this graph without requiring them to constantly
+     * check for updates.  We use a {@link WeakReference} in order to keep track
+     * of the canonical {@code Subgraph} instance while ensuring that it is
+     * garbage collected when it is no longer referred to (which would never
+     * happen if this list contained strong references).
+     */
+    private Collection<WeakReference<Subgraph>> subgraphs;
+
+    /**
+     * The number of edges contained in this graph.
+     */
+    private int size;
+    
+    /**
+     * Creates an empty graph with node edges
+     */
+    public WeightedDirectedMultigraph() { 
+        typeCounts = new TObjectIntHashMap<T>();
+        vertexToEdges = new TIntObjectHashMap<SparseWeightedDirectedTypedEdgeSet<T>>();
+        subgraphs = new ArrayList<WeakReference<Subgraph>>();
+        size = 0;
+    }
+
+    /**
+     * Creates a directed multigraph with a copy of all the vertices and edges
+     * in {@code g}.
+     */
+    public WeightedDirectedMultigraph(Graph<? extends WeightedDirectedTypedEdge<T>> g) {
+        this();
+        for (Integer v : g.vertices())
+            add(v);
+        for (WeightedDirectedTypedEdge<T> e : g.edges())
+            add(e);
+    }    
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean add(int vertex) {
+        if (!vertexToEdges.containsKey(vertex)) {
+            vertexToEdges.put(vertex, new SparseWeightedDirectedTypedEdgeSet<T>(vertex));
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean add(WeightedDirectedTypedEdge<T> e) {
+        SparseWeightedDirectedTypedEdgeSet<T> from = vertexToEdges.get(e.from());
+        if (from == null) {
+            from = new SparseWeightedDirectedTypedEdgeSet<T>(e.from());
+            vertexToEdges.put(e.from(), from);
+        }
+        if (from.add(e)) {
+            updateTypeCounts(e.edgeType(), 1);
+            SparseWeightedDirectedTypedEdgeSet<T> to = vertexToEdges.get(e.to());
+            if (to == null) {
+                to = new SparseWeightedDirectedTypedEdgeSet<T>(e.to());
+                vertexToEdges.put(e.to(), to);
+            }
+            to.add(e);
+            size++;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void clear() {
+        vertexToEdges.clear();
+        typeCounts.clear();
+        size = 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void clearEdges() { 
+        // NOTE: potentially rewrite with a Procedure if this ever needs to be
+        // optimized
+        for (SparseWeightedDirectedTypedEdgeSet<T> edges 
+                 : vertexToEdges.valueCollection())
+            edges.clear();
+        size = 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void clearEdges(T edgeType) { 
+        throw new Error();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean contains(int vertex) {
+        return vertexToEdges.containsKey(vertex);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean contains(Edge e) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(e.to());
+        return edges != null && edges.contains(e);
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public boolean contains(int vertex1, int vertex2) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex1);
+        return edges != null && edges.connects(vertex2);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean contains(int vertex1, int vertex2, T edgeType) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex2);
+        return edges != null && edges.connects(vertex2, edgeType);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public WeightedDirectedMultigraph<T> copy(Set<Integer> toCopy) {
+        // special case for If the called is requesting a copy of the entire
+        // graph, which is more easily handled with the copy constructor
+        if (toCopy.size() == order() && toCopy.equals(vertices()))
+            return new WeightedDirectedMultigraph<T>(this);
+
+        WeightedDirectedMultigraph<T> g = new WeightedDirectedMultigraph<T>();
+        for (int v : toCopy) {
+            if (!vertexToEdges.containsKey(v))
+                throw new IllegalArgumentException(
+                    ""Request copy of non-present vertex: "" + v);
+            g.add(v);
+            SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(v);
+            if (edges == null)
+                throw new IllegalArgumentException();
+            for (int v2 : toCopy) {
+                if (v == v2)
+                    break;
+                if (edges.connects(v2))
+                    for (WeightedDirectedTypedEdge<T> e : edges.getEdges(v2))
+                        g.add(e);
+            }
+        }
+        return g;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int degree(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+        return (edges == null) ? 0 : edges.size();
+    }
+
+    /**
+     * Returns the set of typed edges in the graph
+     */
+    public Set<WeightedDirectedTypedEdge<T>> edges() {
+        return new EdgeView();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> edges(T t) {
+        Set<WeightedDirectedTypedEdge<T>> edges =
+            new HashSet<WeightedDirectedTypedEdge<T>>();
+        for (SparseWeightedDirectedTypedEdgeSet<T> set :
+                 vertexToEdges.valueCollection()) {
+            Set<WeightedDirectedTypedEdge<T>> edgesOfType = set.getEdges(t);
+            if (!edgesOfType.isEmpty())
+                edges.addAll(edgesOfType);
+        }
+        return edges;
+    }
+
+    /**
+     * Returns the set of edge types currently present in this graph.
+     */
+    public Set<T> edgeTypes() {
+        return Collections.unmodifiableSet(typeCounts.keySet());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override public boolean equals(Object o) {
+        if (o instanceof WeightedDirectedMultigraph) {
+            WeightedDirectedMultigraph<?> dm = (WeightedDirectedMultigraph<?>)(o);
+            if (dm.typeCounts.equals(typeCounts)) {
+                return vertexToEdges.equals(dm.vertexToEdges);
+            }
+            return false;
+        }
+        else if (o instanceof Multigraph) {
+            @SuppressWarnings(""unchecked"")
+            Multigraph<?,TypedEdge<?>> m = (Multigraph<?,TypedEdge<?>>)o;
+            if (m.edgeTypes().equals(typeCounts.keySet())) {
+                return m.order() == order()
+                    && m.size() == size()
+                    && m.vertices().equals(vertices())
+                    && m.edges().equals(edges());
+            }
+            return false;
+        }
+        else if (o instanceof Graph) {
+            Graph<?> g = (Graph<?>)o;
+            return g.order() == order()
+                && g.size() == size()
+                && g.vertices().equals(vertices())
+                && g.edges().equals(edges());                    
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getAdjacencyList(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+        return (edges == null) 
+            ? Collections.<WeightedDirectedTypedEdge<T>>emptySet()
+            : new EdgeListWrapper(edges);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getEdges(int vertex1, int vertex2) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex1);
+        return (edges == null) 
+            ? Collections.<WeightedDirectedTypedEdge<T>>emptySet()
+            : edges.getEdges(vertex2);
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> getEdges(int vertex1, int vertex2, 
+                                              Set<T> types) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex1);        
+        return (edges == null) 
+            ? Collections.<WeightedDirectedTypedEdge<T>>emptySet()
+            : edges.getEdges(vertex2, types);        
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public IntSet getNeighbors(int vertex) {
+         SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+         return (edges == null) 
+             ? PrimitiveCollections.emptyIntSet()
+             : PrimitiveCollections.unmodifiableSet(edges.connected());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean hasCycles() {
+        throw new Error();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int hashCode() {
+        return vertexToEdges.keySet().hashCode() ^ (typeCounts.hashCode() * size);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int inDegree(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+        return (edges == null) 
+            ? 0
+            : edges.predecessors().size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> inEdges(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+        return (edges == null) 
+            ? Collections.<WeightedDirectedTypedEdge<T>>emptySet()
+            : new EdgeListWrapper(edges.incoming());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int order() {
+        return vertexToEdges.size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int outDegree(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+        return (edges == null) 
+            ? 0
+            : edges.successors().size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Set<WeightedDirectedTypedEdge<T>> outEdges(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+        return (edges == null) 
+            ? Collections.<WeightedDirectedTypedEdge<T>>emptySet()
+            : new EdgeListWrapper(edges.outgoing());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public IntSet predecessors(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+         return (edges == null) 
+             ? PrimitiveCollections.emptyIntSet()
+             : PrimitiveCollections.unmodifiableSet(edges.predecessors());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean remove(int vertex) {
+        // If we can remove the vertex from the global set, then at least one of
+        // the type-specific graphs has this vertex.
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.remove(vertex);
+        if (edges != null) {
+            size -= edges.size();
+            for (int other : edges.connected()) {
+                vertexToEdges.get(other).disconnect(vertex);
+            }
+
+            // Check whether removing this vertex has caused us to remove
+            // the last edge for this type in the graph.  If so, the graph
+            // no longer has this type and we need to update the state.
+            for (WeightedDirectedTypedEdge<T> e : edges)
+                updateTypeCounts(e.edgeType(), -1);
+
+            // Update any of the subgraphs that had this vertex to notify them
+            // that it was removed
+            Iterator<WeakReference<Subgraph>> iter = subgraphs.iterator();
+            while (iter.hasNext()) {
+                WeakReference<Subgraph> ref = iter.next();
+                Subgraph s = ref.get();
+                // Check whether this subgraph was already gc'd (the subgraph
+                // was no longer in use) and if so, remove the ref from the list
+                // to avoid iterating over it again
+                if (s == null) {
+                    iter.remove();
+                    continue;
+                }
+                // If we removed the vertex from the subgraph, then check
+                // whether we also removed any of the types in that subgraph
+                if (s.vertexSubset.remove(vertex)) {
+                    Iterator<T> subgraphTypesIter = s.validTypes.iterator();
+                    while (subgraphTypesIter.hasNext()) {
+                        if (!typeCounts.containsKey(subgraphTypesIter.next()))
+                            subgraphTypesIter.remove();
+                    }
+                }
+            }
+            return true;
+        }
+        return false;        
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean remove(WeightedDirectedTypedEdge<T> edge) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(edge.to());
+        if (edges != null && edges.remove(edge)) {
+            vertexToEdges.get(edge.from()).remove(edge);
+            size--;
+            // Check whether we've just removed the last edge for this type
+            // in the graph.  If so, the graph no longer has this type and
+            // we need to update the state.
+            updateTypeCounts(edge.edgeType(), -1);
+
+            if (!typeCounts.containsKey(edge.edgeType())) {
+                // Remove this edge type from all the subgraphs as well
+                Iterator<WeakReference<Subgraph>> sIt = subgraphs.iterator();
+                while (sIt.hasNext()) {
+                    WeakReference<Subgraph> ref = sIt.next();
+                    Subgraph s = ref.get();
+                    // Check whether this subgraph was already gc'd (the
+                    // subgraph was no longer in use) and if so, remove the
+                    // ref from the list to avoid iterating over it again
+                    if (s == null) {
+                        sIt.remove();
+                        continue;
+                    }
+                    s.validTypes.remove(edge.edgeType());
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public double strength(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> e = vertexToEdges.get(vertex);
+        return (e == null) ? 0 : e.sum();        
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public IntSet successors(int vertex) {
+        SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+         return (edges == null) 
+             ? PrimitiveCollections.emptyIntSet()
+             : PrimitiveCollections.unmodifiableSet(edges.successors());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public WeightedDirectedMultigraph<T> subgraph(Set<Integer> subset) {
+        Subgraph sub = new Subgraph(typeCounts.keySet(), subset);
+        subgraphs.add(new WeakReference<Subgraph>(sub));
+        return sub;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public WeightedDirectedMultigraph<T> subgraph(Set<Integer> subset, Set<T> edgeTypes) {
+        if (edgeTypes.isEmpty()) 
+            throw new IllegalArgumentException(""Must specify at least one type"");
+        if (!typeCounts.keySet().containsAll(edgeTypes)) {
+            throw new IllegalArgumentException(
+                ""Cannot create subgraph with more types than exist"");
+        }
+        Subgraph sub = new Subgraph(edgeTypes, subset);
+        subgraphs.add(new WeakReference<Subgraph>(sub));
+        return sub;
+    }     
+
+    /**
+     * Returns a description of the graph as the sequence of its edges.
+     */
+    public String toString() {
+        // REMINDER: make this more efficient with a StringBuilder
+        return ""{ vertices: "" + vertices() + "", edges: "" + edges() + ""}"";
+    }
+
+    /**
+     * Updates how many edges have this type in the graph
+     */
+    private void updateTypeCounts(T type, int delta) {
+        if (!typeCounts.containsKey(type)) {
+            assert delta > 0 
+                : ""removing edge type that was not originally present"";
+            typeCounts.put(type, delta);
+        }
+        else {
+            int curCount = typeCounts.get(type);
+            int newCount = curCount + delta;
+            assert newCount >= 0 
+                : ""removing edge type that was not originally present"";
+            if (newCount == 0)
+                typeCounts.remove(type);
+            else
+                typeCounts.put(type, newCount);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public IntSet vertices() {
+        return PrimitiveCollections.unmodifiableSet(
+            TroveIntSet.wrap(vertexToEdges.keySet()));
+    }
+
+    /**
+     * The {@code EdgeView} class encapsulates all the of the edge sets from the
+     * different edge types.  Because {@link CombinedSet} does not allow for
+     * addition, we add an {@code add} method that handles adding new edges to
+     * the graph via this set.
+     */
+    class EdgeView extends AbstractSet<WeightedDirectedTypedEdge<T>> {
+
+        public EdgeView() { }
+
+        public boolean add(WeightedDirectedTypedEdge<T> e) {
+            // Calling the backing graph's add will route the edge to the
+            // type-appropriate set
+            return WeightedDirectedMultigraph.this.add(e);
+        }
+
+        public boolean contains(Object o) {
+            return (o instanceof WeightedDirectedTypedEdge) 
+                && WeightedDirectedMultigraph.this.contains((WeightedDirectedTypedEdge<?>)o);
+        }
+
+        public Iterator<WeightedDirectedTypedEdge<T>> iterator() {
+            return new EdgeIterator();
+        }
+        
+        @SuppressWarnings(""unchecked"")
+        public boolean remove(Object o) {
+            if (o instanceof WeightedDirectedTypedEdge) {
+                WeightedDirectedTypedEdge<?> e = (WeightedDirectedTypedEdge<?>)o;
+                return WeightedDirectedMultigraph.this.typeCounts.
+                           containsKey(e.edgeType())
+                    && WeightedDirectedMultigraph.this.remove((WeightedDirectedTypedEdge<T>)o);
+            }
+            return false;
+        }
+
+        public int size() {
+            return WeightedDirectedMultigraph.this.size();
+        }
+
+        class EdgeIterator implements Iterator<WeightedDirectedTypedEdge<T>> {
+            
+            Iterator<SparseWeightedDirectedTypedEdgeSet<T>> edgeSets;
+            Iterator<WeightedDirectedTypedEdge<T>> edges;
+            WeightedDirectedTypedEdge<T> cur = null;
+            public EdgeIterator() {
+                edgeSets = vertexToEdges.valueCollection().iterator();
+                advance();
+            }
+            
+            private void advance() {
+                while ((edges == null || !edges.hasNext())
+                           && edgeSets.hasNext()) {
+                    SparseWeightedDirectedTypedEdgeSet<T> edgeSet = edgeSets.next();
+                    edges = edgeSet.uniqueIterator();                    
+                }
+            }
+            
+            public boolean hasNext() {
+                return edges != null && edges.hasNext();
+            }
+
+            public WeightedDirectedTypedEdge<T> next() {
+                if (!hasNext())
+                    throw new NoSuchElementException();
+                cur = edges.next();
+                advance();
+                return cur;
+            }
+
+            public void remove() {
+                if (cur == null)
+                    throw new IllegalStateException();
+                WeightedDirectedMultigraph.this.remove(cur);
+                cur = null;
+            }
+        }
+    }
+
+    /**
+     * A wrapper around a set of of edges that automatically decrements the size
+     * of this graph when an edge is removed from it.
+     *
+     * @see WeightedDirectedMultigraph#inEdges(int)
+     * @see WeightedDirectedMultigraph#outEdges(int)
+     */
+    class EdgeListWrapper extends SetDecorator<WeightedDirectedTypedEdge<T>> {
+
+        private static final long serialVersionUID = 1L;
+
+        public EdgeListWrapper(Set<WeightedDirectedTypedEdge<T>> set) {
+            super(set);
+        }
+
+        @Override public boolean add(WeightedDirectedTypedEdge<T> e) {
+            return WeightedDirectedMultigraph.this.add(e);
+        }
+
+        @Override public boolean addAll(Collection<? extends WeightedDirectedTypedEdge<T>> c) {
+            boolean added = false;
+            for (WeightedDirectedTypedEdge<T> e : c) {
+                if (WeightedDirectedMultigraph.this.add(e)) 
+                    added = true;
+            }
+            return added;
+        }
+
+        @Override public boolean remove(Object o) {
+            if (o instanceof WeightedDirectedTypedEdge) {
+                @SuppressWarnings(""unchecked"")
+                WeightedDirectedTypedEdge<T> e = (WeightedDirectedTypedEdge<T>)o;
+                return WeightedDirectedMultigraph.this.remove(e);
+            }
+            return false;
+        }
+
+        @Override public boolean removeAll(Collection<?> c) {
+            boolean removed = false;
+            for (Object o : c) {
+                if (o instanceof WeightedDirectedTypedEdge) {
+                    @SuppressWarnings(""unchecked"")
+                    WeightedDirectedTypedEdge<T> e = (WeightedDirectedTypedEdge<T>)o;
+                    if (WeightedDirectedMultigraph.this.remove(e)) 
+                        removed = true;
+                }
+            }
+            return removed;
+        }
+
+        @Override public boolean retainAll(Collection<?> c) {
+            throw new Error(""FIXME"");
+        }
+    } 
+
+    /**
+     * An implementation for handling the subgraph behavior.
+     */
+     class Subgraph extends WeightedDirectedMultigraph<T> {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * The set of types in this subgraph
+         */
+        private final Set<T> validTypes;
+
+        /**
+         * The set of vertices in this subgraph
+         */
+        private final IntSet vertexSubset;
+
+        public Subgraph(Set<T> validTypes, Set<Integer> vertexSubset) {
+            this.validTypes = validTypes;
+            this.vertexSubset = new TroveIntSet(vertexSubset);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean add(int vertex) {
+            if (vertexSubset.contains(vertex))
+                return false;
+            throw new UnsupportedOperationException(
+                ""Cannot add new vertex to subgraph"");
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean add(WeightedDirectedTypedEdge<T> e) {
+            if (!vertexSubset.contains(e.from())
+                    || !vertexSubset.contains(e.to())
+                    || !validTypes.contains(e.edgeType()))
+                throw new UnsupportedOperationException(
+                    ""Cannot add new vertex to subgraph"");
+
+            return WeightedDirectedMultigraph.this.add(e);
+        }
+
+        /**
+         * {@inheritDoc}
+         */        
+        public void clear() {
+            for (Integer v : vertexSubset)
+                WeightedDirectedMultigraph.this.remove(v);
+            vertexSubset.clear();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public void clearEdges() { 
+            throw new Error();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public void clearEdges(T edgeType) { 
+            throw new Error();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean contains(int vertex) {
+            return vertexSubset.contains(vertex);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean contains(Edge e) {
+            if (e instanceof WeightedDirectedTypedEdge) {
+                WeightedDirectedTypedEdge<?> te = (WeightedDirectedTypedEdge<?>)e;
+                return vertexSubset.contains(e.from())
+                    && vertexSubset.contains(e.to())
+                    && validTypes.contains(te.edgeType())
+                    && WeightedDirectedMultigraph.this.contains(e);
+            }
+            return false;
+        }
+    
+        /**
+         * {@inheritDoc}
+         */
+        public boolean contains(int vertex1, int vertex2) {
+            if (!vertexSubset.contains(vertex1)
+                    || !vertexSubset.contains(vertex2))
+                return false;
+
+            Set<WeightedDirectedTypedEdge<T>> edges = 
+                WeightedDirectedMultigraph.this.getEdges(vertex1, vertex2);
+            if (edges != null) {
+                // If there were edges between the two vertices, ensure that at
+                // least one of them has the type represented in this subgraph
+                for (WeightedDirectedTypedEdge<T> e : edges)
+                    if (validTypes.contains(e.edgeType()))
+                        return true;
+            }
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean contains(int vertex1, int vertex2, T edgeType) {
+            if (!vertexSubset.contains(vertex1)
+                    || !vertexSubset.contains(vertex2))
+                return false;
+            
+            return WeightedDirectedMultigraph.this.contains(vertex1, vertex2, edgeType);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public WeightedDirectedMultigraph<T> copy(Set<Integer> vertices) {
+            // special case for If the called is requesting a copy of the entire
+            // graph, which is more easily handled with the copy constructor
+            if (vertices.size() == order() && vertices.equals(vertices()))
+                return new WeightedDirectedMultigraph<T>(this);
+            WeightedDirectedMultigraph<T> g = new WeightedDirectedMultigraph<T>();
+            for (int v : vertices) {
+                if (!contains(v))
+                    throw new IllegalArgumentException(
+                        ""Requested copy with non-existant vertex: "" + v);
+                g.add(v);
+                for (WeightedDirectedTypedEdge<T> e : getAdjacencyList(v)) {
+                    if (vertices.contains(e.from()) && vertices.contains(e.to()))
+                        g.add(e);
+                }
+            }
+            return g;            
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int degree(int vertex) {
+            return getNeighbors(vertex).size();
+        }
+
+        /**
+         * Returns the set of typed edges in the graph
+         */
+        public Set<WeightedDirectedTypedEdge<T>> edges() {
+            return new SubgraphEdgeView();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Set<WeightedDirectedTypedEdge<T>> edges(T t) {
+            throw new Error(""implement me"");
+        }
+
+        /**
+         * Returns the set of edge types currently present in this graph.
+         */
+        public Set<T> edgeTypes() {
+            return Collections.unmodifiableSet(validTypes);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override public boolean equals(Object o) {
+            if (o instanceof Graph) {
+                Graph<?> g = (Graph<?>)o;
+                return g.order() == order()
+                    && g.size() == size()
+                    && g.vertices().equals(vertices())
+                    && g.edges().equals(edges());                    
+            }
+            return false;
+        }
+        
+        /**
+         * {@inheritDoc}
+         */
+        public Set<WeightedDirectedTypedEdge<T>> getAdjacencyList(int vertex) {
+            if (!vertexSubset.contains(vertex))
+                return Collections.<WeightedDirectedTypedEdge<T>>emptySet();
+            Set<WeightedDirectedTypedEdge<T>> adj = 
+                WeightedDirectedMultigraph.this.getAdjacencyList(vertex);
+            return (adj.isEmpty()) 
+                ? Collections.<WeightedDirectedTypedEdge<T>>emptySet()
+                : new SubgraphAdjacencyListView(vertex);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Set<WeightedDirectedTypedEdge<T>> getEdges(int vertex1, int vertex2) {
+            if (!vertexSubset.contains(vertex1) 
+                    || !vertexSubset.contains(vertex2))
+                return Collections.<WeightedDirectedTypedEdge<T>>emptySet();
+
+            Set<WeightedDirectedTypedEdge<T>> edges = 
+                WeightedDirectedMultigraph.this.getEdges(vertex1, vertex2, validTypes);
+            return edges; 
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public IntSet getNeighbors(int vertex) {
+            SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+            return (edges == null) 
+                ? PrimitiveCollections.emptyIntSet()
+                : new SubgraphNeighborsView(vertex);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean hasCycles() {
+            throw new Error();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int hashCode() {
+            return vertices().hashCode() ^ (validTypes.hashCode() * size());
+        }
+
+        /**
+         * Returns {@code true} if the two vertices are contained within this
+         * subgraph and have an edge that is valid within this subgraph's type
+         * constraints.
+         */
+        private boolean hasEdge(int v1, int v2) {
+            if (vertexSubset.contains(v1) && vertexSubset.contains(v2)) {
+                Set<WeightedDirectedTypedEdge<T>> edges = getEdges(v1, v2);
+                return edges != null;
+            }
+            return false;            
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int inDegree(int vertex) {
+            int inDegree = 0;
+            for (WeightedDirectedTypedEdge<T> e : getAdjacencyList(vertex)) {
+                if (e.to() == vertex)
+                    inDegree++;
+            }
+            return inDegree;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Set<WeightedDirectedTypedEdge<T>> inEdges(int vertex) {
+            // REMINDER: this is probably best wrapped with yet another
+            // decorator class to avoid the O(n) penality of iteration over all
+            // the edges
+            Set<WeightedDirectedTypedEdge<T>> edges = getAdjacencyList(vertex);
+            if (edges.isEmpty())
+                return Collections.<WeightedDirectedTypedEdge<T>>emptySet();
+
+            Set<WeightedDirectedTypedEdge<T>> in = new HashSet<WeightedDirectedTypedEdge<T>>();
+            for (WeightedDirectedTypedEdge<T> e : edges) {
+                if (e.to() == vertex)
+                    in.add(e);
+            }
+            return in;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int order() {
+            return vertexSubset.size();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int outDegree(int vertex) {
+            int outDegree = 0;
+            for (WeightedDirectedTypedEdge<T> e : getAdjacencyList(vertex)) {
+                if (e.from() == vertex)
+                    outDegree++;
+            }
+            return outDegree;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Set<WeightedDirectedTypedEdge<T>> outEdges(int vertex) {
+            // REMINDER: this is probably best wrapped with yet another
+            // decorator class to avoid the O(n) penality of iteration over all
+            // the edges
+            Set<WeightedDirectedTypedEdge<T>> edges = getAdjacencyList(vertex);
+            if (edges.isEmpty())
+                return Collections.<WeightedDirectedTypedEdge<T>>emptySet();;
+            Set<WeightedDirectedTypedEdge<T>> out = new HashSet<WeightedDirectedTypedEdge<T>>();
+            for (WeightedDirectedTypedEdge<T> e : edges) {
+                if (e.from() == vertex)
+                    out.add(e);
+            }
+            return out;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public IntSet predecessors(int vertex) {
+         SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+         return (edges == null) 
+             ? PrimitiveCollections.emptyIntSet()
+             : PrimitiveCollections.unmodifiableSet(edges.predecessors());
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public boolean remove(int vertex) {
+            throw new UnsupportedOperationException(
+                ""Cannot remove vertices from a subgraph"");
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override public boolean remove(WeightedDirectedTypedEdge<T> e) {
+            if (!vertexSubset.contains(e.from())
+                    || !vertexSubset.contains(e.to())
+                    || !validTypes.contains(e.edgeType()))
+                return false;
+            return WeightedDirectedMultigraph.this.remove(e);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int size() {
+            int size = 0;
+            System.out.println(""types: "" + validTypes);
+            next_vertex:
+            for (int v1 : vertexSubset) {
+                for (int v2 : vertexSubset) {
+                    if (v1 == v2)
+                        break;
+                    size += WeightedDirectedMultigraph.this.
+                        getEdges(v1, v2, validTypes).size();
+                    System.out.printf(""%d -> %d had %d edges%n"", v1, v2, 
+                                      WeightedDirectedMultigraph.this.
+                                      getEdges(v1, v2, validTypes).size());
+                }
+            }
+            return size;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public IntSet successors(int vertex) {
+            SparseWeightedDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
+            return (edges == null) 
+                ? PrimitiveCollections.emptyIntSet()
+                : PrimitiveCollections.unmodifiableSet(edges.successors());
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public WeightedDirectedMultigraph<T> subgraph(Set<Integer> verts) {
+            if (!vertexSubset.containsAll(verts)) 
+                throw new IllegalArgumentException(""provided set is not a "" +
+                    ""subset of the vertices of this graph"");
+            return WeightedDirectedMultigraph.this.subgraph(verts, validTypes);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public WeightedDirectedMultigraph<T> subgraph(Set<Integer> verts, Set<T> edgeTypes) {
+            if (!vertexSubset.containsAll(verts)) 
+                throw new IllegalArgumentException(""provided set is not a "" +
+                    ""subset of the vertices of this graph"");
+            if (!validTypes.containsAll(edgeTypes))
+                throw new IllegalArgumentException(""provided types is not a "" +
+                    ""subset of the edge types of this graph"");
+            return WeightedDirectedMultigraph.this.subgraph(verts, edgeTypes);
+        }
+     
+        /**
+         * {@inheritDoc}
+         */
+        public IntSet vertices() {
+            return PrimitiveCollections.unmodifiableSet(vertexSubset);
+        }
+
+
+        /**
+         * A view for the {@code Edge} adjacent edges of a vertex within a
+         * subgraph.  This class monitors for changes to edge set to update the
+         * state of this graph
+         */
+        private class SubgraphAdjacencyListView 
+                extends AbstractSet<WeightedDirectedTypedEdge<T>> {
+
+            private final int root;
+
+            public SubgraphAdjacencyListView(int root) {
+                this.root = root;
+            }
+
+            public boolean add(WeightedDirectedTypedEdge<T> edge) {
+                return (edge.from() == root 
+                        || edge.to() == root) 
+                    && Subgraph.this.add(edge);
+            }
+
+            public boolean contains(Object o) {
+                if (!(o instanceof Edge))
+                    return false;
+                Edge e = (Edge)o;
+                return (e.to() == root ||
+                         e.from() == root)
+                        && Subgraph.this.contains(e);
+            }
+            
+            public Iterator<WeightedDirectedTypedEdge<T>> iterator() {
+                return new SubgraphAdjacencyListIterator();
+            }
+            
+            public boolean remove(Object o) {
+                if (!(o instanceof WeightedDirectedTypedEdge))
+                    return false;
+                WeightedDirectedTypedEdge<?> e = (WeightedDirectedTypedEdge<?>)o;
+                if (!validTypes.contains(e.edgeType())) 
+                    return false;
+                @SuppressWarnings(""unchecked"")
+                WeightedDirectedTypedEdge<T> e2 = (WeightedDirectedTypedEdge<T>)o;
+                return (e2.to() == root ||
+                        e2.from() == root)
+                    && Subgraph.this.remove(e2);
+            }
+
+            public int size() {
+                int sz = 0; 
+                for (Integer i : vertexSubset)
+                    sz += getEdges(root, i).size();
+                return sz;
+            }
+
+            /**
+             * A decorator around the iterator for the adjacency list for a
+             * vertex in a subgraph, which tracks edges removal to update the
+             * number of edges in the graph.
+             */
+            private class SubgraphAdjacencyListIterator 
+                    implements Iterator<WeightedDirectedTypedEdge<T>> {
+
+                Iterator<WeightedDirectedTypedEdge<T>> edges;
+
+                public SubgraphAdjacencyListIterator() {
+                    throw new Error();
+                }
+
+                public boolean hasNext() {
+                    return edges.hasNext();
+                }
+
+                public WeightedDirectedTypedEdge<T> next() {
+                    return edges.next();
+                }
+
+                public void remove() {
+                    edges.remove();
+                }
+            }
+        }
+
+        /**
+         * A view-based class over the edges in a {@link Subgraph}.  This class
+         * masks the state of the edges that are in the backing graph but not in
+         * the subgraph.
+         */
+        private class SubgraphEdgeView extends AbstractSet<WeightedDirectedTypedEdge<T>> {           
+
+            public SubgraphEdgeView() { }
+
+            /**
+             * Throws an {@link UnsupportedOperationException} if called.
+             */
+            public boolean add(WeightedDirectedTypedEdge<T> e) {
+                return Subgraph.this.add(e);
+            }
+
+            public boolean contains(Object o) {
+                if (!(o instanceof WeightedDirectedTypedEdge))
+                    return false;
+                @SuppressWarnings(""unchecked"")
+                WeightedDirectedTypedEdge<T> edge = (WeightedDirectedTypedEdge<T>)o;
+                return Subgraph.this.contains(edge);
+            }
+
+            public Iterator<WeightedDirectedTypedEdge<T>> iterator() {
+                return new SubgraphEdgeIterator();
+            }
+
+            /**
+             * {@inheritDoc}
+             */
+            public boolean remove(Object o) {
+                if (!(o instanceof WeightedDirectedTypedEdge))
+                    return false;
+                @SuppressWarnings(""unchecked"")
+                WeightedDirectedTypedEdge<T> edge = (WeightedDirectedTypedEdge<T>)o;
+                return Subgraph.this.remove(edge);
+            }
+
+            public int size() {
+                return Subgraph.this.size();
+            }
+
+            /**
+             * An iterator over the edges in this subgraph, which uses the
+             * pair-wise combinations of edges to identify which edges should be
+             * returned.
+             */
+            private class SubgraphEdgeIterator 
+                    implements Iterator<WeightedDirectedTypedEdge<T>> {                
+
+                private final Queue<WeightedDirectedTypedEdge<T>> edgesToReturn;
+
+                private final Queue<Integer> remainingVertices;
+
+                private Iterator<Integer> possibleNeighbors;
+
+                private Integer curVertex;
+
+                public SubgraphEdgeIterator() {
+                    remainingVertices = 
+                        new ArrayDeque<Integer>(Subgraph.this.vertices());
+                    edgesToReturn = new ArrayDeque<WeightedDirectedTypedEdge<T>>();
+                    curVertex = null;
+                    advance();
+                }
+                
+                private void advance() {
+                    // If there are still edges from the current pair, skip
+                    // processing any further connections
+                    if (!edgesToReturn.isEmpty())
+                        return;
+                    
+                    do {
+                        // Find the next vertex to analyze for connections
+                        while ((possibleNeighbors == null
+                                    || !possibleNeighbors.hasNext())
+                               && !remainingVertices.isEmpty()) {
+                            // Pull off the next vertex and then use the remaining
+                            // vertices to check for connections
+                            curVertex = remainingVertices.poll();
+                            possibleNeighbors = remainingVertices.iterator();
+                        }
+                        
+                        // Iterate through the possible neighbors of this
+                        // vertex, stopping when we find another vertex that has
+                        // at least one edge
+                        while (edgesToReturn.isEmpty()
+                                   && possibleNeighbors.hasNext()) {
+                            Integer v = possibleNeighbors.next();
+                            edgesToReturn.addAll(getEdges(curVertex, v));
+                        }
+                    } while (edgesToReturn.isEmpty()
+                             && !remainingVertices.isEmpty());
+                }
+
+                public boolean hasNext() {
+                    return edgesToReturn.size() > 0;
+                }
+
+                public WeightedDirectedTypedEdge<T> next() {
+                    if (!hasNext())
+                        throw new NoSuchElementException();
+                    WeightedDirectedTypedEdge<T> n = edgesToReturn.poll();
+                    advance();
+                    return n;
+                }
+
+                public void remove() {
+                    throw new IllegalStateException();
+                }
+            }
+        }
+
+        /**
+         * A view of a subgraph's vertex's neighbors that are also in the
+         * subview.  This view monitors for additions and removals to the set in
+         * order to update the state of this {@code Subgraph}.
+         */
+        private class SubgraphNeighborsView extends AbstractIntSet {
+
+            private int root;
+            
+            /**
+             * Constructs a view around the set of adjacent vertices
+             */
+            public SubgraphNeighborsView(int root) {
+                this.root = root;
+            }
+
+            public boolean add(int vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot add vertices to subgraph"");
+            }
+            
+            public boolean add(Integer vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot add vertices to subgraph"");
+            }
+
+            public boolean contains(int vertex) {
+                return vertexSubset.contains(vertex) 
+                    && isNeighboringVertex(vertex);
+            }
+            
+            public boolean contains(Object o) {
+                if (!(o instanceof Integer))
+                    return false;
+                Integer i = (Integer)o;
+                return vertexSubset.contains(i) && isNeighboringVertex(i);
+            }
+            
+            private boolean isNeighboringVertex(Integer i) {
+                return Subgraph.this.contains(root, i);
+            }
+
+            public IntIterator iterator() {
+                return new SubgraphNeighborsIterator();
+            }
+            
+            public boolean remove(int vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot remove vertices from subgraph"");
+            }
+            
+            public boolean remove(Object vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot remove vertices from subgraph"");
+            }
+            
+            public int size() {
+                int sz = 0;
+                for (Integer v : vertexSubset) {
+                    if (isNeighboringVertex(v))
+                        sz++;
+                }
+                return sz;
+            }
+
+            /**
+             * A decorator around the iterator for a subgraphs's neighboring
+             * vertices set, which keeps track of which neighboring vertices are
+             * actually in this subview.
+             */
+            private class SubgraphNeighborsIterator implements IntIterator {
+
+                private final Iterator<Integer> iter;
+
+                private Integer next;
+
+                public SubgraphNeighborsIterator() {
+                    iter = vertexSubset.iterator();
+                    advance();
+                }
+                
+                /**
+                 * Finds the next adjacent vertex that is also in this subview.
+                 */
+                private void advance() {
+                    next = null;
+                    while (iter.hasNext() && next == null) {
+                        Integer v = iter.next();
+                        if (isNeighboringVertex(v))
+                            next = v;
+                    }                    
+                }
+
+                public boolean hasNext() {
+                    return next != null;
+                }
+
+                public Integer next() {
+                    if (!hasNext())
+                        throw new NoSuchElementException();
+                    Integer cur = next;
+                    advance();
+                    return cur;
+                }
+
+                public int nextInt() {
+                    return next();
+                }
+
+                /**
+                 * Throws an {@link UnsupportedOperationException} if called.
+                 */
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }            
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/ucla/sspace/graph/WeightedDirectedTypedEdge.java b/src/main/java/edu/ucla/sspace/graph/WeightedDirectedTypedEdge.java
index 278dd0a0..4e101204 100644
--- a/src/main/java/edu/ucla/sspace/graph/WeightedDirectedTypedEdge.java
+++ b/src/main/java/edu/ucla/sspace/graph/WeightedDirectedTypedEdge.java
@@ -31,7 +31,7 @@
  * @see Multigraph
  */
 public interface WeightedDirectedTypedEdge<T> 
-       extends DirectedTypedEdge, WeightedDirectedEdge {
+       extends DirectedTypedEdge<T>, WeightedDirectedEdge {
 
     /**
      * Returns {@code true} if {@code o} connects the same vertices, has the
diff --git a/src/main/java/edu/ucla/sspace/graph/io/EdgeListReader.java b/src/main/java/edu/ucla/sspace/graph/io/EdgeListReader.java
index c2cde491..f10defd1 100644
--- a/src/main/java/edu/ucla/sspace/graph/io/EdgeListReader.java
+++ b/src/main/java/edu/ucla/sspace/graph/io/EdgeListReader.java
@@ -128,10 +128,8 @@ else if (line.length() == 0)
             int v2 = vertexIndexer.index(arr[1]);
             double weight = Double.parseDouble(arr[2]);
             g.add(new SimpleWeightedEdge(v1, v2, weight));
-            if (lineNo % 1000 == 0)
-                System.out.printf(""Read %d lines from %s%n"", lineNo, f);
 
-            if (lineNo % 100000 == 0)
+            if (lineNo % 10000 == 0)
                 veryVerbose(LOGGER, ""Read %d lines from %s"", lineNo, f);
         }
         verbose(LOGGER, ""Read directed graph with %d vertices and %d edges"", 
diff --git a/src/main/java/edu/ucla/sspace/graph/io/GraphMLReader.java b/src/main/java/edu/ucla/sspace/graph/io/GraphMLReader.java
new file mode 100644
index 00000000..9992b7a1
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/graph/io/GraphMLReader.java
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2012 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph.io;
+
+import edu.ucla.sspace.graph.DirectedEdge;
+import edu.ucla.sspace.graph.DirectedGraph;
+import edu.ucla.sspace.graph.DirectedMultigraph;
+import edu.ucla.sspace.graph.DirectedTypedEdge;
+import edu.ucla.sspace.graph.Edge;
+import edu.ucla.sspace.graph.Multigraph;
+import edu.ucla.sspace.graph.Graph;
+import edu.ucla.sspace.graph.SimpleDirectedEdge;
+import edu.ucla.sspace.graph.SimpleDirectedTypedEdge;
+import edu.ucla.sspace.graph.SimpleEdge;
+import edu.ucla.sspace.graph.SimpleTypedEdge;
+import edu.ucla.sspace.graph.SimpleWeightedDirectedTypedEdge;
+import edu.ucla.sspace.graph.SimpleWeightedEdge;
+import edu.ucla.sspace.graph.SparseDirectedGraph;
+import edu.ucla.sspace.graph.SparseWeightedGraph;
+import edu.ucla.sspace.graph.SparseUndirectedGraph;
+import edu.ucla.sspace.graph.TypedEdge;
+import edu.ucla.sspace.graph.UndirectedMultigraph;
+import edu.ucla.sspace.graph.WeightedDirectedMultigraph;
+import edu.ucla.sspace.graph.WeightedEdge;
+import edu.ucla.sspace.graph.WeightedGraph;
+import edu.ucla.sspace.graph.WeightedDirectedTypedEdge;
+
+import edu.ucla.sspace.util.HashIndexer;
+import edu.ucla.sspace.util.Indexer;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static edu.ucla.sspace.util.LoggerUtil.verbose;
+import static edu.ucla.sspace.util.LoggerUtil.veryVerbose;
+
+import javax.xml.parsers.*;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.*;
+import javax.xml.transform.stream.*;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.SAXException;
+
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.ParserAdapter;
+
+
+
+/**
+ * An {@link GraphReader} implementation that supports reading files in the <a
+ * href=""http://graphml.graphdrawing.org/primer/graphml-primer.html> GraphML
+ * </a> language.
+ */
+public class GraphMLReader extends GraphReaderAdapter implements GraphReader {
+
+    /**
+     * The logger to which clustering status updates will be written.
+     */
+    private static final Logger LOGGER =
+        Logger.getLogger(GraphMLReader.class.getName());
+
+
+    public GraphMLReader() { }
+
+
+    public WeightedDirectedMultigraph<String> readWeightedDirectedMultigraph(
+            File f, Indexer<String> vertexLabels) throws IOException {        
+        try {
+            SAXParserFactory spf = SAXParserFactory.newInstance();
+            SAXParser sp = spf.newSAXParser();
+            ParserAdapter pa = new ParserAdapter(sp.getParser());
+            
+            GraphMLParser parser = new GraphMLParser(vertexLabels);
+            
+            pa.setContentHandler(parser);
+            pa.setErrorHandler(parser);
+            pa.parse(new InputSource(new BufferedInputStream(new FileInputStream(f))));
+            return parser.g;
+        } catch (SAXException saxe) {
+            throw new IOException(saxe);
+        } catch (ParserConfigurationException saxe) {
+            throw new IOException(saxe);
+        }
+    }
+
+    public WeightedDirectedMultigraph<String> readWeightedDirectedMultigraphFromDOM(
+            File f, Indexer<String> vertexLabels) throws IOException {        
+
+        try {
+            DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
+            DocumentBuilder db = dbfac.newDocumentBuilder();
+            Document graphDoc = db.parse(f);
+            verbose(LOGGER, ""Finished parsing %s"", f);
+            
+            // <key id=""nd0"" for=""node"" attr.name=""type"" attr.type=""int""><default>0</default></key>
+            // <key id=""nd1"" for=""node"" attr.name=""group"" attr.type=""int""><default>0</default></key>
+            // <key id=""sd0"" for=""edge"" attr.name=""weight"" attr.type=""double""><default>0.0</default></key>
+            // <key id=""sd1"" for=""edge"" attr.name=""type"" attr.type=""int""><default>0</default></key>
+            
+            NodeList graphElemList = graphDoc.getElementsByTagName(""graph"");
+            if (graphElemList.getLength() == 0) 
+                throw new IOException(""Missing <graph> element"");
+            if (graphElemList.getLength() > 1) 
+                LOGGER.warning(f + "" has more than one <graph> element""
+                               + ""; returning only the first"");
+            Element graphElem = (Element)(graphElemList.item(0));
+            
+            String weightKeyId = null;
+            String typeKeyId = null;
+            
+            WeightedDirectedMultigraph<String> g = 
+                new WeightedDirectedMultigraph<String>();
+
+            NodeList keyElemList = graphElem.getElementsByTagName(""key"");
+            for (int i = 0; i < keyElemList.getLength(); ++i) {
+                Element key = (Element)(keyElemList.item(i));
+                if (key.getAttribute(""for"").equals(""edge"")) {
+                    if (key.getAttribute(""attr.name"").equals(""weight""))
+                        weightKeyId = key.getAttribute(""id"");
+                    else if (key.getAttribute(""attr.name"").equals(""type""))
+                        typeKeyId = key.getAttribute(""id"");
+                }
+            }          
+            
+            NodeList nodeElemList = graphElem.getElementsByTagName(""node"");
+            for (int i = 0; i < nodeElemList.getLength(); ++i) {
+                Element node = (Element)(nodeElemList.item(i));
+                String id = node.getAttribute(""id"");
+                g.add(vertexLabels.index(id));
+                if ((i+1) % 1000 == 0)
+                    verbose(LOGGER, ""Added %d vertices"", i);
+            }
+            verbose(LOGGER, ""Found %d total vertices"", g.order());
+
+            NodeList edgeElemList = graphElem.getElementsByTagName(""edge"");
+            for (int i = 0; i < edgeElemList.getLength(); ++i) {
+                Element edge = (Element)(edgeElemList.item(i));
+                String fromId = edge.getAttribute(""source"");
+                String toId = edge.getAttribute(""target"");
+                // Get its children which have the weight and type attributes
+                
+                String weightStr = null;
+                String type = null;
+
+                NodeList dataElemList = edge.getElementsByTagName(""data"");
+                for (int j = 0; j < dataElemList.getLength(); ++j) {
+                    Element data = (Element)(dataElemList.item(j));
+                    if (data.getAttribute(""key"").equals(weightKeyId)) 
+                        weightStr = data.getTextContent();
+                    else if (data.getAttribute(""key"").equals(typeKeyId)) 
+                        type = data.getTextContent();
+                }
+
+                if (weightStr == null)
+                    throw new IOException(""No weight specified for edge "" +
+                                          edge.getAttribute(""id""));
+                if (type == null)
+                    throw new IOException(""No type specified for edge "" +
+                                          edge.getAttribute(""id""));
+
+                int from = vertexLabels.find(fromId);
+                if (from < 0)
+                    throw new IOException(""Unknown source node for edge "" +
+                                      edge.getAttribute(""id"") + "": "" + fromId);
+                int to = vertexLabels.find(toId);
+                if (to < 0)
+                    throw new IOException(""Unknown target node for edge "" +
+                                      edge.getAttribute(""id"") + "": "" + toId);
+               
+                double weight = 0;
+                try {
+                    weight = Double.parseDouble(weightStr);
+                } catch (NumberFormatException nfe) {
+                    throw new IOException(""Invalid weight for edge "" +
+                                    edge.getAttribute(""id"") + "": "" + weightStr);
+                }
+
+                WeightedDirectedTypedEdge<String> e = 
+                    new SimpleWeightedDirectedTypedEdge<String>(
+                        type, from, to, weight);
+                g.add(e);
+                if ((i+1) % 1000 == 0)
+                    verbose(LOGGER, ""Added %d edges"", i);
+
+            }
+
+            verbose(LOGGER, ""Loaded a directed, weighted multigraph with %d "" +
+                    ""vertices and %d edges"", g.order(), g.size());
+            return g;
+        } 
+        catch (IOException ioe) {
+            throw ioe; // rethrow
+        }
+        // Generic catch all for all the XML exception
+        catch (Exception e) { 
+            throw new IOException(e);
+        }
+    }
+
+    
+    public class GraphMLParser extends DefaultHandler {
+        
+        // State variables when parsing edges
+        private int from;
+        private int to;
+        private String type;
+        private double weight;
+	
+	private static final String NODE = ""node"";
+	private static final String EDGE = ""edge"";
+        private static final String DATA = ""data"";
+
+        private final WeightedDirectedMultigraph<String> g;
+        private final Indexer<String> vertexLabels;
+
+        private String weightKeyId;
+        private String typeKeyId;
+
+        private String curDataKey = null;
+        private String curData = null;
+
+	GraphMLParser(Indexer<String> vertexLabels) {
+            this.vertexLabels = vertexLabels;
+            this.g = new WeightedDirectedMultigraph<String>();
+	}
+
+	public void startDocument() { }
+
+	public void endDocument() throws SAXException { 
+            verbose(LOGGER, ""Loaded a directed, weighted multigraph with %d "" +
+                    ""vertices and %d edges"", g.order(), g.size());
+        }
+
+	public void startElement(String namespace, String localName, String qName,
+                                 Attributes atts) throws SAXException {
+            if (qName.equals(""key"")) {
+                if (atts.getValue(""for"").equals(EDGE)) {
+                    if (atts.getValue(""attr.name"").equals(""weight""))
+                        weightKeyId = atts.getValue(""id"");
+                    else if (atts.getValue(""attr.name"").equals(""type""))
+                        typeKeyId = atts.getValue(""id"");
+                }
+            } 
+            else if (qName.equals(NODE)) {
+                String id = atts.getValue(""id"");
+                g.add(vertexLabels.index(id));
+                if (g.order() % 1000 == 0)
+                    verbose(LOGGER, ""Added %d vertices"", g.order());
+            }
+            else if (qName.equals(EDGE)) {
+                String fromId = atts.getValue(""source"");
+                String toId = atts.getValue(""target"");
+                
+                from = vertexLabels.find(fromId);
+                if (from < 0)
+                    throw new SAXException(""Unknown source node for edge "" 
+                                          + fromId);
+                to = vertexLabels.find(toId);
+                if (to < 0)
+                    throw new SAXException(""Unknown target node for edge "" 
+                                          + toId);
+            }
+            else if (qName.equals(DATA)) {
+                curDataKey = atts.getValue(""key"");
+            }
+	}
+
+	public void characters(char[] ch, int start, int length) {
+            curData = new String(ch, start, length);
+        }
+
+	public void endElement(String uri, String localName, String qName)
+			throws SAXException {
+            if (qName.equals(EDGE)) {
+                if (from == to)
+                    return;
+                WeightedDirectedTypedEdge<String> e = 
+                    new SimpleWeightedDirectedTypedEdge<String>(
+                        type, from, to, weight);
+                g.add(e);
+                if (g.size() % 1000 == 0)
+                    verbose(LOGGER, ""Added %d edges"", g.size());
+            }
+
+            else if (qName.equals(DATA)) {
+                if (curDataKey.equals(weightKeyId)) {                   
+                    try {
+                        weight = Double.parseDouble(curData);
+                    } catch (NumberFormatException nfe) {
+                        throw new SAXException(""Invalid weight: "" + curData);
+                    }
+                }
+                else if (curDataKey.equals(typeKeyId)) {
+                    type = curData;
+                }                              
+            }
+        }
+    }    
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/index/DefaultPermutationFunction.java b/src/main/java/edu/ucla/sspace/index/DefaultPermutationFunction.java
index ea9d7f0a..607161e3 100644
--- a/src/main/java/edu/ucla/sspace/index/DefaultPermutationFunction.java
+++ b/src/main/java/edu/ucla/sspace/index/DefaultPermutationFunction.java
@@ -35,6 +35,8 @@
 import java.util.Map;
 import java.util.Random;
 
+import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 /**
  * A generic permutation function.  This class precomputes the permutations as
@@ -54,13 +56,13 @@ public class DefaultPermutationFunction
     /**
      * A mapping from a distance to a corresponding permutation.
      */
-    private final Map<Integer, Function> permutationToReordering;
+    private final TIntObjectMap<Function> permutationToReordering;
     
     /**
      * Creates an empty {@code DefaultPermutationFunction}.
      */
     public DefaultPermutationFunction() {
-        permutationToReordering = new HashMap<Integer,Function>();
+        permutationToReordering = new TIntObjectHashMap<Function>();
     }
 
     /**
@@ -119,6 +121,10 @@ private Function getFunction(int exponent, int dimensions) {
                         forwardMapping[i] = objFunc[i].intValue();
                         backwardMapping[objFunc[i].intValue()] = i;
                     }            
+                    System.out.printf(""Forward: %s%nBackward: %s%n"", 
+                                      Arrays.toString(forwardMapping),
+                                      Arrays.toString(backwardMapping));
+
                     function = new Function(forwardMapping, backwardMapping);
                     // store it in the function map for later usee
                     permutationToReordering.put(exponent, function);
@@ -148,12 +154,16 @@ public Vector permute(Vector v , int numPermutations) {
                 dimensions[i] = i;
         }
 
+        System.out.printf(""input: %s%ninitial result: %s%n"", v, result);
+
         boolean isInverse = numPermutations < 0;
         
         // NB: because we use the signum and !=, this loop will work for both
         // positive and negative numbers of permutations
         int totalPermutations = Math.abs(numPermutations);
 
+        // Loop through the number of permutation that we have to do and keep
+        // updating which indices are being assigned to which
         for (int count = 1; count <= totalPermutations; ++count) {            
             // load the reordering funcion for this iteration of the permutation
             Function function = getFunction(count, v.length());
@@ -171,8 +181,9 @@ public Vector permute(Vector v , int numPermutations) {
         }
 
         for (int d : dimensions)
-            result.set(d, v.getValue(d));
+            result.set(dimensions[d], v.getValue(d));
 
+        System.out.printf(""input: %s%nfinal permuted result: %s%n"", v, result);
         return result;
     }
 
diff --git a/src/main/java/edu/ucla/sspace/text/AnnotatedDocument.java b/src/main/java/edu/ucla/sspace/text/AnnotatedDocument.java
new file mode 100644
index 00000000..55943ffd
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/text/AnnotatedDocument.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.text;
+
+import java.util.Iterator;
+
+/**
+ * An abstraction for a document that allows document processors to access text
+ * in a uniform manner.
+ */
+public interface AnnotatedDocument extends Document {
+    
+    /**
+     * Returns the timestamp when this document was created
+     */
+    long creationDate();
+
+    /**
+     * Returns a label associated with this particular document.  The label is
+     * intended to provide information on the source of the document or the
+     * contents therein.
+     */
+    String label();    
+}
diff --git a/src/main/java/edu/ucla/sspace/text/BufferedFileListDocumentIterator.java b/src/main/java/edu/ucla/sspace/text/BufferedFileListDocumentIterator.java
new file mode 100644
index 00000000..64fefcb3
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/text/BufferedFileListDocumentIterator.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2009 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.text;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.IOError;
+
+import java.util.ArrayDeque;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import edu.ucla.sspace.util.LineReader;
+
+
+/**
+ * An iterator implementation that returns {@link Document} instances given a
+ * file that contains list of files, buffering their contents as necessary.
+ *
+ * <p>
+ *
+ * This class is thread-safe.
+ */
+public class BufferedFileListDocumentIterator implements Iterator<Document> {
+
+    /**
+     * The default maximum number of elements to have queued
+     */
+    private static final int DEFAULT_BUFFER_SIZE = 100;
+
+    /**
+     * The files in the list that have yet to be returned as {@code Document}
+     * instances
+     */
+    private final Queue<String> filesToProcess;
+
+    private final BlockingQueue<Document> documentsToReturn;
+
+    private final AtomicInteger remaining;
+
+    private volatile RuntimeException bufferError;
+
+    /**
+     * Creates an {@code Iterator} over the files listed in the provided file
+     * using the default buffer size.
+     *
+     * @code fileListName a file containing a list of file names with one per
+     *       line
+     *
+     * @throws IOException if any error occurs when reading {@code fileListName}
+     */
+    public BufferedFileListDocumentIterator(String fileListName) 
+            throws IOException {
+        this(fileListName, DEFAULT_BUFFER_SIZE);
+    }
+    
+    /**
+     * Creates an {@code Iterator} over the files listed in the provided file.
+     *
+     * @code fileListName a file containing a list of file names with one per
+     *       line
+     *
+     * @throws IOException if any error occurs when reading {@code fileListName}
+     */
+    public BufferedFileListDocumentIterator(String fileListName, int bufferSize)
+            throws IOException {
+	
+	filesToProcess = new ArrayDeque<String>();
+        documentsToReturn = new ArrayBlockingQueue<Document>(bufferSize);
+
+	// read in all the files we have to process
+        for (String line : new LineReader(new File(fileListName)))
+	    filesToProcess.offer(line.trim());	    
+
+        remaining = new AtomicInteger(filesToProcess.size());
+        bufferError = null;
+
+        Thread bufferingThread = new Thread(new Bufferer(), 
+            ""BufferingThread for "" + fileListName);
+        bufferingThread.setDaemon(true);
+        bufferingThread.start();
+    }
+
+    /**
+     * Returns {@code true} if there are more documents to return.
+     */
+    public boolean hasNext() {
+	return remaining.get() > 0;
+    }
+    
+    /**
+     * Returns the next document from the list.
+     */
+    public Document next() {
+        if (!hasNext())
+            throw new NoSuchElementException(""No further documents"");
+        if (bufferError != null)
+            throw bufferError;
+        try {
+            return documentsToReturn.take();
+        } catch (InterruptedException ie) {
+            throw new IOError(ie);
+        }
+    }	
+    
+    /**
+     * Throws an {@link UnsupportedOperationException} if called.
+     */
+    public void remove() {
+	throw new UnsupportedOperationException(
+	    ""removing documents is not supported"");
+    }
+
+    class Bufferer implements Runnable {
+        public void run() {
+            while (!filesToProcess.isEmpty()) {
+                try {
+                    String file = filesToProcess.poll();
+                    documentsToReturn.put(new FileDocument(file, true));
+                    remaining.decrementAndGet();
+                } catch (Exception e) {
+                    bufferError = new RuntimeException(e);
+                    throw new IOError(e);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/edu/ucla/sspace/text/FileDocument.java b/src/main/java/edu/ucla/sspace/text/FileDocument.java
index 9b25a647..bde1166e 100644
--- a/src/main/java/edu/ucla/sspace/text/FileDocument.java
+++ b/src/main/java/edu/ucla/sspace/text/FileDocument.java
@@ -22,8 +22,14 @@
 package edu.ucla.sspace.text;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
+import java.io.IOError;
 import java.io.IOException;
+import java.io.StringReader;
+
+import edu.ucla.sspace.util.LineReader;
+
 
 /**
  * A {@code Document} implementation backed by a {@code File} whose contents are
@@ -32,12 +38,19 @@
 public class FileDocument implements Document {
 	
     /**
-     * The reader for the backing file.
+     * The name of the file whose contents are this document.
+     */
+    private final String fileName;
+
+    /**
+     * The optionally cached contents of the file or {@code null} if the
+     * contents were not cached.
      */
-    private final BufferedReader reader;
+    private final String contents;
     
     /**
-     * Constructs a {@code Document} based on the contents of the provide file.
+     * Constructs a {@code Document} based on the contents of the provide file,
+     * where the contests are read from disk.
      *
      * @param fileName the name of a file whose contents will be used as a
      *        document
@@ -45,20 +58,42 @@ public class FileDocument implements Document {
      * @throws IOException if any error occurred while reading {@code fileName}.
      */
     public FileDocument(String fileName) throws IOException {
-	BufferedReader r = null;
-	try {
-	    r = new BufferedReader(new FileReader(fileName));
-	} catch (Throwable t) {
-	    t.printStackTrace();
-	}
-	reader = r;
+        this(fileName, false);
+    }
+
+    /**
+     * Constructs a {@code Document} based on the contents of the provide file,
+     * optionally caching those contents in memory to allow reading the file
+     * multiple times.
+     *
+     * @param fileName the name of a file whose contents will be used as a
+     *        document
+     */
+    public FileDocument(String fileName, boolean cacheContents) 
+            throws IOException {
+        this.fileName = fileName;
+        if (cacheContents) {
+            StringBuilder sb = new StringBuilder();
+            for (String line : new LineReader(new File(fileName))) 
+                sb.append(line).append('\n');
+            contents = sb.toString();
+        }
+        else
+            contents = null;
+        
     }
 
     /**
      * {@inheritDoc}
      */
     public BufferedReader reader() {
-	return reader;
+        try {
+            return (contents == null) 
+                ? new BufferedReader(new FileReader(fileName))
+                : new BufferedReader(new StringReader(contents));
+        } catch (IOException ioe) {
+            throw new IOError(ioe);
+        }
     }
     
 }
diff --git a/src/main/java/edu/ucla/sspace/tools/IterativeBigramExtractor.java b/src/main/java/edu/ucla/sspace/tools/IterativeBigramExtractor.java
new file mode 100644
index 00000000..3f5e25c6
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/tools/IterativeBigramExtractor.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright 2012 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.tools;
+
+import edu.ucla.sspace.common.ArgOptions;
+
+import edu.ucla.sspace.common.statistics.*;
+
+import edu.ucla.sspace.clustering.Assignment;
+
+import edu.ucla.sspace.graph.Graph;
+import edu.ucla.sspace.graph.Graphs;
+import edu.ucla.sspace.graph.LinkClustering;
+import edu.ucla.sspace.graph.WeightedEdge;
+import edu.ucla.sspace.graph.WeightedGraph;
+import edu.ucla.sspace.graph.SparseWeightedGraph;
+import edu.ucla.sspace.graph.SimpleWeightedEdge;
+
+import edu.ucla.sspace.text.BufferedFileListDocumentIterator;
+import edu.ucla.sspace.text.IteratorFactory;
+import edu.ucla.sspace.text.StringUtils;
+import edu.ucla.sspace.text.TermAssociationFinder;
+import edu.ucla.sspace.text.WordIterator;
+import edu.ucla.sspace.text.Document;
+import edu.ucla.sspace.text.FileListDocumentIterator;
+import edu.ucla.sspace.text.IteratorFactory;
+import edu.ucla.sspace.text.OneLinePerDocumentIterator;
+
+import edu.ucla.sspace.util.Counter;
+import edu.ucla.sspace.util.CombinedIterator;
+import edu.ucla.sspace.util.HashIndexer;
+import edu.ucla.sspace.util.HashMultiMap;
+import edu.ucla.sspace.util.Indexer;
+import edu.ucla.sspace.util.LineReader;
+import edu.ucla.sspace.util.LoggerUtil;
+import edu.ucla.sspace.util.MultiMap;
+import edu.ucla.sspace.util.ObjectCounter;
+import edu.ucla.sspace.util.ObjectIndexer;
+import edu.ucla.sspace.util.Pair;
+import edu.ucla.sspace.util.SortedMultiMap;
+import edu.ucla.sspace.util.TreeMultiMap;
+import edu.ucla.sspace.util.WorkQueue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import java.util.Arrays;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Queue;
+import java.util.Set;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+import static edu.ucla.sspace.util.LoggerUtil.info;
+import static edu.ucla.sspace.util.LoggerUtil.verbose;
+import static edu.ucla.sspace.util.LoggerUtil.veryVerbose;
+
+public class IterativeBigramExtractor {
+
+    private static final Logger LOGGER = 
+        Logger.getLogger(IterativeBigramExtractor.class.getName());
+
+
+    public static void main(String[] args) throws Exception {
+        ArgOptions options = new ArgOptions();
+
+        options.addOption('f', ""fileList"", ""a list of document files"", 
+                          true, ""FILE[,FILE...]"", ""Required (at least one of)"");
+        options.addOption('d', ""docFile"", 
+                          ""a file where each line is a document"", true,
+                          ""FILE[,FILE...]"", ""Required (at least one of)"");
+
+        options.addOption('s', ""stopWrods"", ""A file containing a list of stop ""+
+                          ""words that should be encluded from bigrams"",
+                          true, ""FILE"", ""Program Options"");
+
+
+        options.addOption('h', ""help"", ""Generates a help message and exits"",
+                          false, null, ""Program Options"");
+        options.addOption('v', ""verbose"", ""Turns on verbose output"",
+                          false, null, ""Program Options"");
+        options.addOption('V', ""veryVerbose"", ""Turns on *very* verbose output"",
+                          false, null, ""Program Options"");
+
+        options.addOption('n', ""numberOfTermsPerIteration"", ""Specifies the "" +
+                          ""number of terms to compute the association between ""+
+                          ""per iteration (default: all)"",
+                          true, ""INT"", ""Runtime Options"");        
+        options.addOption('F', ""filterAssociationBelow"", ""Specifies the "" +
+                          ""an association score below which the pair will "" +
+                          ""not be reported"",
+                          true, ""DOUBLE"", ""Runtime Options"");        
+
+        options.parseOptions(args);
+        
+        // Set the verbosity
+        if (options.hasOption('v'))
+            LoggerUtil.setLevel(Level.FINE);
+        if (options.hasOption('V'))
+            LoggerUtil.setLevel(Level.FINER);
+        if (options.numPositionalArgs() < 3 || options.hasOption(""help"")) {
+            usage(options);
+            return;
+        }
+
+        File termsFile = new File(options.getPositionalArg(0));
+        String outputPrefix = options.getPositionalArg(1);
+
+        Set<String> terms = StringUtils.loadFileAsSet(termsFile);
+
+        Set<String> stopWords = null;
+        if (options.hasOption('s')) {
+            stopWords = StringUtils.loadFileAsSet(
+                new File(options.getStringOption('s')));
+        }
+
+        // A mapping to the minimum weight for a test, or null if all the test's
+        // scores should be reported
+        Map<SignificanceTest,Double> tests = 
+            new HashMap<SignificanceTest,Double>();
+        Map<SignificanceTest,PrintWriter> testWriters = 
+            new HashMap<SignificanceTest,PrintWriter>();
+
+        int numArgs = options.numPositionalArgs();
+        for (int i = 2; i < numArgs; ++i) {
+            String testName = options.getPositionalArg(i);
+            SignificanceTest test = getTest(testName);
+            Double minWeight = null;
+            if (i+1 < numArgs) {
+                // This might be a test name
+                String weightStr = options.getPositionalArg(i+1);
+
+                try {
+                    minWeight = Double.parseDouble(weightStr);
+                } catch (NumberFormatException nfe) { }
+                i++;
+            }
+            tests.put(test, minWeight);
+            PrintWriter pw = new PrintWriter(outputPrefix + testName + "".txt"");
+            testWriters.put(test, pw);
+        }
+
+        int termsToUsePerIteration = (options.hasOption('n'))
+            ? options.getIntOption('n')
+            : terms.size();               
+
+        Queue<String> termsToAssociate = new ArrayDeque<String>(terms);
+        int round = 0;
+        while (termsToAssociate.size() > 0) {
+            round++;
+
+            Counter<String> termCounts = new ObjectCounter<String>();
+            Counter<Pair<String>> bigramCounts = 
+                new ObjectCounter<Pair<String>>();
+            int allBigramCounts = 0;
+
+            // Load the next set of terms to test for being bigrams
+            Set<String> curTerms = new HashSet<String>();
+            while (curTerms.size() < termsToUsePerIteration 
+                   && !termsToAssociate.isEmpty()) {
+                curTerms.add(termsToAssociate.poll());
+            }
+
+            info(LOGGER, ""Finding associations between all %d terms and a %d "" +
+                 ""term subset (%d remain)"", terms.size(), curTerms.size(),
+                 termsToAssociate.size());
+       
+            int docNum = 0;
+            long startTime = System.currentTimeMillis();
+            Iterator<Document> docs = getDocuments(options);
+            while (docs.hasNext()) {
+                Document doc = docs.next();
+                Iterator<String> tokens = new WordIterator(doc.reader());
+                String t1 = null;
+                while (tokens.hasNext()) {
+                    String t2 = tokens.next();
+                    // Count the occurrence of this token if we're supposed to
+                    // record it
+                    if (terms.contains(t2)
+                            && (stopWords == null || !stopWords.contains(t2))) {
+
+                        termCounts.count(t2);
+                        if (t1 != null) {
+                            allBigramCounts++;
+                            // See if we are supposed to record this bigram
+                            if (curTerms.contains(t1))
+                                bigramCounts.count(new Pair<String>(t1, t2));
+                        }
+                    }
+                    t1 = t2;
+                }
+
+                // Just some reporting
+                if (++docNum % 1000 == 0) {
+                    double now = System.currentTimeMillis();
+                    double docsSec = docNum / ((now - startTime) / 1000);
+                    verbose(LOGGER, ""Processed document %d in round %d, "" +
+                            ""docs/sec: %f"", docNum, round, docsSec);
+                }
+            }
+
+            for (Map.Entry<SignificanceTest,Double> e : tests.entrySet()) {
+                SignificanceTest test = e.getKey();
+                double minWeight = (e.getValue() == null) ? 0 : e.getValue();
+                PrintWriter pw = testWriters.get(test);
+                
+                for (Map.Entry<Pair<String>,Integer> e2 : bigramCounts) {
+                    Pair<String> bigram = e2.getKey();
+                    int bigramCount = e2.getValue();
+                    String t1 = bigram.x;
+                    String t2 = bigram.y;
+                    int t1Count = termCounts.getCount(t1);
+                    int t2Count = termCounts.getCount(t2);
+                    int t1butNotT2 = t1Count - bigramCount;
+                    int t2butNotT1 = t2Count - bigramCount;
+                    int neitherAppeared = 
+                        allBigramCounts - ((t1Count + t2Count) - bigramCount);
+
+                    double score = test.score(bigramCount, t1butNotT2, 
+                                              t2butNotT1, neitherAppeared);
+                    if (score > minWeight && !Double.isNaN(score) 
+                            && !Double.isInfinite(score))
+                        pw.println(t1 + ""\t"" + t2 + ""\t"" + score);
+                }
+            }
+
+            for (PrintWriter pw : testWriters.values())
+                pw.flush();
+        }            
+
+        for (PrintWriter pw : testWriters.values())
+            pw.close();
+    }
+
+
+    private static Iterator<Document> getDocuments(ArgOptions argOptions) 
+            throws IOException {
+        Collection<Iterator<Document>> docIters = 
+            new LinkedList<Iterator<Document>>();
+
+        if (argOptions.hasOption('f')) {
+            for (String s : argOptions.getStringOption('f').split("",""))
+                docIters.add(new BufferedFileListDocumentIterator(s));
+        }
+        if (argOptions.hasOption('d')) {
+            for (String s : argOptions.getStringOption('d').split("",""))
+                docIters.add(new OneLinePerDocumentIterator(s));
+        }
+
+         if (docIters.size() == 0)
+             throw new IllegalStateException(
+                 ""Must specify at least one document source"");
+
+        // combine all of the document iterators into one iterator.
+        Iterator<Document> docIter = new CombinedIterator<Document>(docIters);
+        
+        return docIter;
+    }
+
+    /**
+     * Removes all tokens in the document that are not member of either set,
+     * returning the cleaned version, or if the sets contain no elements
+     * (indicating no filtering is to be done), the original string is returned.
+     */
+    private static Set<String> clean(String document, 
+                                     Set<String> validContext) {
+        Set<String> tokens = new HashSet<String>();
+        String[] arr = document.split(""\\s+"");
+        // If either set does not include tokens, this indicates that the
+        // context should include all the possible tokens.  Therefore, just
+        // return the string in its original form.
+        if (validContext.isEmpty()) {
+            tokens.addAll(Arrays.asList(arr));
+            return tokens;
+        }
+
+        for (String token : arr) {
+            if (validContext.contains(token))
+                tokens.add(token);
+        }
+        return tokens;
+    }
+
+    private static SignificanceTest getTest(String testName) {
+        if (testName.equals(""g-test""))
+            return new GTest();
+        else if (testName.equals(""chi-squared""))
+            return new ChiSquaredTest();
+        else if (testName.equals(""pmi""))
+            return new PointwiseMutualInformationTest();
+        else
+            throw new IllegalArgumentException(
+                ""No such significance test: "" + testName);
+    }
+
+    /**
+     * Prints the options and supported commands used by this program.
+     *
+     * @param options the options supported by the system
+     */
+    private static void usage(ArgOptions options) {
+        System.out.println(
+            ""IterativeBigramExtractor version 1.0\n"" +
+            ""usage: java IterativeBigramExtractor [options] "" +
+            ""terms.txt output-prefix test-name [min-weight] "" + 
+            ""[test2-name [min-weight]]\n\n""
+            + options.prettyPrint());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/tools/LinkClusteringTool.java b/src/main/java/edu/ucla/sspace/tools/LinkClusteringTool.java
new file mode 100644
index 00000000..64b0819a
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/tools/LinkClusteringTool.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2009 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.tools;
+
+import edu.ucla.sspace.clustering.Assignment;
+
+import edu.ucla.sspace.common.ArgOptions;
+
+import edu.ucla.sspace.graph.Edge;
+import edu.ucla.sspace.graph.Graph;
+import edu.ucla.sspace.graph.GraphIO;
+import edu.ucla.sspace.graph.LinkClustering;
+
+import edu.ucla.sspace.mains.OptionDescriptions;
+
+import edu.ucla.sspace.matrix.GrowingSparseMatrix;
+import edu.ucla.sspace.matrix.Matrix;
+import edu.ucla.sspace.matrix.SparseMatrix;
+
+import edu.ucla.sspace.util.ArrayMap;
+import edu.ucla.sspace.util.ColorGenerator;
+import edu.ucla.sspace.util.HashMultiMap;
+import edu.ucla.sspace.util.Indexer;
+import edu.ucla.sspace.util.LineReader;
+import edu.ucla.sspace.util.LoggerUtil;
+import edu.ucla.sspace.util.MultiMap;
+import edu.ucla.sspace.util.ObjectIndexer;
+import edu.ucla.sspace.util.TreeMultiMap;
+
+import java.awt.Color;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOError;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+
+// Logger helper methods
+import static edu.ucla.sspace.util.LoggerUtil.info;
+import static edu.ucla.sspace.util.LoggerUtil.verbose;
+
+
+/**
+ * A utility class for running {@link LinkClustering} from the command line.
+ */
+public class LinkClusteringTool {
+
+    private static final Logger LOGGER = 
+        Logger.getLogger(LinkClusteringTool.class.getName());
+
+    public static void main(String[] args) {
+        ArgOptions opts = new ArgOptions();
+        
+        opts.addOption('h', ""help"", ""Generates a help message and exits"",
+                          false, null, ""Program Options"");
+        opts.addOption('W', ""minWeight"", ""Loads a weighted graph as "" +
+                       ""unweighted, keeping only those edges with weight ""+
+                       ""at least the specified value"",
+                       true, ""Double"", ""Input Options"");
+        opts.addOption('v', ""verbose"", ""Turns on verbose output"",
+                          false, null, ""Program Options"");
+        opts.addOption('V', ""verbVerbose"", ""Turns on very verbose output"",
+                          false, null, ""Program Options"");
+        
+        ////////
+        //
+        // OPTIONS TO BE ADDED AT SOME POINT IN THE FUTURE...
+        //
+        ///////
+
+//         opts.addOption('w', ""weighted"", ""Uses a weighted edge simiarity"",
+//                        false, null, ""Program Options"");
+//         opts.addOption('k', ""kpartite"", ""Uses the k-partite link clustering "" +
+//                        ""with the provided file that maps a vertex to "" +
+//                        ""its partition (note: not its community)"",
+//                        true, ""FILE"", ""Program Options"");
+
+//         opts.addOption('d', ""printDensities"", ""Prints all the cluster "" +
+//                        ""densities to the specified file"", true, ""FILE"",
+//                        ""Program Options"");
+//         opts.addOption('a', ""saveAllSolutions"", ""Saves the communities for all""+
+//                        ""possible partitionings"", true, ""FILE_PREFIX"",
+//                        ""Program Options"");
+//         opts.addOption('n', ""saveNthSolutions"", ""Saves only every nth solution""+
+//                        "" when -a is used"", true, ""INT"", ""Program Options"");
+
+        opts.parseOptions(args);
+
+        if (opts.numPositionalArgs() < 2 || opts.hasOption(""help"")) {
+            usage(opts);
+            return;
+        }
+
+        // If verbose output is enabled, update all the loggers in the S-Space
+        // package logging tree to output at Level.FINE (normally, it is
+        // Level.INFO).  This provides a more detailed view of how the execution
+        // flow is proceeding.
+        if (opts.hasOption('v')) 
+            LoggerUtil.setLevel(Level.FINE);
+        if (opts.hasOption('V')) 
+            LoggerUtil.setLevel(Level.FINER);
+
+
+        try {
+            
+            LOGGER.info(""Loading graph file"");
+            Indexer<String> vertexLabels = new ObjectIndexer<String>();
+            File f = new File(opts.getPositionalArg(0));
+            Graph<Edge> graph = null;
+            if (opts.hasOption('W'))
+                graph = GraphIO.readUndirectedFromWeighted(
+                    f, vertexLabels, opts.getDoubleOption('W'));
+            else
+                GraphIO.readUndirected(f, vertexLabels);
+
+            LinkClustering lc = new LinkClustering();
+            MultiMap<Integer,Integer> clusterToVertices = 
+                lc.cluster(graph, System.getProperties());
+
+            PrintWriter pw = new PrintWriter(
+                new BufferedOutputStream(new FileOutputStream(
+                                         opts.getPositionalArg(1))));
+
+            for (Map.Entry<Integer,Set<Integer>> e : 
+                     clusterToVertices.asMap().entrySet()) {
+                Integer clusterId = e.getKey();
+                Set<Integer> vertices = e.getValue();
+
+                verbose(LOGGER, ""Cluster %d had vertices: %s%n"",
+                        clusterId, vertices.size());
+                
+                Iterator<Integer> iter = vertices.iterator();
+                StringBuilder sb = new StringBuilder();
+                while (iter.hasNext()) {
+                    int v = iter.next();
+                    sb.append(vertexLabels.lookup(v));
+                    if (iter.hasNext())
+                        sb.append(' ');
+                    else
+                        pw.println(sb);
+                }
+            }
+            pw.close();
+
+        } catch (IOException ioe) {
+            throw new IOError(ioe);
+        }
+    }
+
+    /**
+     * Prints the options and supported commands used by this program.
+     *
+     * @param options the options supported by the system
+     */
+    private static void usage(ArgOptions options) {
+        System.out.println(
+            ""Link Clustering 1.0, "" +
+            ""based on the community detection method of\n\n"" +
+            ""\tYong-Yeol Ahn, James P. Bagrow, and Sune Lehmann. 2010.\n"" +
+            ""\tLink communities reveal multiscale complexity in networks.\n"" +
+            ""\tNature, (466):761-764, August.\n\n"" +
+            ""usage: java -jar lc.jar [options] edge_file communities.txt \n\n"" 
+            + options.prettyPrint() +
+            ""\nThe edge file format is:\n"" +
+            ""   vertex1 vertex2 [weight]\n"" +
+            ""where vertices may be named using any contiguous sequence of "" +
+            ""characters or\n"" +
+            ""numbers.  Weights may be any non-zero double value.  \n"" +
+            ""Lines beginning\n"" +
+            ""with '#' are treated as comments and skipped.\n\n""+
+            OptionDescriptions.HELP_DESCRIPTION);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/edu/ucla/sspace/util/CombinedIterator.java b/src/main/java/edu/ucla/sspace/util/CombinedIterator.java
index eddf6953..36782e68 100644
--- a/src/main/java/edu/ucla/sspace/util/CombinedIterator.java
+++ b/src/main/java/edu/ucla/sspace/util/CombinedIterator.java
@@ -133,7 +133,7 @@ public synchronized T next() {
      */
     public synchronized void remove() {
 	if (toRemoveFrom == null) {
-	    throw new NoSuchElementException();
+	    throw new IllegalStateException();
 	}	
 	toRemoveFrom.remove();
     }
diff --git a/src/main/java/edu/ucla/sspace/util/HashMultiMap.java b/src/main/java/edu/ucla/sspace/util/HashMultiMap.java
index 41423cbd..37ca8a61 100644
--- a/src/main/java/edu/ucla/sspace/util/HashMultiMap.java
+++ b/src/main/java/edu/ucla/sspace/util/HashMultiMap.java
@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -134,7 +135,9 @@ public Set<Map.Entry<K,V>> entrySet() {
      */
     public Set<V> get(Object key) {
         Set<V> vals = map.get(key);
-        return (vals == null) ? Collections.<V>emptySet() : vals;
+        return (vals == null) 
+            ? Collections.<V>emptySet() 
+            : Collections.<V>unmodifiableSet(vals);
     }
 
     /**
@@ -148,7 +151,7 @@ public boolean isEmpty() {
      * {@inheritDoc}
      */
     public Set<K> keySet() {
-        return map.keySet();
+        return new KeySet();
     }
 
     /**
@@ -218,7 +221,7 @@ public Set<V> remove(Object key) {
         Set<V> v = map.remove(key);
         if (v != null)
             range -= v.size();
-        return v;
+        return (v == null) ? Collections.<V>emptySet() : v;
     }
 
     /**
@@ -294,6 +297,48 @@ public Collection<Set<V>> valueSets() {
         return map.values();
     }
 
+    class KeySet extends SetDecorator<K> implements Serializable {
+
+        private static final long serialVersionUID = 1;
+
+        public KeySet() {
+            super(map.keySet());
+        }
+
+        public boolean add(K key) {
+            throw new UnsupportedOperationException(
+                ""Cannot add key to a MultiMap without an associated value"");
+        }
+        
+        public Iterator<K> iterator() {
+            return new KeyIter();
+        }
+
+        private Iterator<K> iterator_() {
+            return super.iterator();
+        }
+
+        public boolean remove(Object key) {
+            return !HashMultiMap.this.remove(key).isEmpty();
+        }
+
+        class KeyIter extends IteratorDecorator<K> {
+                       
+            public KeyIter() {
+                super(iterator_());
+            }
+
+            public void remove() {
+                Set<V> valsForCurKey = map.get(cur);
+                // Null check in case of remove twice, in which case the remove
+                // line after will throw the exception
+                if (valsForCurKey != null)
+                    range -= valsForCurKey.size();
+                super.remove();
+            }
+        }
+    }
+
     /**
      * A {@link Collection} view of the values contained in a {@link MultiMap}.
      *
@@ -470,7 +515,14 @@ public MultiMapEntry(K key, V value) {
             }
 
             public V setValue(V value) {
-                Set<V> values = HashMultiMap.this.get(getKey());
+                Set<V> values = HashMultiMap.this.map.get(getKey());
+                // For either of these conditions to exist, the backing set
+                // would have to have been concurrently modified, since we
+                // wouldn't normally iterate over a key that isn't mapped to a
+                // value
+                if (values == null || values.size() == 0)
+                    throw new ConcurrentModificationException(
+                        ""Expected at least one value mapped to "" + getKey());
                 values.remove(getValue());
                 values.add(value);
                 return super.setValue(value);
diff --git a/src/main/java/edu/ucla/sspace/util/KrippendorffsAlpha.java b/src/main/java/edu/ucla/sspace/util/KrippendorffsAlpha.java
new file mode 100644
index 00000000..96b9413b
--- /dev/null
+++ b/src/main/java/edu/ucla/sspace/util/KrippendorffsAlpha.java
@@ -0,0 +1,411 @@
+/*
+ * Copyright 2012 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.util;
+
+import edu.ucla.sspace.matrix.ArrayMatrix;
+import edu.ucla.sspace.matrix.Matrix;
+
+import edu.ucla.sspace.util.primitive.IntPair;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+/**
+ *
+ *
+ *
+ * @since 2.0
+ */ 
+public class KrippendorffsAlpha {
+
+    public enum DifferenceFunction {
+            NOMINAL,
+            ORDINAL,
+            INTERVAL,
+            RATIO,
+            POLAR,
+            CIRCULAR
+    }
+
+    public double compute(Matrix ratings, DifferenceFunction diffFunc) {
+        Set<Double> values = new TreeSet<Double>();
+        int numCoders = ratings.rows();
+        int numItems = ratings.columns();
+        int numObservedRatings = 0;
+        for (int item = 0; item < numItems; ++item) {
+            int itemRatings = 0;
+            for (int coder = 0; coder < numCoders; ++coder) {
+                double rating = ratings.get(coder, item);
+                if (!Double.isNaN(rating)) {
+                    values.add(rating);
+                    itemRatings++;
+                }
+            }
+            if (itemRatings > 1)
+                numObservedRatings += itemRatings;
+        }
+
+        Matrix coincidenceMatrix = 
+            new ArrayMatrix(values.size(), values.size());
+
+        double[] valuesArr = new double[values.size()];
+        double[] valueCounts = new double[values.size()];
+        int i = 0;
+        for (Double d : values)
+            valuesArr[i++] = d;
+
+        for (i = 0; i < valuesArr.length; ++i) {
+            for (int j = i; j < valuesArr.length; ++j) {
+
+                double rating1 = valuesArr[i];
+                double rating2 = valuesArr[j];
+
+                // For each rating pair, find out how many times this pair
+                // occurred together across all of the annotated items
+                for (int item = 0; item < numItems; ++item) {
+                    
+                    // How many coders answered this item
+                    int numResponses = 0;
+
+                    // How many pairs were found in this item that matched the
+                    // target
+                    int numPairsFound = 0;
+
+                    for (int coder = 0; coder < numCoders; ++coder) {
+                        double response = ratings.get(coder, item);
+                        if (Double.isNaN(response))
+                            continue;
+                        numResponses++;
+
+                        // Re-iterate through the responses again and find out
+                        // how many pairs (i=rating1,j) can be constructed where
+                        // j=rating2.
+                        if (rating1 == response) {
+                            for (int c = 0; c < numCoders; ++c) {
+                                if (c == coder)
+                                    continue;
+                                double r2 = ratings.get(c, item);
+                                if (Double.isNaN(r2))
+                                    continue;
+                                if (r2 == rating2) {
+//                                     System.out.printf("" (coder-%d,coder-%d)%n"",
+//                                                       coder, c);
+                                    numPairsFound++;
+                                }
+                            }
+                        }
+                    }
+                                       
+                    double coincidence =  (numResponses == 1)
+                        ? 0 
+                        : numPairsFound / (numResponses - 1d);
+                    double curCoincidence = coincidenceMatrix.get(i, j);
+
+//                     System.out.printf(""Found %d pairs of (%f, %f) in item "" +
+//                                       ""%d (with %d responses), co-incidence "" +
+//                                       ""is now: %f%n"", numPairsFound, 
+//                                       rating1, rating2, item, numResponses,
+//                                       curCoincidence + coincidence);
+
+                    coincidenceMatrix.set(i, j, curCoincidence + coincidence);
+                    coincidenceMatrix.set(j, i, curCoincidence + coincidence);
+                }
+            }
+        }
+
+        for (i = 0; i < valuesArr.length; ++i) {
+            for (int j = 0; j < valuesArr.length; ++j) {
+                valueCounts[i] += coincidenceMatrix.get(i, j);
+            }
+        }
+
+//         System.out.print("" "");
+//         for (i = 0; i < valuesArr.length; ++i) 
+//             System.out.print(""\t"" + valuesArr[i]);
+//         System.out.println();
+
+//         for (i = 0; i < valuesArr.length; ++i) {
+//             System.out.print(valuesArr[i]);
+//             for (int j = 0; j < valuesArr.length; ++j) {
+//                 System.out.printf(""\t%.2f"", coincidenceMatrix.get(i, j));
+//             }
+//             System.out.println();
+//         }
+
+//         System.out.println(java.util.Arrays.toString(valueCounts));
+        
+        Matrix differenceFunctionMatrix = 
+            new ArrayMatrix(valuesArr.length, valuesArr.length); 
+        for (i = 0; i < valuesArr.length; ++i) {
+            for (int j = i+1; j < valuesArr.length; ++j) {
+         
+                double sum = 0;
+                double ijSum = valueCounts[i] + valueCounts[j];
+                
+                for (int k = i; k <= j; ++k) {
+                    sum += valueCounts[k];
+                }
+       
+                sum -= (ijSum / 2d);
+                sum = sum * sum;
+
+                differenceFunctionMatrix.set(i, j, sum);
+                differenceFunctionMatrix.set(j, i, sum);
+            }
+        }
+                
+//         System.out.print("" "");
+//         for (i = 0; i < valuesArr.length; ++i) 
+//             System.out.print(""\t"" + valuesArr[i]);
+//         System.out.println();
+
+//         for (i = 0; i < valuesArr.length; ++i) {
+//             System.out.print(valuesArr[i]);
+//             for (int j = 0; j < valuesArr.length; ++j) {
+//                 System.out.printf(""\t%.2f"", differenceFunctionMatrix.get(i, j));
+//             }
+//             System.out.println();
+//         }
+        
+        
+
+        double numerator = 0;
+        double denominator = 0;
+
+//         System.out.println(""n: "" + numObservedRatings);
+
+         for (i = 0; i < valuesArr.length; ++i) {
+             for (int j = i+1; j < valuesArr.length; ++j) {
+                 double coincidence = coincidenceMatrix.get(i, j);
+                 double difference = differenceFunctionMatrix.get(i, j);
+                 numerator += coincidence * difference;
+                 denominator += valueCounts[i] * valueCounts[j] * difference;
+             }
+         }
+
+         return 1d - (numObservedRatings - 1) * (numerator / denominator);
+    }
+    
+//     static double compute(DifferenceFunction d, double value1, double value2) {
+//         switch (d) {
+//         case ORDINAL:
+//             return 
+//     }
+
+    public double[] computeConfidenceIntervals(
+            Matrix ratings, DifferenceFunction diffFunc, 
+            int numResamples, double[] confidenceIntervals) {
+
+        for (int i = 0; i < confidenceIntervals.length; ++i) {
+            double confidence = confidenceIntervals[i];
+            if (confidence < 0 || confidence > 1)
+                throw new IllegalArgumentException(
+                    ""confidence out of range [0,1]: "" + confidence);
+        }
+
+        Set<Double> values = new TreeSet<Double>();
+        int numCoders = ratings.rows();
+        int numItems = ratings.columns();
+        int numObservedRatings = 0;
+        for (int item = 0; item < numItems; ++item) {
+            int itemRatings = 0;
+            for (int coder = 0; coder < numCoders; ++coder) {
+                double rating = ratings.get(coder, item);
+                if (!Double.isNaN(rating)) {
+                    values.add(rating);
+                    itemRatings++;
+                }
+            }
+            if (itemRatings > 1)
+                numObservedRatings += itemRatings;
+        }
+
+        // Create a list of all the values used in this observation
+        double[] valueList = new double[numObservedRatings];
+        int idx = 0;
+        for (int item = 0; item < numItems; ++item) {
+            int itemRatings = 0;
+            for (int coder = 0; coder < numCoders; ++coder) {
+                double rating = ratings.get(coder, item);
+                if (!Double.isNaN(rating)) {
+                    itemRatings++;
+                }
+            }
+            if (itemRatings > 1) {
+                for (int coder = 0; coder < numCoders; ++coder) {
+                    double rating = ratings.get(coder, item);
+                    if (!Double.isNaN(rating)) {
+                        valueList[idx++] = rating;
+                    }
+                }
+            }
+        }
+
+        double[] resamples = new double[numResamples];
+        /*
+
+        double origAlpha = compute(ratings, diffFunc);
+
+        // int[] bins = new int[2001];
+
+
+        for (int resample = 0; resample < numResamples; ++resample) {
+
+            Matrix sampledAssignments = getRandomSample(ratings);
+                                                        
+//                     numCoders, numItems, numObservedRatings, valueList);
+            
+            double sampleAlpha = compute(sampledAssignments, diffFunc);
+
+            if (sampleAlpha > 1)
+                sampleAlpha = 1;
+
+            // int sampleAlphaIndex = (int)(sampleAlpha * 1000) + 1000;
+            // bins[sampleAlphaIndex]++;
+            samples[resample] = sampleAlpha;
+        }
+
+
+
+        int origAlphaIndex = (int)(origAlpha * 1000) + 1000;
+
+        double[] alphasAtConfidence = new double[confidenceIntervals.length];
+
+        double x = numResamples;
+
+         for (int i = 0; i < bins.length; ++i) {
+             System.err.println( ((i - 1000d) / 1000) + "" "" + bins[i]);
+         }
+
+        for (int i = 0; i < confidenceIntervals.length; ++i) {
+            double confidence = confidenceIntervals[i];
+            
+            double lowerBound = Double.NaN;
+            double upperBound = Double.NaN;
+
+            double probSum = 0;
+            for (int j = origAlphaIndex; j >= 0; j--) {
+                double prob = bins[j] / x;
+                probSum += prob;
+                if (probSum >= confidence/2) {
+                    lowerBound = (j - 1000d) / 1000;
+                    break;
+                }
+            }
+            probSum = 0;
+            for (int j = origAlphaIndex; j < bins.length; ++j) {
+                double prob = bins[j] / x;
+                probSum += prob;
+                if (probSum >= 1 - (confidence/2)) {
+                    upperBound = (j - 1000d) / 1000;
+                    break;
+                }
+
+            }
+            
+            System.out.printf(""Confidence at %f for alpha %f: (%f, %f)%n"",
+                              confidence, origAlpha, lowerBound, upperBound);
+        }
+        
+        return alphasAtConfidence;
+
+
+
+    }
+    */
+        
+   
+      for (int resample = 0; resample < numResamples; ++resample) {
+
+            Matrix sampledAssignments = getRandomSample(ratings);
+//                 getRandomSample(
+//                 numCoders, numItems, numObservedRatings, values);
+            
+            double sampleAlpha = compute(sampledAssignments, diffFunc);
+            resamples[resample] = sampleAlpha;
+        }
+
+        Arrays.sort(resamples);
+        double[] alphasAtConfidence = new double[confidenceIntervals.length];
+        for (int i = 0; i < confidenceIntervals.length; ++i) {
+            double confidence = confidenceIntervals[i];
+            int index = Math.min(resamples.length-1,
+                                 (int)(resamples.length * confidence));
+            System.out.printf(""resamples[%d] = %f%n"", index, resamples[index]);
+            alphasAtConfidence[i] = resamples[index];
+        }
+        
+        return alphasAtConfidence;
+    }    
+
+
+    static Matrix getRandomSample(Matrix m) {
+        int items = m.columns();
+        int coders = m.rows();
+        Matrix sampled = new ArrayMatrix(coders, items);
+
+        for (int item = 0; item < items; ++item) {
+            // Pick an item from the original matrix and add that as the new
+            // rating
+            int randomItem = (int)(Math.random() * items);
+            for (int coder = 0; coder < coders; ++coder) {
+                sampled.set(coder, item, m.get(coder, randomItem));
+            }
+        }
+        return sampled;
+    }
+
+    static Matrix getRandomSample(int coders, int items, int samples,
+                                  double[] values) {
+        Matrix sample = new ArrayMatrix(coders, items);
+
+
+        double[] valuesToAssign = Arrays.copyOf(values, values.length);
+
+        // REMINDER: special case this if there are no missing values
+        List<IntPair> toAssign = new ArrayList<IntPair>(samples);
+        for (int c = 0; c < coders; ++c) {
+            for (int i = 0; i < items; ++i) 
+                toAssign.add(new IntPair(c, i));
+        }
+        Collections.shuffle(toAssign);
+        
+//         // Dump the Set of values to an array for faster random access
+//         double[] valueArr = new double[values.size()];
+//         int x = 0;
+//         for (Double d : values)
+//             valueArr[x++] = d;
+
+        for (int i = 0; i < samples; ++i) {
+            IntPair assignment = toAssign.get(i);
+            sample.set(assignment.x, assignment.y, values[i]);
+//                       valueArr[(int)(Math.random() * valueArr.length)]);
+        }
+        
+        return sample;
+    }
+}
diff --git a/src/main/java/edu/ucla/sspace/util/MultiMap.java b/src/main/java/edu/ucla/sspace/util/MultiMap.java
index 38d4c87d..2d5ce48e 100644
--- a/src/main/java/edu/ucla/sspace/util/MultiMap.java
+++ b/src/main/java/edu/ucla/sspace/util/MultiMap.java
@@ -120,7 +120,11 @@ public interface MultiMap<K,V> {
     boolean putMany(K key, Collection<V> values);
 
     /**
-     * Removes the mapping for a key from this multi-map if it is present
+     * Removes the mapping for a key from this multi-map if it is present,
+     * returning any mapped values to that key
+     *
+     * @return the set of values mapped to the key or the empty set if the key
+     *         was not present
      */
     Set<V> remove(K key);
 
diff --git a/src/main/java/edu/ucla/sspace/util/ObjectCounter.java b/src/main/java/edu/ucla/sspace/util/ObjectCounter.java
index 2ed5ebaf..14c1769d 100644
--- a/src/main/java/edu/ucla/sspace/util/ObjectCounter.java
+++ b/src/main/java/edu/ucla/sspace/util/ObjectCounter.java
@@ -186,16 +186,15 @@ public Iterator<Map.Entry<T,Integer>> iterator() {
      * arbitrarily broken.
      */
     public T max() {
-        throw new Error();
-//         int maxCount = -1;
-//         T max = null;
-//         for (Map.Entry<T,Integer> e : counts.entrySet()) {
-//             if (e.getValue() > maxCount) {
-//                 maxCount = e.getValue();
-//                 max = e.getKey();
-//             }
-//         }
-//         return max;
+        TObjectIntIterator<T> iter = counts.iterator();
+        int maxCount = -1;
+        T max = null;
+        while (iter.hasNext()) {
+            iter.advance();
+            if (iter.value() > maxCount)
+                max = iter.key();
+        }
+        return max;
     }
 
     /**
@@ -204,16 +203,15 @@ public T max() {
      * arbitrarily broken.
      */
     public T min() {
-        throw new Error();
-//         int minCount = Integer.MAX_VALUE;
-//         T min = null;
-//         for (Map.Entry<T,Integer> e : counts.entrySet()) {
-//             if (e.getValue() < minCount) {
-//                 minCount = e.getValue();
-//                 min = e.getKey();
-//             }
-//         }
-//         return min;
+        TObjectIntIterator<T> iter = counts.iterator();
+        int minCount = Integer.MAX_VALUE;
+        T min = null;
+        while (iter.hasNext()) {
+            iter.advance();
+            if (iter.value() < minCount)
+                min = iter.key();
+        }
+        return min;
     }
 
     /**
diff --git a/src/main/java/edu/ucla/sspace/util/Pair.java b/src/main/java/edu/ucla/sspace/util/Pair.java
index 8a4f368f..9b88a3be 100644
--- a/src/main/java/edu/ucla/sspace/util/Pair.java
+++ b/src/main/java/edu/ucla/sspace/util/Pair.java
@@ -25,7 +25,9 @@
 /**
  * A utility class for holding two of the same type of object.
  */
-public class Pair<T> {
+public class Pair<T> implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * The first object in the pair
diff --git a/src/main/java/edu/ucla/sspace/util/SetDecorator.java b/src/main/java/edu/ucla/sspace/util/SetDecorator.java
index a71b2ca9..a91255fe 100644
--- a/src/main/java/edu/ucla/sspace/util/SetDecorator.java
+++ b/src/main/java/edu/ucla/sspace/util/SetDecorator.java
@@ -27,11 +27,18 @@
 
 
 /**
- * A wrapper around an existing {@link Set} implementation that allows classes
- * to extend the functionality of a set by overriding some of its methods.  For
- * example, a subclass could enforce a size capacity on an existing set by
- * overriding {@code add} and {@code addAll} to not add elements beyond a
- * certain number.
+ * A wrapper around an existing {@link Set} implementation that allows
+ * subclasses to modify or extend the functionality of am existing {@code Set}
+ * instance by overriding some of its methods.  For example, a subclass could
+ * enforce a size capacity on an existing set by overriding {@code add} and
+ * {@code addAll} to not add elements beyond a certain number.
+ *
+ * <p> Instances of this class support all the optional operations supported by
+ * their contained set.  All methods calls are passed through to the original
+ * set.
+ *
+ * <p> Subclasses must override methods of this class to change existing
+ * functionality.
  */
 public class SetDecorator<T> implements Set<T>, java.io.Serializable {
 
diff --git a/src/test/java/edu/ucla/sspace/graph/ChineseWhispersTest.java b/src/test/java/edu/ucla/sspace/graph/ChineseWhispersTest.java
new file mode 100644
index 00000000..c1bdda13
--- /dev/null
+++ b/src/test/java/edu/ucla/sspace/graph/ChineseWhispersTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import edu.ucla.sspace.util.*;
+
+import java.util.*;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+public class ChineseWhispersTest {
+
+    @Test public void testPaperExample() {
+        Graph<Edge> g = new SparseUndirectedGraph();
+        g.add(new SimpleEdge(1, 2));
+        g.add(new SimpleEdge(1, 3));
+        g.add(new SimpleEdge(1, 4));
+        g.add(new SimpleEdge(1, 5));
+        g.add(new SimpleEdge(1, 11));
+
+        g.add(new SimpleEdge(2, 3));
+        g.add(new SimpleEdge(2, 4));
+        g.add(new SimpleEdge(2, 5));
+        g.add(new SimpleEdge(2, 8));
+
+        g.add(new SimpleEdge(3, 4));
+        g.add(new SimpleEdge(3, 5));
+
+        g.add(new SimpleEdge(4, 5));
+
+        g.add(new SimpleEdge(6, 7));
+        g.add(new SimpleEdge(6, 8));
+        g.add(new SimpleEdge(6, 10));
+        g.add(new SimpleEdge(6, 11));
+
+        g.add(new SimpleEdge(7, 9));
+        g.add(new SimpleEdge(7, 10));
+        g.add(new SimpleEdge(7, 11));
+
+        g.add(new SimpleEdge(8, 6));
+        g.add(new SimpleEdge(8, 9));
+        g.add(new SimpleEdge(8, 11));
+
+        g.add(new SimpleEdge(9, 10));
+        g.add(new SimpleEdge(9, 11));
+
+        g.add(new SimpleEdge(10, 11));
+
+        
+
+        MultiMap<Integer,Integer> clustering = 
+            new ChineseWhispersClustering().cluster(Graphs.pack(g));
+
+        System.out.println(clustering);
+    }
+
+} 
\ No newline at end of file
diff --git a/src/test/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSetTest.java b/src/test/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSetTest.java
new file mode 100644
index 00000000..b45d2749
--- /dev/null
+++ b/src/test/java/edu/ucla/sspace/graph/SparseWeightedDirectedTypedEdgeSetTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import edu.ucla.sspace.util.OpenIntSet;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class SparseWeightedDirectedTypedEdgeSetTest {
+
+    @Test public void testConstructor() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        assertEquals(0, edges.size());
+        assertTrue(edges.isEmpty());
+    }
+
+    @Test public void testAdd() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertEquals(1, edges.size());
+        // Duplicate add
+        assertFalse(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertEquals(1, edges.size());
+        // Add without matching root vertex
+        assertFalse(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 4, 5, 1.0)));
+        assertEquals(1, edges.size());
+        // Add of second type
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertEquals(2, edges.size());
+        // Add of third type
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertEquals(3, edges.size());
+        // Add to different vertex
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+        assertEquals(4, edges.size());
+    }
+
+    @Test public void testContains() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 1, 0, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+        assertEquals(4, edges.size());
+
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 1, 0, 1.0)));
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 2, 1.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 2, 1.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 0, 2.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 2.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 3.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 4.0)));
+
+    }
+
+
+    @Test public void testContainsWithWeightReplacement() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 2.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 2.0)));
+    }
+
+
+    @Test public void testGetEdges() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+        assertEquals(4, edges.size());
+
+        Set<WeightedDirectedTypedEdge<String>> e = edges.getEdges(1);
+        assertEquals(3, e.size());
+        e = edges.getEdges(2);
+        assertEquals(1, e.size());
+    }
+
+    @Test public void testConnected() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+        assertEquals(4, edges.size());
+
+        Set<Integer> connected = edges.connected();
+        assertEquals(2, connected.size());
+        assertTrue(connected.contains(1));
+        assertTrue(connected.contains(2));
+
+        Iterator<Integer> it = connected.iterator();
+        int i = 0;
+        Set<Integer> test = new HashSet<Integer>();
+        while (it.hasNext()) {
+            test.add(it.next());
+            i++;
+        }
+        assertEquals(2, i);
+        assertEquals(2, test.size());
+        assertTrue(test.contains(2));
+        assertTrue(test.contains(1));
+    }
+
+    @Test public void testIterator() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+        assertEquals(4, edges.size());
+
+        Iterator<WeightedDirectedTypedEdge<String>> iter = edges.iterator();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        int i = 0;
+        while (iter.hasNext()) {
+            control.add(iter.next());
+            i++;
+        }
+        assertEquals(4, i);
+        assertEquals(4, control.size());
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+    }
+
+    @Test public void testIteratorInAndOutEdges() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        // Single add
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+
+        assertEquals(4, edges.size());
+
+        Iterator<WeightedDirectedTypedEdge<String>> iter = edges.iterator();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        int i = 0;
+        while (iter.hasNext()) {
+            control.add(iter.next());
+            i++;
+        }
+        assertEquals(4, i);
+        assertEquals(4, control.size());
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 1, 1.0)));
+        assertTrue(control.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 2, 1.0)));
+    }   
+    
+    @Test public void testSize() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        for (int j = 1; j < 10; ++j) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, j, 1.0);
+            assertTrue(edges.add(e));
+            assertEquals(j, edges.size());
+        }
+    }
+
+    @Test public void testSizeAfterReplacement() {
+        SparseWeightedDirectedTypedEdgeSet<String> edges = 
+            new SparseWeightedDirectedTypedEdgeSet<String>(0);
+        for (int j = 1; j < 10; ++j) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, j, 1.0);
+            assertTrue(edges.add(e));
+            assertEquals(j, edges.size());
+        }
+
+        assertEquals(9, edges.size());
+        WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 2.0);
+        edges.add(e);
+        assertEquals(9, edges.size());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/ucla/sspace/graph/WeightedDirectedMultigraphTest.java b/src/test/java/edu/ucla/sspace/graph/WeightedDirectedMultigraphTest.java
new file mode 100644
index 00000000..1f9e9cc7
--- /dev/null
+++ b/src/test/java/edu/ucla/sspace/graph/WeightedDirectedMultigraphTest.java
@@ -0,0 +1,1825 @@
+/*
+ * Copyright 2011 David Jurgens
+ *
+ * This file is part of the S-Space package and is covered under the terms and
+ * conditions therein.
+ *
+ * The S-Space package is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation and distributed hereunder to you.
+ *
+ * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
+ * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
+ * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
+ * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
+ * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
+ * RIGHTS.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package edu.ucla.sspace.graph;
+
+import java.util.*;
+
+import edu.ucla.sspace.util.OpenIntSet;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+/**
+ *
+ */
+public class WeightedDirectedMultigraphTest { 
+
+    @Test public void testConstructor() {
+        Set<Integer> vertices = new HashSet<Integer>();
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertEquals(0, g.order());
+        assertEquals(0, g.size());
+    }
+
+    @Test(expected=NullPointerException.class) public void testConstructor2NullArg() {
+        Graph<Edge> g = new SparseUndirectedGraph((Graph<DirectedTypedEdge<String>>)null);
+    }
+
+    @Test public void testAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(0));
+        assertEquals(1, g.order());
+        assertTrue(g.contains(0));
+        // second add should have no effect
+        assertFalse(g.add(0));
+        assertEquals(1, g.order());
+        assertTrue(g.contains(0));
+
+        assertTrue(g.add(1));
+        assertEquals(2, g.order());
+        assertTrue(g.contains(1));
+    }
+
+    @Test public void testEquals() {
+        WeightedDirectedMultigraph<String> g1 = new WeightedDirectedMultigraph<String>();
+        WeightedDirectedMultigraph<String> g2 = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                g1.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+                g2.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+            }
+        }
+        assertEquals(g1, g2);
+
+        g1 = new WeightedDirectedMultigraph<String>();
+        g2 = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                g1.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+                g2.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",j, i, 1.0));
+            }
+        }
+
+        assertFalse(g1.equals(g2));
+        assertFalse(g2.equals(g1));
+    }
+
+    @Test public void testEqualGeneric() {
+        WeightedDirectedMultigraph<String> g1 = new WeightedDirectedMultigraph<String>();
+        Graph<WeightedDirectedTypedEdge<String>> g2 = new GenericGraph<WeightedDirectedTypedEdge<String>>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                g1.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+                g2.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+            }
+        }
+        assertEquals(g1, g2);
+    }
+
+    @Test public void testContainsEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 100; ++i)
+            for (int j = i + 1; j < 100; ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+
+        for (int i = 0; i < 100; ++i) {
+            for (int j = i + 1; j < 100; ++j) {
+                g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+                g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",j, i, 1.0));
+                g.contains(i, j);
+                g.contains(j, i);
+            }
+        }
+    }
+
+    @Test public void testAddEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertEquals(2, g.order());
+        assertEquals(1, g.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+
+        g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 2, 1.0));
+        assertEquals(3, g.order());
+        assertEquals(2, g.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 2, 1.0)));
+
+        g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",3, 4, 1.0));
+        assertEquals(5, g.order());
+        assertEquals(3, g.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",3, 4, 1.0)));
+    }
+
+    @Test public void testRemoveLesserVertexWithEdges() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        for (int i = 1; i < 100; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            g.add(e);
+        }
+       
+        assertTrue(g.contains(0));
+        assertTrue(g.remove(0));
+        assertEquals(99, g.order());
+        assertEquals(0, g.size());
+    }
+
+    @Test public void testRemoveHigherVertexWithEdges() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        for (int i = 0; i < 99; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",100, i, 1.0);
+            g.add(e);
+        }
+        
+        assertTrue(g.contains(100));
+        assertTrue(g.remove(100));
+        assertEquals(99, g.order());
+        assertEquals(0, g.size());
+    }
+
+
+    @Test public void testRemoveVertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+        }
+
+        for (int i = 99; i >= 0; --i) {            
+            assertTrue(g.remove(i));
+            assertEquals(i, g.order());
+            assertFalse(g.contains(i));
+            assertFalse(g.remove(i));
+        }
+    }
+
+    @Test public void testRemoveEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        for (int i = 1; i < 100; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            g.add(e);
+        }
+        
+        for (int i = 99; i > 0; --i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            assertTrue(g.remove(e));
+            assertEquals(i-1, g.size());
+            assertFalse(g.contains(e));
+            assertFalse(g.remove(e));
+        }
+    }
+
+    @Test public void testVertexIterator() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+        assertEquals(control.size(), g.order());
+        for (Integer i : g.vertices())
+            assertTrue(control.contains(i));        
+    }
+
+    @Test public void testEdgeIterator() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            g.add(e);
+            control.add(e);
+        }
+
+        assertEquals(control.size(), g.size());
+        assertEquals(control.size(), g.edges().size());
+        int returned = 0;
+        for (Edge e : g.edges()) {
+            assertTrue(control.remove(e));
+            returned++;
+        }
+        assertEquals(g.size(), returned);
+        assertEquals(0, control.size());
+    }
+
+    @Test public void testEdgeIteratorSmall() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 1; i <= 5; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            assertTrue(g.add(e));
+            control.add(e);
+        }
+
+        assertEquals(control.size(), g.size());
+        assertEquals(control.size(), g.edges().size());
+        int returned = 0;
+        for (Edge e : g.edges()) {
+            System.out.println(e);
+            assertTrue(control.contains(e));
+            returned++;
+        }
+        assertEquals(control.size(), returned);
+    }
+
+    @Test public void testEdgeIteratorSmallReverse() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 1; i <= 5; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, 0, 1.0);
+            g.add(e);
+            control.add(e);
+        }
+
+        assertEquals(control.size(), g.size());
+        assertEquals(control.size(), g.edges().size());
+        int returned = 0;
+        for (Edge e : g.edges()) {
+            System.out.println(e);
+            assertTrue(control.contains(e));
+            returned++;
+        }
+        assertEquals(control.size(), returned);
+    }
+
+
+    @Test public void testAdjacentEdges() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            g.add(e);
+            control.add(e);
+        }
+        
+        Set<WeightedDirectedTypedEdge<String>> test = g.getAdjacencyList(0);
+        assertEquals(control, test);
+    }
+
+    @Test public void testAdjacencyListSize() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+        
+        Set<WeightedDirectedTypedEdge<String>> adjList = g.getAdjacencyList(0);
+        assertEquals(9, adjList.size());
+
+        adjList = g.getAdjacencyList(1);
+        assertEquals(9, adjList.size());
+
+        adjList = g.getAdjacencyList(2);
+        assertEquals(9, adjList.size());
+
+        adjList = g.getAdjacencyList(3);
+        assertEquals(9, adjList.size());
+
+        adjList = g.getAdjacencyList(5);
+        assertEquals(9, adjList.size());
+    }
+
+
+    @Test public void testAdjacentEdgesRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            g.add(e);
+            control.add(e);
+        }
+        
+        Set<WeightedDirectedTypedEdge<String>> test = g.getAdjacencyList(0);
+        assertEquals(control, test);
+
+        Edge removed = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0);
+        assertTrue(test.remove(removed));
+        assertTrue(control.remove(removed));
+        assertEquals(control, test);
+        assertEquals(99, g.size());
+    }
+
+    @Test public void testAdjacentEdgesAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> control = 
+            new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            WeightedDirectedTypedEdge<String> e = 
+                new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0);
+            g.add(e);
+            control.add(e);
+        }
+        
+        Set<WeightedDirectedTypedEdge<String>> test = g.getAdjacencyList(0);
+        assertEquals(control, test);
+
+        WeightedDirectedTypedEdge<String> added = 
+            new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 101, 1.000);
+        assertTrue(test.add(added));
+        assertTrue(control.add(added));
+        assertEquals(control, test);
+        assertEquals(101, g.size());
+        assertTrue(g.contains(added));
+        assertTrue(g.contains(101));
+        assertEquals(102, g.order());
+    }
+
+    @Test public void testClear() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        g.clear();
+        assertEquals(0, g.size());
+        assertEquals(0, g.order());
+        assertEquals(0, g.vertices().size());
+        assertEquals(0, g.edges().size());
+        
+        // Error checking case for double-clear
+        g.clear();
+    }
+
+    @Test public void testClearEdges() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        g.clearEdges();
+        assertEquals(0, g.size());
+        assertEquals(10, g.order());
+        assertEquals(10, g.vertices().size());
+        assertEquals(0, g.edges().size());
+        
+        // Error checking case for double-clear
+        g.clearEdges();
+    }
+
+    @Test public void testToString() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 1; j < 10; ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        g.toString();
+
+        // only vertices
+        g.clearEdges();
+        g.toString();
+
+        // empty graph
+        g.clear();
+        g.toString();
+        
+    }
+
+    /******************************************************************
+     *
+     *
+     * VertexSet tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(vertices.add(100));
+        assertTrue(g.contains(100));
+        assertEquals(101, vertices.size());
+        assertEquals(101, g.order());
+        
+        // dupe
+        assertFalse(vertices.add(100));
+        assertEquals(101, vertices.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetAddFromGraph() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(g.add(100));
+        assertTrue(g.contains(100));
+        assertTrue(vertices.contains(100));
+        assertEquals(101, vertices.size());
+        assertEquals(101, g.order());
+        
+        // dupe
+        assertFalse(vertices.add(100));
+        assertEquals(101, vertices.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(g.contains(99));
+        assertTrue(vertices.remove(99));
+        assertFalse(g.contains(99));
+        assertEquals(99, vertices.size());
+        assertEquals(99, g.order());
+        
+        // dupe
+        assertFalse(vertices.remove(99));
+        assertEquals(99, vertices.size());
+    }
+
+    @Test public void testVertexSetRemoveFromGraph() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(g.remove(99));
+
+        assertFalse(g.contains(99));
+        assertFalse(vertices.contains(99));
+        assertEquals(99, vertices.size());
+        assertEquals(99, g.order());        
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        Iterator<Integer> iter = vertices.iterator();
+        assertTrue(iter.hasNext());
+        Integer toRemove = iter.next();
+        assertTrue(g.contains(toRemove));
+        assertTrue(vertices.contains(toRemove));
+        iter.remove();
+        assertFalse(g.contains(toRemove));
+        assertFalse(vertices.contains(toRemove));
+        assertEquals(g.order(), vertices.size());
+    }
+
+    @Test(expected=NoSuchElementException.class) public void testVertexSetIteratorTooFar() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        Iterator<Integer> iter = vertices.iterator();
+        int i = 0;
+        while (iter.hasNext()) {
+            i++; 
+            iter.next();
+        }
+        assertEquals(vertices.size(), i);
+        iter.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemoveTwice() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        Iterator<Integer> iter = vertices.iterator();
+        assertTrue(iter.hasNext());
+        Integer toRemove = iter.next();
+        assertTrue(g.contains(toRemove));
+        assertTrue(vertices.contains(toRemove));
+        iter.remove();
+        iter.remove();
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemoveEarly() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        Iterator<Integer> iter = vertices.iterator();
+        iter.remove();
+    }
+    
+
+    /******************************************************************
+     *
+     *
+     * EdgeView tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testEdgeViewAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> edges = g.edges();
+        assertEquals(g.size(), edges.size());
+        edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0));
+        assertEquals(2, g.order());
+        assertEquals(1, g.size());
+        assertEquals(1, edges.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+    }
+
+    @Test public void testEdgeViewRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> edges = g.edges();
+        assertEquals(g.size(), edges.size());
+        edges.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0));
+        edges.remove(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0));
+        assertEquals(2, g.order());
+        assertEquals(0, g.size());
+        assertEquals(0, edges.size());
+        assertFalse(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+    }
+
+    @Test public void testEdgeViewIterator() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> edges = g.edges();
+
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 0; i < 100; i += 2)  {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, i+1, 1.0);
+            g.add(e); // all disconnected
+            control.add(e);
+        }
+    
+
+        assertEquals(100, g.order());
+        assertEquals(50, g.size());
+        assertEquals(50, edges.size());
+        
+        Set<WeightedDirectedTypedEdge<String>> test = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (WeightedDirectedTypedEdge<String> e : edges)
+            test.add(e);
+        assertEquals(control.size(), test.size());
+        for (Edge e : test)
+            assertTrue(control.contains(e));        
+    }
+
+    @Test public void testEdgeViewIteratorRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> edges = g.edges();
+
+        Set<WeightedDirectedTypedEdge<String>> control = new HashSet<WeightedDirectedTypedEdge<String>>();
+        for (int i = 0; i < 10; i += 2)  {
+            WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, i+1, 1.0);
+            g.add(e); // all disconnected
+            control.add(e);
+        }
+    
+        assertEquals(10, g.order());
+        assertEquals(5, g.size());
+        assertEquals(5, edges.size());
+        
+        Iterator<WeightedDirectedTypedEdge<String>> iter = edges.iterator();
+        while (iter.hasNext()) {
+            iter.next();
+            iter.remove();
+        }
+        assertEquals(0, g.size());
+        assertFalse(g.edges().iterator().hasNext());
+        assertEquals(0, edges.size());
+        assertEquals(10, g.order());            
+    }
+
+    /******************************************************************
+     *
+     *
+     * AdjacencyListView tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testAdjacencyList() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 1; j < 10; ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+
+        for (int i = 0; i < 10; ++i) {
+            Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(i);
+            assertEquals(9, adjacencyList.size());
+            
+            for (int j = 0; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                if (i >= j)
+                    assertFalse(adjacencyList.contains(e));
+                else 
+                    assertTrue(adjacencyList.contains(e));
+            }
+        }
+    }
+
+    @Test public void testAdjacencyListRemoveEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 1; j < 10; ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        Edge e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0);
+        assertTrue(adjacencyList.contains(e));
+        assertTrue(adjacencyList.remove(e));
+        assertEquals(8, adjacencyList.size());
+        assertEquals( (10 * 9) / 2 - 1, g.size());
+    }
+
+    public void testAdjacencyListAddEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 2; j < 10; ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+
+        assertEquals( (10 * 9) / 2 - 9, g.size());
+
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0);
+        assertFalse(adjacencyList.contains(e));
+        assertFalse(g.contains(e));
+        
+        assertTrue(adjacencyList.add(e));
+        assertTrue(g.contains(e));
+      
+        assertEquals(9, adjacencyList.size());
+        assertEquals( (10 * 9) / 2 - 8, g.size());
+    }
+
+    @Test public void testAdjacencyListIterator() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<WeightedDirectedTypedEdge<String>> test = new HashSet<WeightedDirectedTypedEdge<String>>();
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<WeightedDirectedTypedEdge<String>> it = adjacencyList.iterator();
+        int i = 0;
+        while (it.hasNext())
+            assertTrue(test.add(it.next()));
+        assertEquals(9, test.size());
+    }
+
+    @Test public void testAdjacencyListNoVertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);        
+        assertEquals(0, adjacencyList.size());
+    }
+
+    @Test(expected=NoSuchElementException.class)
+    public void testAdjacencyListIteratorNextOffEnd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<WeightedDirectedTypedEdge<String>> test = new HashSet<WeightedDirectedTypedEdge<String>>();
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<WeightedDirectedTypedEdge<String>> it = adjacencyList.iterator();
+        int i = 0;
+        while (it.hasNext())
+            assertTrue(test.add(it.next()));
+        assertEquals(9, test.size());
+        it.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacencyListIteratorRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<WeightedDirectedTypedEdge<String>> test = new HashSet<WeightedDirectedTypedEdge<String>>();
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<WeightedDirectedTypedEdge<String>> it = adjacencyList.iterator();
+        assertTrue(it.hasNext());
+        Edge e = it.next();
+        it.remove();
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testAdjacencyListIteratorRemoveFirst() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<WeightedDirectedTypedEdge<String>> test = new HashSet<WeightedDirectedTypedEdge<String>>();
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<WeightedDirectedTypedEdge<String>> it = adjacencyList.iterator();
+        it.remove();
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAdjacencyListIteratorRemoveTwice() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<WeightedDirectedTypedEdge<String>> test = new HashSet<WeightedDirectedTypedEdge<String>>();
+        Set<WeightedDirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<WeightedDirectedTypedEdge<String>> it = adjacencyList.iterator();
+        assertTrue(it.hasNext());
+        it.next();
+        it.remove();
+        it.remove();
+    }
+
+    /******************************************************************
+     *
+     *
+     * AdjacentVerticesView tests 
+     *
+     *
+     ******************************************************************/
+
+
+    @Test public void testAdjacentVertices() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        assertEquals(9, adjacent.size());
+        for (int i = 1; i < 10; ++i)
+            assertTrue(adjacent.contains(i));
+        assertFalse(adjacent.contains(0));
+        assertFalse(adjacent.contains(10));
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        adjacent.add(1);
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        adjacent.remove(1);
+    }
+
+    @Test public void testAdjacentVerticesIterator() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        Iterator<Integer> it = adjacent.iterator();
+        while (it.hasNext())
+            assertTrue(test.add(it.next()));
+        assertEquals(9, test.size());
+    }
+
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesIteratorRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        Iterator<Integer> it = adjacent.iterator();
+        assertTrue(it.hasNext());
+        it.next();
+        it.remove();
+    }
+
+    /******************************************************************
+     *
+     *
+     * Subgraph tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testSubgraph() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+    }
+
+    @Test public void testSubgraphContainsVertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);        
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+        for (int i = 0; i < 5; ++i)
+            assertTrue(subgraph.contains(i));
+        for (int i = 5; i < 10; ++i) {
+            assertTrue(g.contains(i));
+            assertFalse(subgraph.contains(i));
+        }
+    }
+
+    @Test public void testSubgraphContainsEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);        
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+        for (int i = 0; i < 5; ++i) {
+            for (int j = i+1; j < 5; ++j) {
+                assertTrue(subgraph.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0)));
+            }
+        }
+
+        for (int i = 5; i < 10; ++i) {
+            for (int j = i+1; j < 10; ++j) {
+                WeightedDirectedTypedEdge<String> e = new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0);
+                assertTrue(g.contains(e));
+                assertFalse(subgraph.contains(e));
+            }
+        }
+    }
+
+    @Test public void testSubgraphAddEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < i+2 && j < 10; ++j)
+                assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0)));
+        }    
+
+        assertEquals(9, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals(4, subgraph.size());
+
+        // Add an edge to a new vertex
+        assertTrue(subgraph.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 0, 1.0)));
+        assertEquals(5, subgraph.size());
+        assertEquals(5, subgraph.order());
+        assertEquals(10, g.size());
+
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphAddEdgeNewVertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        // Add an edge to a new vertex
+        assertTrue(subgraph.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 5, 1.0)));
+        assertEquals( (5 * 4) / 2 + 1, subgraph.size());
+        assertEquals(6, subgraph.order());
+        assertEquals(11, g.order());
+        assertEquals( (9*10)/2 + 1, g.size());
+    }
+
+    @Test public void testSubgraphRemoveEdge() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        // Remove an existing edge
+        assertTrue(subgraph.remove(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertEquals( (5 * 4) / 2 - 1, subgraph.size());
+        assertEquals(5, subgraph.order());
+        assertEquals(10, g.order());
+        assertEquals( (9*10)/2 - 1, g.size());
+
+        // Remove a non-existent edge, which should have no effect even though
+        // the edge is present in the backing graph
+        assertFalse(subgraph.remove(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 6, 1.0)));
+        assertEquals( (5 * 4) / 2 - 1, subgraph.size());
+        assertEquals(5, subgraph.order());
+        assertEquals(10, g.order());
+        assertEquals( (9*10)/2 - 1, g.size());
+    }
+
+
+    /******************************************************************
+     *
+     *
+     * SubgraphVertexView tests 
+     *
+     *
+     ******************************************************************/
+
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        Set<Integer> test = subgraph.vertices();
+        assertEquals(5, test.size());
+
+        // Add a vertex 
+        assertTrue(test.add(5));
+        assertEquals(6, test.size());
+        assertEquals(6, subgraph.order());
+        assertEquals(11, g.order());
+        assertEquals( (5*4)/2, subgraph.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        Set<Integer> test = subgraph.vertices();
+        assertEquals(5, test.size());
+
+        // Add a vertex 
+        assertTrue(test.remove(0));
+        assertEquals(4, test.size());
+        assertEquals(4, subgraph.order());
+        assertEquals(9, g.order());
+        assertEquals( (4*3)/2, subgraph.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesIteratorRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        Set<Integer> test = subgraph.vertices();
+        assertEquals(5, test.size());
+        Iterator<Integer> it = test.iterator();
+        assertTrue(it.hasNext());
+        // Remove the first vertex returned
+        it.next();
+        it.remove();
+        
+        assertEquals(4, test.size());
+        assertEquals(4, subgraph.order());
+        assertEquals(9, g.order());
+        assertEquals( (4*3)/2, subgraph.size());
+    }
+
+
+    /******************************************************************
+     *
+     *
+     * SubgraphEdgeView tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testSubgraphEdges() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            g.add(i);
+        }
+        g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0));
+        g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 2, 1.0));
+        g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",1, 2, 1.0));
+
+        assertEquals(3, g.size());
+
+        Set<Integer> verts = new HashSet<Integer>();
+        for (int i = 0; i < 3; ++i)
+            verts.add(i);
+
+        WeightedDirectedMultigraph<String> sub = g.subgraph(verts);
+        assertEquals(3, sub.order());
+        assertEquals(3, sub.size());
+     
+        Set<WeightedDirectedTypedEdge<String>> edges = sub.edges();
+        assertEquals(3, edges.size());
+        int j = 0; 
+        Iterator<WeightedDirectedTypedEdge<String>> iter = edges.iterator();
+        while (iter.hasNext()) {
+            iter.next();
+            j++;
+        }
+        assertEquals(3, j);
+
+        verts.clear();
+        for (int i = 3; i < 6; ++i)
+            verts.add(i);
+
+        sub = g.subgraph(verts);
+        assertEquals(3, sub.order());
+        assertEquals(0, sub.size());
+    
+        edges = sub.edges();
+        assertEquals(0, edges.size());
+
+        iter = edges.iterator();
+        assertFalse(iter.hasNext());
+    }
+
+
+    /******************************************************************
+     *
+     *
+     * SubgraphAdjacencyListView tests 
+     *
+     *
+     ******************************************************************/
+
+
+    @Test public void testSubgraphAdjacencyListContains() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        Set<WeightedDirectedTypedEdge<String>> adjList = subgraph.getAdjacencyList(0);
+
+        for (int i = 1; i < 5; ++i)
+            assertTrue(adjList.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0)));
+
+        for (int i = 5; i < 10; ++i)
+            assertFalse(adjList.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, i, 1.0)));
+    }
+
+    @Test public void testSubgraphAdjacencyListSize() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        Set<WeightedDirectedTypedEdge<String>> adjList = subgraph.getAdjacencyList(0);
+        assertEquals(4, adjList.size());
+
+        adjList = subgraph.getAdjacencyList(1);
+        assertEquals(4, adjList.size());
+
+        adjList = subgraph.getAdjacencyList(2);
+        assertEquals(4, adjList.size());
+
+        adjList = subgraph.getAdjacencyList(3);
+        assertEquals(4, adjList.size());
+
+        adjList = subgraph.getAdjacencyList(4);
+        assertEquals(4, adjList.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphAdjacencyListAddNewVertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        Set<WeightedDirectedTypedEdge<String>> adjList = subgraph.getAdjacencyList(0);
+        // Add an edge to a new vertex
+        assertTrue(adjList.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 5, 1.0)));
+    }
+
+    /******************************************************************
+     *
+     *
+     * SubgraphAdjacentVerticesView tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testSubgraphAdjacentVertices() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        Set<Integer> adjacent = subgraph.getNeighbors(0);
+        assertEquals(4, adjacent.size());
+        // check contents
+        for (int i = 1; i < 5; ++i)
+            assertTrue(adjacent.contains(i));
+
+        adjacent = subgraph.getNeighbors(1);
+        assertEquals(4, adjacent.size());
+
+        adjacent = subgraph.getNeighbors(2);
+        assertEquals(4, adjacent.size());
+
+        adjacent = subgraph.getNeighbors(3);
+        assertEquals(4, adjacent.size());
+
+        adjacent = subgraph.getNeighbors(4);
+        assertEquals(4, adjacent.size());
+
+        adjacent = subgraph.getNeighbors(5);
+        assertEquals(0, adjacent.size());
+
+        
+    }
+
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphAdjacentVerticesAdd() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        Set<Integer> adjacent = subgraph.getNeighbors(0);
+        adjacent.add(0);
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphAdjacentVerticesRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        Set<Integer> adjacent = subgraph.getNeighbors(0);
+        adjacent.remove(0);
+    }
+
+    @Test public void testSubgraphAdjacentVerticesIterator() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        
+        vertices.remove(0); // now is the adjacent vertices of 0
+
+        Set<Integer> adjacent = subgraph.getNeighbors(0);
+        assertEquals(vertices, adjacent);
+        Iterator<Integer> it = adjacent.iterator();
+        int i = 0;
+        while (it.hasNext()) {
+            i++;
+            vertices.remove(it.next());
+        }
+        assertEquals(4, i);
+        assertEquals(0, vertices.size());        
+    }
+
+    @Test(expected=UnsupportedOperationException.class) 
+    public void testSubgraphAdjacentVerticesIteratorRemove() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        vertices.remove(0); // now is the adjacent vertices of 0
+        
+        Set<Integer> adjacent = subgraph.getNeighbors(0);        
+        assertEquals(vertices, adjacent);
+        Iterator<Integer> it = adjacent.iterator();
+        assertTrue(it.hasNext());
+        it.next();
+        it.remove();
+    }
+
+    /******************************************************************
+     *
+     *
+     * Tests that create a subgraph and then modify the backing graph
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testSubgraphWhenVerticesRemovedFromBacking() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+
+        g.remove(0);
+        assertEquals(4, subgraph.order());
+        assertEquals((3 * 4) / 2, subgraph.size());
+
+        g.remove(1);
+        assertFalse(subgraph.contains(1));
+
+        g.remove(2);
+        assertFalse(subgraph.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",2,3, 1.0)));
+    }
+
+    @Test public void testSubgraphVertexIteratorWhenVerticesRemovedFromBacking() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        g.remove(0);
+        Iterator<Integer> it = subgraph.vertices().iterator();
+        int i = 0;
+        while (it.hasNext()) {
+            assertTrue(0 != it.next());
+            i++;
+        }
+        assertEquals(4, i);
+    }
+
+    @Test public void testSubgraphEdgesWhenVerticesRemovedFromBacking() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",i, j, 1.0));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        WeightedDirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        Set<WeightedDirectedTypedEdge<String>> edges = subgraph.edges();
+        g.remove(0);
+        assertEquals((4 * 3) / 2, edges.size());
+        assertFalse(edges.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+    }
+
+    /****************
+     *
+     *
+     * Tests on graphs with multiple edge types
+     *
+     *
+     ****************/
+
+    @Test public void testAddTypedEdges() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertEquals(2, g.order());
+        assertEquals(1, g.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertEquals(1, g.edgeTypes().size());
+
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertEquals(2, g.order());
+        assertEquals(2, g.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertEquals(2, g.edgeTypes().size());
+
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+        assertEquals(4, g.order());
+        assertEquals(3, g.size());
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"",3, 4, 1.0)));
+        assertEquals(3, g.edgeTypes().size());
+    }
+
+    @Test public void testNeighborsOfDifferentTypes() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 0, 3, 1.0)));
+
+        Set<Integer> neighbors = g.getNeighbors(0);
+        assertEquals(3, g.size());
+        assertEquals(3, neighbors.size());
+        assertTrue(neighbors.contains(1));
+        assertTrue(neighbors.contains(2));
+        assertTrue(neighbors.contains(3));
+
+        // Test bi-directional case
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 0, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 2, 0, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 0, 1.0)));
+
+        neighbors = g.getNeighbors(0);
+        assertEquals(3, neighbors.size());
+        assertEquals(6, g.size());
+
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 4, 0, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 5, 0, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 6, 0, 1.0)));
+
+        neighbors = g.getNeighbors(0);
+        assertEquals(6, neighbors.size());
+        assertEquals(9, g.size());
+        for (int i = 1; i <= 6; ++i)
+            assertTrue(neighbors.contains(i));
+    }
+
+    @Test public void testSubgraphOfSubtype() {
+        // set up the network
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 3, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+
+        
+        Set<Integer> verts = new HashSet<Integer>();
+        verts.add(0);
+        verts.add(1);
+        Set<String> types = Collections.singleton(""type-1"");
+        WeightedDirectedMultigraph<String> sub = g.subgraph(g.vertices(), types);
+        assertEquals(1, sub.edgeTypes().size());
+        assertEquals(3, sub.size());
+        assertEquals(g.order(), sub.order());       
+        assertFalse(sub.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));        
+    }
+
+    /****************
+     *
+     *
+     * Tests for copy()
+     *
+     *
+     ****************/
+
+    @Test public void testCopyAllVertices() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"",3, 4, 1.0)));
+
+        WeightedDirectedMultigraph<String> copy = g.copy(g.vertices());
+        assertEquals(g.order(), copy.order());
+        assertEquals(g.size(), copy.size());
+        assertEquals(g, copy);
+
+        copy.remove(4);
+        assertEquals(4, g.order());
+        assertEquals(3, copy.order());
+    }
+
+    @Test public void testCopy1vertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"",3, 4, 1.0)));
+
+        WeightedDirectedMultigraph<String> copy = g.copy(Collections.singleton(1));
+        assertEquals(1, copy.order());
+        assertEquals(0, copy.size());
+    }
+
+    @Test public void testCopy2vertex() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"",3, 4, 1.0)));
+
+        Set<Integer> verts = new HashSet<Integer>();
+        Collections.addAll(verts, 0, 1);
+        WeightedDirectedMultigraph<String> copy = g.copy(verts);
+        assertEquals(2, copy.order());
+        assertEquals(2, copy.size());
+    }
+
+
+    @Test public void testCopy3vertexTriangle() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 2, 0, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 2, 3, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+
+        Set<Integer> verts = new HashSet<Integer>();
+        Collections.addAll(verts, 0, 1, 2);
+        WeightedDirectedMultigraph<String> copy = g.copy(verts);
+        assertEquals(3, copy.order());
+        assertEquals(7, copy.size());
+    }
+
+    @Test public void testCopy3vertexVee() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 1, 2, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"", 2, 3, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+
+        Set<Integer> verts = new HashSet<Integer>();
+        Collections.addAll(verts, 0, 1, 2);
+        WeightedDirectedMultigraph<String> copy = g.copy(verts);
+        assertEquals(3, copy.order());
+        assertEquals(5, copy.size());
+    }
+
+
+    @Test public void testEmptyCopy() {
+        WeightedDirectedMultigraph<String> g = new WeightedDirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-1"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-2"",0, 1, 1.0)));
+        assertTrue(g.add(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+        assertTrue(g.contains(new SimpleWeightedDirectedTypedEdge<String>(""type-3"", 3, 4, 1.0)));
+
+        WeightedDirectedMultigraph<String> copy = g.copy(Collections.<Integer>emptySet());
+        assertEquals(0, copy.order());
+        assertEquals(0, copy.size());
+        assertEquals(new WeightedDirectedMultigraph<String>(), copy);
+        
+        copy.add(5);
+        assertTrue(copy.contains(5));
+        assertFalse(g.contains(5));
+    }
+
+
+    /*
+     * To test:
+     *
+     * - remove vertex causes edge type to no longer be present (graph + subgraph)
+     * - remove a vertex and then add the vertex back in (not present in subgraph)
+     * - all of the DirectedGraph methods
+     *
+     */
+    
+
+}
\ No newline at end of file
diff --git a/src/test/java/edu/ucla/sspace/index/DefaultPermutationFunctionTest.java b/src/test/java/edu/ucla/sspace/index/DefaultPermutationFunctionTest.java
index 616b94a3..4122a81b 100644
--- a/src/test/java/edu/ucla/sspace/index/DefaultPermutationFunctionTest.java
+++ b/src/test/java/edu/ucla/sspace/index/DefaultPermutationFunctionTest.java
@@ -41,7 +41,7 @@ public class DefaultPermutationFunctionTest {
 
         DefaultPermutationFunction func = new DefaultPermutationFunction();
         Vector permuted = func.permute(v, 1);
-        System.out.printf(""%d %d\n"", permuted.getValue(0).intValue(), v.get(0));
+        System.out.printf(""original: %s%npermuted: %s\n"", v, permuted);
         assertNotEquals(v, permuted);
         assertEquals(v.length(), permuted.length());
         assertTrue(permuted instanceof IntegerVector);
diff --git a/src/test/java/edu/ucla/sspace/util/ArrayMapTests.java b/src/test/java/edu/ucla/sspace/util/ArrayMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/ArrayMapTests.java
rename to src/test/java/edu/ucla/sspace/util/ArrayMapTest.java
index 6c34b158..a18f0bf8 100644
--- a/src/test/java/edu/ucla/sspace/util/ArrayMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/ArrayMapTest.java
@@ -31,7 +31,7 @@
 /**
  * A collection of unit tests for {@link ArrayMap} 
  */
-public class ArrayMapTests {
+public class ArrayMapTest {
    
     @Test public void testCreate() {
         Map<Integer,String> map = new ArrayMap<String>(new String[] { ""foo"", ""bar"", ""baz"" });
diff --git a/src/test/java/edu/ucla/sspace/util/CharMapTests.java b/src/test/java/edu/ucla/sspace/util/CharMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/CharMapTests.java
rename to src/test/java/edu/ucla/sspace/util/CharMapTest.java
index 76861ee4..e565fd28 100644
--- a/src/test/java/edu/ucla/sspace/util/CharMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/CharMapTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link CharMap} 
  */
-public class CharMapTests {
+public class CharMapTest {
 
     
     @Test public void testConstructor() {
diff --git a/src/test/java/edu/ucla/sspace/util/CombinedSetTests.java b/src/test/java/edu/ucla/sspace/util/CombinedSetTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/CombinedSetTests.java
rename to src/test/java/edu/ucla/sspace/util/CombinedSetTest.java
index 7de77828..54d0a33e 100644
--- a/src/test/java/edu/ucla/sspace/util/CombinedSetTests.java
+++ b/src/test/java/edu/ucla/sspace/util/CombinedSetTest.java
@@ -34,7 +34,7 @@
 /**
  * Tests for the {@link CombinedSet} class
  */
-public class CombinedSetTests { 
+public class CombinedSetTest { 
 
     @Test public void testConstructor() {
         Set<Integer> set1 = new HashSet<Integer>();
diff --git a/src/test/java/edu/ucla/sspace/util/HashBiMapTests.java b/src/test/java/edu/ucla/sspace/util/HashBiMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/HashBiMapTests.java
rename to src/test/java/edu/ucla/sspace/util/HashBiMapTest.java
index 7779435b..ffe0268e 100644
--- a/src/test/java/edu/ucla/sspace/util/HashBiMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/HashBiMapTest.java
@@ -46,7 +46,7 @@
 /**
  * A collection of unit tests for {@link HashBiMap} 
  */
-public class HashBiMapTests {
+public class HashBiMapTest {
 
     @Test public void testPut() {
         BiMap<Integer,Integer> m = new HashBiMap<Integer,Integer>();
diff --git a/src/test/java/edu/ucla/sspace/util/HashIndexerTests.java b/src/test/java/edu/ucla/sspace/util/HashIndexerTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/HashIndexerTests.java
rename to src/test/java/edu/ucla/sspace/util/HashIndexerTest.java
index c0acc6b3..b835234a 100644
--- a/src/test/java/edu/ucla/sspace/util/HashIndexerTests.java
+++ b/src/test/java/edu/ucla/sspace/util/HashIndexerTest.java
@@ -46,7 +46,7 @@
 /**
  * A collection of unit tests for {@link HashIndexer} 
  */
-public class HashIndexerTests {
+public class HashIndexerTest {
 
     @Test public void testIndex() {
         HashIndexer<Integer> h = new HashIndexer<Integer>();
diff --git a/src/test/java/edu/ucla/sspace/util/HashMultiMapTests.java b/src/test/java/edu/ucla/sspace/util/HashMultiMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/HashMultiMapTests.java
rename to src/test/java/edu/ucla/sspace/util/HashMultiMapTest.java
index 8fc482ce..983b89c1 100644
--- a/src/test/java/edu/ucla/sspace/util/HashMultiMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/HashMultiMapTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link HashMultiMap} 
  */
-public class HashMultiMapTests {
+public class HashMultiMapTest {
 
     
     @Test public void testConstructor() {
diff --git a/src/test/java/edu/ucla/sspace/util/IndexedCounterTests.java b/src/test/java/edu/ucla/sspace/util/IndexedCounterTest.java
similarity index 98%
rename from src/test/java/edu/ucla/sspace/util/IndexedCounterTests.java
rename to src/test/java/edu/ucla/sspace/util/IndexedCounterTest.java
index 118aac8a..071aab49 100644
--- a/src/test/java/edu/ucla/sspace/util/IndexedCounterTests.java
+++ b/src/test/java/edu/ucla/sspace/util/IndexedCounterTest.java
@@ -34,7 +34,7 @@
 /**
  * A collection of unit tests for {@link HashIndexer} 
  */
-public class IndexedCounterTests {
+public class IndexedCounterTest {
 
     @Test public void testCount() {
         HashIndexer<Integer> h = new HashIndexer<Integer>();
diff --git a/src/test/java/edu/ucla/sspace/util/IntegerMapTests.java b/src/test/java/edu/ucla/sspace/util/IntegerMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/IntegerMapTests.java
rename to src/test/java/edu/ucla/sspace/util/IntegerMapTest.java
index f2a3339b..d3862a6d 100644
--- a/src/test/java/edu/ucla/sspace/util/IntegerMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/IntegerMapTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link IntegerMap} 
  */
-public class IntegerMapTests {
+public class IntegerMapTest {
 
     
     @Test public void testConstructor() {
diff --git a/src/test/java/edu/ucla/sspace/util/LineReaderTests.java b/src/test/java/edu/ucla/sspace/util/LineReaderTest.java
similarity index 98%
rename from src/test/java/edu/ucla/sspace/util/LineReaderTests.java
rename to src/test/java/edu/ucla/sspace/util/LineReaderTest.java
index 1da89932..a0cf167d 100644
--- a/src/test/java/edu/ucla/sspace/util/LineReaderTests.java
+++ b/src/test/java/edu/ucla/sspace/util/LineReaderTest.java
@@ -49,7 +49,7 @@
 /**
  * A collection of unit tests for {@link LineReader} 
  */
-public class LineReaderTests {
+public class LineReaderTest {
     
     @Test public void testLine() throws Exception {
         File f = File.createTempFile(""tmp"","".txt"");
diff --git a/src/test/java/edu/ucla/sspace/util/ObjectCounterTests.java b/src/test/java/edu/ucla/sspace/util/ObjectCounterTest.java
similarity index 97%
rename from src/test/java/edu/ucla/sspace/util/ObjectCounterTests.java
rename to src/test/java/edu/ucla/sspace/util/ObjectCounterTest.java
index 19444735..5b71cf6d 100644
--- a/src/test/java/edu/ucla/sspace/util/ObjectCounterTests.java
+++ b/src/test/java/edu/ucla/sspace/util/ObjectCounterTest.java
@@ -32,7 +32,7 @@
 /**
  * A collection of unit tests for {@link ObjectCounter} 
  */
-public class ObjectCounterTests {
+public class ObjectCounterTest {
    
     @Test public void testCount() {
         Counter<Integer> c = new ObjectCounter<Integer>();
diff --git a/src/test/java/edu/ucla/sspace/util/OpenIntSetTests.java b/src/test/java/edu/ucla/sspace/util/OpenIntSetTest.java
similarity index 96%
rename from src/test/java/edu/ucla/sspace/util/OpenIntSetTests.java
rename to src/test/java/edu/ucla/sspace/util/OpenIntSetTest.java
index 5c036a61..04ba0cbd 100755
--- a/src/test/java/edu/ucla/sspace/util/OpenIntSetTests.java
+++ b/src/test/java/edu/ucla/sspace/util/OpenIntSetTest.java
@@ -45,7 +45,7 @@
 /**
  * A collection of unit tests for {@link OpenIntSet} 
  */
-public class OpenIntSetTests {
+public class OpenIntSetTest {
    
     @Test public void testAdd() {
         Set<Integer> test = new OpenIntSet();
diff --git a/src/test/java/edu/ucla/sspace/util/PairCounterTests.java b/src/test/java/edu/ucla/sspace/util/PairCounterTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/PairCounterTests.java
rename to src/test/java/edu/ucla/sspace/util/PairCounterTest.java
index e0c80c6f..c21e0e61 100644
--- a/src/test/java/edu/ucla/sspace/util/PairCounterTests.java
+++ b/src/test/java/edu/ucla/sspace/util/PairCounterTest.java
@@ -32,7 +32,7 @@
 /**
  * A collection of unit tests for {@link PairCounter} 
  */
-public class PairCounterTests {
+public class PairCounterTest {
    
     @Test public void testCount() {
         PairCounter<Integer> c = new PairCounter<Integer>();
diff --git a/src/test/java/edu/ucla/sspace/util/SparseDoubleArrayTests.java b/src/test/java/edu/ucla/sspace/util/SparseDoubleArrayTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/SparseDoubleArrayTests.java
rename to src/test/java/edu/ucla/sspace/util/SparseDoubleArrayTest.java
index 4de0aa64..7820f2aa 100644
--- a/src/test/java/edu/ucla/sspace/util/SparseDoubleArrayTests.java
+++ b/src/test/java/edu/ucla/sspace/util/SparseDoubleArrayTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link SparseDoubleArray} 
  */
-public class SparseDoubleArrayTests {
+public class SparseDoubleArrayTest {
 
     @Test public void testConstructor() {
 	new SparseDoubleArray();
diff --git a/src/test/java/edu/ucla/sspace/util/SparseIntArrayTests.java b/src/test/java/edu/ucla/sspace/util/SparseIntArrayTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/SparseIntArrayTests.java
rename to src/test/java/edu/ucla/sspace/util/SparseIntArrayTest.java
index ac53f768..6dc35ffd 100644
--- a/src/test/java/edu/ucla/sspace/util/SparseIntArrayTests.java
+++ b/src/test/java/edu/ucla/sspace/util/SparseIntArrayTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link IntegerMap} 
  */
-public class SparseIntArrayTests {
+public class SparseIntArrayTest {
 
     @Test public void testConstructor() {
 	new SparseIntArray();
diff --git a/src/test/java/edu/ucla/sspace/util/TimeSpanTests.java b/src/test/java/edu/ucla/sspace/util/TimeSpanTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/TimeSpanTests.java
rename to src/test/java/edu/ucla/sspace/util/TimeSpanTest.java
index dfc86e42..a009a2bb 100644
--- a/src/test/java/edu/ucla/sspace/util/TimeSpanTests.java
+++ b/src/test/java/edu/ucla/sspace/util/TimeSpanTest.java
@@ -32,7 +32,7 @@
 /**
  * Tests for the {@link TimeSpan} class.
  */
-public class TimeSpanTests {
+public class TimeSpanTest {
    
     @Test public void testStringConstructor() {
 	TimeSpan ts = new TimeSpan(""1y"");
diff --git a/src/test/java/edu/ucla/sspace/util/TreeMultiMapTests.java b/src/test/java/edu/ucla/sspace/util/TreeMultiMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/TreeMultiMapTests.java
rename to src/test/java/edu/ucla/sspace/util/TreeMultiMapTest.java
index 1156153b..5ca9c5c5 100644
--- a/src/test/java/edu/ucla/sspace/util/TreeMultiMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/TreeMultiMapTest.java
@@ -45,7 +45,7 @@
 /**
  * A collection of unit tests for {@link TreeMultiMap} 
  */
-public class TreeMultiMapTests {
+public class TreeMultiMapTest {
 
     
     @Test public void testConstructor() {
diff --git a/src/test/java/edu/ucla/sspace/util/TrieMapTests.java b/src/test/java/edu/ucla/sspace/util/TrieMapTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/TrieMapTests.java
rename to src/test/java/edu/ucla/sspace/util/TrieMapTest.java
index 53cf0d31..2e141d34 100644
--- a/src/test/java/edu/ucla/sspace/util/TrieMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/TrieMapTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link TrieMap} 
  */
-public class TrieMapTests {
+public class TrieMapTest {
 
     
     @Test public void testConstructor() {
diff --git a/src/test/java/edu/ucla/sspace/util/TrieSetTests.java b/src/test/java/edu/ucla/sspace/util/TrieSetTest.java
similarity index 98%
rename from src/test/java/edu/ucla/sspace/util/TrieSetTests.java
rename to src/test/java/edu/ucla/sspace/util/TrieSetTest.java
index 9692752c..65210ad1 100644
--- a/src/test/java/edu/ucla/sspace/util/TrieSetTests.java
+++ b/src/test/java/edu/ucla/sspace/util/TrieSetTest.java
@@ -44,7 +44,7 @@
 /**
  * A collection of unit tests for {@link TrieSet} 
  */
-public class TrieSetTests {
+public class TrieSetTest {
 
     @Test public void testConstructor() {
  	Set<String> m = new TrieSet();
diff --git a/src/test/java/edu/ucla/sspace/util/WorkQueueTests.java b/src/test/java/edu/ucla/sspace/util/WorkQueueTest.java
similarity index 99%
rename from src/test/java/edu/ucla/sspace/util/WorkQueueTests.java
rename to src/test/java/edu/ucla/sspace/util/WorkQueueTest.java
index ad1385f9..d2907ec9 100755
--- a/src/test/java/edu/ucla/sspace/util/WorkQueueTests.java
+++ b/src/test/java/edu/ucla/sspace/util/WorkQueueTest.java
@@ -47,7 +47,7 @@
 /**
  * A collection of unit tests for {@link WorkQueue} 
  */
-public class WorkQueueTests {
+public class WorkQueueTest {
     
     @Test public void testSingleOp() {
         WorkQueue w = new WorkQueue(4);
diff --git a/src/test/java/edu/ucla/sspace/util/primitive/CompactIntSetTests.java b/src/test/java/edu/ucla/sspace/util/primitive/CompactIntSetTest.java
similarity index 96%
rename from src/test/java/edu/ucla/sspace/util/primitive/CompactIntSetTests.java
rename to src/test/java/edu/ucla/sspace/util/primitive/CompactIntSetTest.java
index d7bf9010..7d12a465 100644
--- a/src/test/java/edu/ucla/sspace/util/primitive/CompactIntSetTests.java
+++ b/src/test/java/edu/ucla/sspace/util/primitive/CompactIntSetTest.java
@@ -45,7 +45,7 @@
 /**
  * A collection of unit tests for {@link CompactIntSet} 
  */
-public class CompactIntSetTests {
+public class CompactIntSetTest {
    
     @Test public void testAdd() {
         Set<Integer> test = new CompactIntSet();
diff --git a/src/test/java/edu/ucla/sspace/util/primitive/IntIntHashMultiMapTests.java b/src/test/java/edu/ucla/sspace/util/primitive/IntIntHashMultiMapTest.java
similarity index 98%
rename from src/test/java/edu/ucla/sspace/util/primitive/IntIntHashMultiMapTests.java
rename to src/test/java/edu/ucla/sspace/util/primitive/IntIntHashMultiMapTest.java
index 5eb2588d..4e074765 100644
--- a/src/test/java/edu/ucla/sspace/util/primitive/IntIntHashMultiMapTests.java
+++ b/src/test/java/edu/ucla/sspace/util/primitive/IntIntHashMultiMapTest.java
@@ -45,7 +45,7 @@
 /**
  * A collection of unit tests for {@link CompactIntSet} 
  */
-public class IntIntHashMultiMapTests {
+public class IntIntHashMultiMapTest {
 
     @Test public void testAsMap() {
         IntIntMultiMap m = new IntIntHashMultiMap();"
595cdf05e962299c19c34bbfb370316636d074f2,spring-framework,Polishing--,p,https://github.com/spring-projects/spring-framework,"diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java
index a4eea3e1e614..4c7b5fcfa7fb 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java
@@ -17,7 +17,6 @@
 package org.springframework.transaction.aspectj;
 
 import java.io.IOException;
-
 import javax.transaction.Transactional;
 
 import org.junit.Before;
@@ -132,6 +131,7 @@ public void echo(Throwable t) throws Throwable {
 
 	}
 
+
 	protected static class JtaAnnotationProtectedAnnotatedMember {
 
 		public void doSomething() {
@@ -143,6 +143,7 @@ protected void doInTransaction() {
 		}
 	}
 
+
 	protected static class JtaAnnotationPrivateAnnotatedMember {
 
 		public void doSomething() {
@@ -154,6 +155,7 @@ private void doInTransaction() {
 		}
 	}
 
+
 	@Configuration
 	protected static class Config {
 
@@ -168,7 +170,6 @@ public JtaAnnotationTransactionAspect transactionAspect() {
 			aspect.setTransactionManager(transactionManager());
 			return aspect;
 		}
-
 	}
 
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
index 855ef022fdf8..2a6c53e08767 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -1179,7 +1180,12 @@ public Object run() throws Exception {
 					throw new TypeMismatchException(propertyChangeEvent, pd.getPropertyType(), ex.getTargetException());
 				}
 				else {
-					throw new MethodInvocationException(propertyChangeEvent, ex.getTargetException());
+					Throwable cause = ex.getTargetException();
+					if (cause instanceof UndeclaredThrowableException) {
+						// May happen e.g. with Groovy-generated methods
+						cause = cause.getCause();
+					}
+					throw new MethodInvocationException(propertyChangeEvent, cause);
 				}
 			}
 			catch (Exception ex) {
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
index 5be298494293..5086c1a1df46 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -162,13 +162,12 @@
 	 * Indicate whether subclass-based (CGLIB) proxies are to be created as opposed
 	 * to standard Java interface-based proxies. The default is {@code false}. <strong>
 	 * Applicable only if {@link #mode()} is set to {@link AdviceMode#PROXY}</strong>.
-	 *
 	 * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
-	 * Spring-managed beans requiring proxying, not just those marked with
-	 * {@code @Cacheable}. For example, other beans marked with Spring's
-	 * {@code @Transactional} annotation will be upgraded to subclass proxying at the same
-	 * time. This approach has no negative impact in practice unless one is explicitly
-	 * expecting one type of proxy vs another, e.g. in tests.
+	 * Spring-managed beans requiring proxying, not just those marked with {@code @Cacheable}.
+	 * For example, other beans marked with Spring's {@code @Transactional} annotation will
+	 * be upgraded to subclass proxying at the same time. This approach has no negative
+	 * impact in practice unless one is explicitly expecting one type of proxy vs another,
+	 * e.g. in tests.
 	 */
 	boolean proxyTargetClass() default false;
 
@@ -185,4 +184,5 @@
 	 * The default is {@link Ordered#LOWEST_PRECEDENCE}.
 	 */
 	int order() default Ordered.LOWEST_PRECEDENCE;
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
index fdaa876c0808..b13527543c27 100644
--- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import groovy.lang.Script;
 import org.codehaus.groovy.control.CompilationFailedException;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -102,7 +101,7 @@ public GroovyScriptFactory(String scriptSourceLocator, GroovyObjectCustomizer gr
 
 
 	@Override
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			((ConfigurableListableBeanFactory) beanFactory).ignoreDependencyType(MetaClass.class);
 		}
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
index 01e3c2069231..156e322e0252 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@
  *   &lt;property name=""message"" value=""Hello World!""/&gt;
  * &lt;/bean&gt;
  *
- * &lt;bean id=""groovyMessenger"" class=""org.springframework.scripting.bsh.GroovyScriptFactory""&gt;
+ * &lt;bean id=""groovyMessenger"" class=""org.springframework.scripting.groovy.GroovyScriptFactory""&gt;
  *   &lt;constructor-arg value=""classpath:mypackage/Messenger.groovy""/&gt;
  *   &lt;property name=""message"" value=""Hello World!""/&gt;
  * &lt;/bean&gt;</pre>
@@ -346,17 +346,16 @@ public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName
 	 * @param scriptedObjectBeanName the name of the internal scripted object bean
 	 */
 	protected void prepareScriptBeans(BeanDefinition bd, String scriptFactoryBeanName, String scriptedObjectBeanName) {
-
 		// Avoid recreation of the script bean definition in case of a prototype.
 		synchronized (this.scriptBeanFactory) {
 			if (!this.scriptBeanFactory.containsBeanDefinition(scriptedObjectBeanName)) {
 
-				this.scriptBeanFactory.registerBeanDefinition(scriptFactoryBeanName,
-						createScriptFactoryBeanDefinition(bd));
-				ScriptFactory scriptFactory = this.scriptBeanFactory
-						.getBean(scriptFactoryBeanName, ScriptFactory.class);
-				ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName,
-						scriptFactory.getScriptSourceLocator());
+				this.scriptBeanFactory.registerBeanDefinition(
+						scriptFactoryBeanName, createScriptFactoryBeanDefinition(bd));
+				ScriptFactory scriptFactory =
+						this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class);
+				ScriptSource scriptSource =
+						getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
 				Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
 
 				Class<?>[] scriptedInterfaces = interfaces;
@@ -365,8 +364,8 @@ protected void prepareScriptBeans(BeanDefinition bd, String scriptFactoryBeanNam
 					scriptedInterfaces = ObjectUtils.addObjectToArray(interfaces, configInterface);
 				}
 
-				BeanDefinition objectBd = createScriptedObjectBeanDefinition(bd, scriptFactoryBeanName, scriptSource,
-						scriptedInterfaces);
+				BeanDefinition objectBd = createScriptedObjectBeanDefinition(
+						bd, scriptFactoryBeanName, scriptSource, scriptedInterfaces);
 				long refreshCheckDelay = resolveRefreshCheckDelay(bd);
 				if (refreshCheckDelay >= 0) {
 					objectBd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -569,7 +568,7 @@ protected Object createRefreshableProxy(TargetSource ts, Class<?>[] interfaces,
 		proxyFactory.setInterfaces(interfaces);
 		if (proxyTargetClass) {
 			classLoader = null;  // force use of Class.getClassLoader()
-			proxyFactory.setProxyTargetClass(proxyTargetClass);
+			proxyFactory.setProxyTargetClass(true);
 		}
 
 		DelegatingIntroductionInterceptor introduction = new DelegatingIntroductionInterceptor(ts);"
e5ad59a45147e27b7c2a7a7aed9272f87a5d4746,intellij-community,WI-31168 Unable to save settings after upgrade- to 2016.1 (cherry picked from commit 5b98073)--,c,https://github.com/JetBrains/intellij-community,"diff --git a/platform/platform-impl/src/com/intellij/remote/RemoteCredentialsHolder.java b/platform/platform-impl/src/com/intellij/remote/RemoteCredentialsHolder.java
index c437aeda7a4b8..1d9b61d4a782f 100644
--- a/platform/platform-impl/src/com/intellij/remote/RemoteCredentialsHolder.java
+++ b/platform/platform-impl/src/com/intellij/remote/RemoteCredentialsHolder.java
@@ -176,6 +176,7 @@ public void setUseKeyPair(boolean useKeyPair) {
     myUseKeyPair = useKeyPair;
   }
 
+  @NotNull
   public String getSerializedUserName() {
     if (myAnonymous || myUserName == null) return """";
     return myUserName;
@@ -268,7 +269,7 @@ public void load(Element element) {
 
   public void save(Element rootElement) {
     rootElement.setAttribute(HOST, StringUtil.notNullize(getHost()));
-    rootElement.setAttribute(PORT, getLiteralPort());
+    rootElement.setAttribute(PORT, StringUtil.notNullize(getLiteralPort()));
     rootElement.setAttribute(ANONYMOUS, Boolean.toString(isAnonymous()));
     rootElement.setAttribute(USERNAME, getSerializedUserName());
     rootElement.setAttribute(PASSWORD, getSerializedPassword());"
c9d4924dcf129512dadd22dcd6fe0046cbcded43,drools,BZ-1039639 - GRE doesn't recognize MVEL inline- lists when opening rule--,c,https://github.com/kiegroup/drools,"diff --git a/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceUnmarshallingTest.java b/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceUnmarshallingTest.java
index 05b7b836bf1..9da1dd93e78 100644
--- a/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceUnmarshallingTest.java
+++ b/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceUnmarshallingTest.java
@@ -26,7 +26,9 @@
 import org.drools.workbench.models.datamodel.oracle.ModelField;
 import org.drools.workbench.models.datamodel.oracle.PackageDataModelOracle;
 import org.drools.workbench.models.datamodel.rule.ActionCallMethod;
+import org.drools.workbench.models.datamodel.rule.ActionFieldValue;
 import org.drools.workbench.models.datamodel.rule.ActionGlobalCollectionAdd;
+import org.drools.workbench.models.datamodel.rule.ActionSetField;
 import org.drools.workbench.models.datamodel.rule.BaseSingleFieldConstraint;
 import org.drools.workbench.models.datamodel.rule.CEPWindow;
 import org.drools.workbench.models.datamodel.rule.CompositeFactPattern;
@@ -36,6 +38,8 @@
 import org.drools.workbench.models.datamodel.rule.ExpressionVariable;
 import org.drools.workbench.models.datamodel.rule.FactPattern;
 import org.drools.workbench.models.datamodel.rule.FieldConstraint;
+import org.drools.workbench.models.datamodel.rule.FieldNature;
+import org.drools.workbench.models.datamodel.rule.FieldNatureType;
 import org.drools.workbench.models.datamodel.rule.FreeFormLine;
 import org.drools.workbench.models.datamodel.rule.IPattern;
 import org.drools.workbench.models.datamodel.rule.RuleModel;
@@ -1982,6 +1986,43 @@ public void testExpressionWithListSize() throws Exception {
         assertEquals(1,constraint.getConstraintValueType());
     }
 
+    @Test
+    @Ignore(""https://bugzilla.redhat.com/show_bug.cgi?id=1039639 - GRE doesn't recognize MVEL inline lists when opening rule"")
+    public void testMVELInlineList() throws Exception {
+        String drl = """" +
+                ""rule \""Borked\""\n"" +
+                ""  dialect \""mvel\""\n"" +
+                ""  when\n"" +
+                ""    c : Company( )\n"" +
+                ""  then\n"" +
+                ""    c.setEmps( [\""item1\"", \""item2\""] );\n"" +
+                ""end"";
+
+        addModelField(""Company"",
+                ""emps"",
+                ""java.util.List"",
+                ""List"");
+
+        RuleModel m = RuleModelDRLPersistenceImpl.getInstance().unmarshal( drl,
+                dmo );
+        assertEquals( 1,
+                m.rhs.length );
+        assertTrue( m.rhs[0] instanceof ActionSetField);
+        ActionSetField actionSetField = (ActionSetField) m.rhs[0];
+
+        assertEquals(""c"", actionSetField.getVariable());
+
+        assertEquals(1, actionSetField.getFieldValues().length);
+
+        ActionFieldValue actionFieldValue = actionSetField.getFieldValues()[0];
+
+        assertEquals(""[\""item1\"", \""item2\""]"",actionFieldValue.getValue());
+        assertEquals(""emps"",actionFieldValue.getField());
+        assertEquals(FieldNatureType.TYPE_FORMULA, actionFieldValue.getNature());
+        assertEquals(""Collection"",actionFieldValue.getType());
+
+    }
+
     private void assertEqualsIgnoreWhitespace( final String expected,
                                                final String actual ) {
         final String cleanExpected = expected.replaceAll( ""\\s+"","
b80889a2bb165ebb732b7d9f18d8aeb00656704e,aeshell$aesh,"standard error is added fixes #17
simple support of pipelines #14
api to support commands/extensions almost complete #15
",a,https://github.com/aeshell/aesh,"diff --git a/src/main/java/Example.java b/src/main/java/Example.java
index c41e33f4b..641fccc0d 100644
--- a/src/main/java/Example.java
+++ b/src/main/java/Example.java
@@ -2,6 +2,7 @@
 import org.jboss.jreadline.complete.CompleteOperation;
 import org.jboss.jreadline.complete.Completion;
 import org.jboss.jreadline.console.Console;
+import org.jboss.jreadline.console.ConsoleOutput;
 import org.jboss.jreadline.console.settings.Settings;
 import org.jboss.jreadline.edit.actions.Operation;
 import org.jboss.jreadline.util.ANSI;
@@ -30,44 +31,40 @@ public static void main(String[] args) throws IOException {
 
             @Override
             protected void afterAttach() throws IOException {
-				console.pushToConsole(ANSI.getAlternateBufferScreen());
-				//console.pushToConsole(""blablablablablabal"");
+                if(!hasRedirect()) {
+                    console.pushToStdOut(ANSI.getAlternateBufferScreen());
+                }
+				console.pushToStdOut(""blablablablablabal"");
                 readFromFile();
+
+                //detach after init if hasRedirect()
+                if(hasRedirect()) {
+                    detach();
+                }
             }
 
             @Override
             protected void afterDetach() throws IOException {
-				console.pushToConsole(ANSI.getMainBufferScreen());
+                if(!hasRedirect())
+                    console.pushToStdOut(ANSI.getMainBufferScreen());
             }
 
             private void readFromFile() throws IOException {
-                //console.clear();
-                console.pushToConsole(""here should we present some text... press 'q' to quit"");
-                /*
-                Path file = FileSystems.getDefault().getPath(""/tmp"", ""README.md"");
-                Charset charset = Charset.defaultCharset();
-                BufferedReader reader = Files.newBufferedReader(file, charset);
-                String line = null;
-                while ((line = reader.readLine()) != null) {
-                    console.pushToConsole(line);
-                    console.pushToConsole(Config.getLineSeparator());
-                }
-                */
+                console.pushToStdOut(""here should we present some text... press 'q' to quit"");
             }
 
             @Override
-            public String processOperation(Operation operation) throws IOException {
-                //console.pushToConsole(""blablablablablabal"");
+            public void processOperation(Operation operation) throws IOException {
+                //console.pushToStdOut(""blablablablablabal"");
                 if(operation.getInput()[0] == 'q') {
 					detach();
-					return """";
 				}
                 else if(operation.getInput()[0] == 'a') {
                     readFromFile();
-                    return null;
                 }
-				else
-					return null;
+				else {
+
+                }
             }
         };
 
@@ -85,29 +82,35 @@ public void complete(CompleteOperation co) {
                     commands.add(""foobcx"");
                     commands.add(""foobdx"");
                 }
-                else if(co.getBuffer().equals(""fooba"")) {
+                if(co.getBuffer().equals(""--"")) {
+                    commands.add(""--help-"");
+                }
+                if(co.getBuffer().startsWith(""--help-"") || co.getBuffer().startsWith(""--help-m"")) {
+                    commands.add(""--help-me"");
+                }
+                if(co.getBuffer().equals(""fooba"")) {
                     commands.add(""foobaa"");
                     commands.add(""foobar"");
                     commands.add(""foobaxxxxxx"");
                 }
-                else if(co.getBuffer().equals(""foobar"")) {
+                if(co.getBuffer().equals(""foobar"")) {
                     commands.add(""foobar"");
                 }
-                else if(co.getBuffer().equals(""bar"")) {
+                if(co.getBuffer().equals(""bar"")) {
                     commands.add(""bar/"");
                 }
-                else if(co.getBuffer().equals(""h"")) {
+                if(co.getBuffer().equals(""h"")) {
                     commands.add(""help.history"");
                     commands.add(""help"");
                 }
-                else if(co.getBuffer().equals(""help"")) {
+                if(co.getBuffer().equals(""help"")) {
                     commands.add(""help.history"");
                     commands.add(""help"");
                 }
-                else if(co.getBuffer().equals(""help."")) {
+                if(co.getBuffer().equals(""help."")) {
                     commands.add(""help.history"");
                 }
-                else if(co.getBuffer().equals(""deploy"")) {
+                if(co.getBuffer().equals(""deploy"")) {
                     commands.add(""deploy /home/blabla/foo/bar/alkdfe/en/to/tre"");
                 }
                  co.setCompletionCandidates(commands);
@@ -116,25 +119,29 @@ else if(co.getBuffer().equals(""deploy"")) {
 
         exampleConsole.addCompletion(completer);
 
-        String line;
-        //console.pushToConsole(ANSI.GREEN_TEXT());
+        ConsoleOutput line;
+        //console.pushToStdOut(ANSI.GREEN_TEXT());
         while ((line = exampleConsole.read(""[test@foo.bar]~> "")) != null) {
-            exampleConsole.pushToConsole(""======>\"""" + line + ""\""\n"");
+            exampleConsole.pushToStdOut(""======>\"""" + line.getBuffer() + ""\""\n"");
 
-            if (line.equalsIgnoreCase(""quit"") || line.equalsIgnoreCase(""exit"") ||
-                    line.equalsIgnoreCase(""reset"")) {
+            if (line.getBuffer().equalsIgnoreCase(""quit"") || line.getBuffer().equalsIgnoreCase(""exit"") ||
+                    line.getBuffer().equalsIgnoreCase(""reset"")) {
                 break;
             }
-            if(line.equalsIgnoreCase(""password"")) {
+            if(line.getBuffer().equalsIgnoreCase(""password"")) {
                 line = exampleConsole.read(""password: "", Character.valueOf((char) 0));
-                exampleConsole.pushToConsole(""password typed:"" + line + ""\n"");
+                exampleConsole.pushToStdOut(""password typed:"" + line + ""\n"");
 
             }
-            if(line.equals(""clear""))
+            //test stdErr
+            if(line.getBuffer().startsWith(""blah"")) {
+                exampleConsole.pushToStdErr(""blah. command not found.\n"");
+            }
+            if(line.getBuffer().equals(""clear""))
                 exampleConsole.clear();
-            if(line.equals(""man"")) {
+            if(line.getBuffer().startsWith(""man"")) {
                 //exampleConsole.attachProcess(test);
-                test.attach();
+                test.attach(line);
             }
         }
         if(line.equals(""reset"")) {
@@ -142,9 +149,9 @@ else if(co.getBuffer().equals(""deploy"")) {
             exampleConsole = new Console();
 
             while ((line = exampleConsole.read(""> "")) != null) {
-                exampleConsole.pushToConsole(""======>\"""" + line + ""\""\n"");
-                if (line.equalsIgnoreCase(""quit"") || line.equalsIgnoreCase(""exit"") ||
-                        line.equalsIgnoreCase(""reset"")) {
+                exampleConsole.pushToStdOut(""======>\"""" + line + ""\""\n"");
+                if (line.getBuffer().equalsIgnoreCase(""quit"") || line.getBuffer().equalsIgnoreCase(""exit"") ||
+                        line.getBuffer().equalsIgnoreCase(""reset"")) {
                     break;
                 }
 
diff --git a/src/main/java/org/jboss/jreadline/console/Buffer.java b/src/main/java/org/jboss/jreadline/console/Buffer.java
index b67eef2fd..9f352fac5 100644
--- a/src/main/java/org/jboss/jreadline/console/Buffer.java
+++ b/src/main/java/org/jboss/jreadline/console/Buffer.java
@@ -373,27 +373,11 @@ protected void replaceChar(char rChar) {
         line.setCharAt(getCursor(), rChar);
     }
 
-    /**
-     * Return the biggest common startsWith string
-     *
-     * @param completionList list to compare
-     * @return biggest common startsWith string
-     */
-    protected String findStartsWith(List<String> completionList) {
-        StringBuilder builder = new StringBuilder();
-        for(String completion : completionList)
-            while(builder.length() < completion.length() &&
-                    startsWith(completion.substring(0, builder.length()+1), completionList))
-                builder.append(completion.charAt(builder.length()));
-
-        return builder.toString();
+    protected boolean containRedirection() {
+        return (line.indexOf("">"") > -1 );
     }
 
-    private boolean startsWith(String criteria, List<String> completionList) {
-        for(String completion : completionList)
-            if(!completion.startsWith(criteria))
-                return false;
-
-        return true;
+    protected int getRedirectionPosition() {
+       return line.indexOf("">"");
     }
 }
diff --git a/src/main/java/org/jboss/jreadline/console/Console.java b/src/main/java/org/jboss/jreadline/console/Console.java
index a127ae22d..e708d0df6 100644
--- a/src/main/java/org/jboss/jreadline/console/Console.java
+++ b/src/main/java/org/jboss/jreadline/console/Console.java
@@ -29,7 +29,7 @@
 import org.jboss.jreadline.terminal.Terminal;
 import org.jboss.jreadline.undo.UndoAction;
 import org.jboss.jreadline.undo.UndoManager;
-import org.jboss.jreadline.util.ANSI;
+import org.jboss.jreadline.util.FileUtils;
 import org.jboss.jreadline.util.LoggerUtil;
 import org.jboss.jreadline.util.Parser;
 
@@ -64,6 +64,8 @@ public class Console {
     private boolean displayCompletion = false;
     private boolean askDisplayCompletion = false;
     private boolean running = false;
+    private boolean redirection = false;
+    private StringBuilder redirectionBuffer;
 
     private Logger logger = LoggerUtil.getLogger(getClass().getName());
 
@@ -105,7 +107,7 @@ public void reset(Settings settings) throws IOException {
         Config.readRuntimeProperties(Settings.getInstance());
 
         setTerminal(settings.getTerminal(),
-                settings.getInputStream(), settings.getOutputStream());
+                settings.getInputStream(), settings.getStdOut(), settings.getStdErr());
 
         editMode = settings.getFullEditMode();
 
@@ -120,13 +122,16 @@ public void reset(Settings settings) throws IOException {
 
 
         completionList = new ArrayList<Completion>();
+        completionList.add(new RedirectionCompletion());
+
+        redirectionBuffer = new StringBuilder();
         this.settings = settings;
         running = true;
     }
 
-     private void setTerminal(Terminal term, InputStream in, OutputStream out) {
+     private void setTerminal(Terminal term, InputStream in, OutputStream stdOut, OutputStream stdErr) {
         terminal = term;
-        terminal.init(in, out);
+        terminal.init(in, stdOut, stdErr);
     }
 
     /**
@@ -163,20 +168,43 @@ public History getHistory() {
      * @param input text
      * @throws IOException stream
      */
-    public void pushToConsole(String input) throws IOException {
-        if(input != null && input.length() > 0)
-            terminal.write(input);
+    public void pushToStdOut(String input) throws IOException {
+        if(input != null && input.length() > 0) {
+            //if redirection enabled, put it into a buffer
+            if(redirection) {
+                redirectionBuffer.append(input);
+            }
+            else
+                terminal.writeToStdOut(input);
+        }
     }
 
     /**
-     * @see #pushToConsole(String)
+     * @see #pushToStdOut
      *
      * @param input chars
      * @throws IOException stream
      */
-    public void pushToConsole(char[] input) throws IOException {
-        if(input != null && input.length > 0)
-        terminal.write(input);
+    public void pushToStdOut(char[] input) throws IOException {
+        if(input != null && input.length > 0) {
+            //if redirection enabled, put it into a buffer
+            if(redirection)
+                redirectionBuffer.append(input);
+            else
+                terminal.writeToStdOut(input);
+        }
+    }
+
+    public void pushToStdErr(String input) throws IOException {
+        if(input != null && input.length() > 0) {
+            terminal.writeToStdErr(input);
+        }
+    }
+
+    public void pushToStdErr(char[] input) throws IOException {
+        if(input != null && input.length > 0) {
+            terminal.writeToStdErr(input);
+        }
     }
 
     /**
@@ -229,7 +257,7 @@ protected void attachProcess(ConsoleCommand cc) throws IOException {
      */
     private void detachProcess() throws IOException {
         command = null;
-        printNewline();
+        terminal.writeToStdOut(buffer.getPrompt());
     }
 
 
@@ -242,7 +270,7 @@ private void detachProcess() throws IOException {
      * @return input stream
      * @throws IOException stream
      */
-    public String read(String prompt) throws IOException {
+    public ConsoleOutput read(String prompt) throws IOException {
         return read(prompt, null);
     }
 
@@ -256,16 +284,24 @@ public String read(String prompt) throws IOException {
      * @return input stream
      * @throws IOException stream
      */
-    public String read(String prompt, Character mask) throws IOException {
+    public ConsoleOutput read(String prompt, Character mask) throws IOException {
         if(!running)
             throw new RuntimeException(""Cant reuse a stopped Console before its reset again!"");
+        if(redirection) {
+            redirection = false;
+            persistRedirection(buffer.getLine());
+            redirectionBuffer = new StringBuilder();
+        }
 
         buffer.reset(prompt, mask);
 		if(command == null)
-			terminal.write(buffer.getPrompt());
+			terminal.writeToStdOut(buffer.getPrompt());
         search = null;
 
         while(true) {
+            if(command != null && !command.isAttached()) {
+                detachProcess();
+            }
 
             int[] in = terminal.read(settings.isReadAhead());
             //for(int i : in)
@@ -276,17 +312,14 @@ public String read(String prompt, Character mask) throws IOException {
             Operation operation = editMode.parseInput(in);
             operation.setInput(in);
 
-            String result;
-            if(command != null) {
-                result = command.processOperation(operation);
-				if(!command.isAttached())
-					detachProcess();
-			}
+            String result = null;
+            if(command != null)
+                command.processOperation(operation);
             else
                 result = parseOperation(operation, mask);
 
             if(result != null)
-                return result;
+                return parseConsoleOutput(result);
         }
     }
 
@@ -311,8 +344,8 @@ private String parseOperation(Operation operation, Character mask) throws IOExce
             //do not display complete, but make sure that the previous line
             // is restored correctly
             else {
-                terminal.write(Config.getLineSeparator());
-                terminal.write(buffer.getLineWithPrompt());
+                terminal.writeToStdOut(Config.getLineSeparator());
+                terminal.writeToStdOut(buffer.getLineWithPrompt());
                 syncCursor();
             }
         }
@@ -507,7 +540,7 @@ private void doSearch(Search search) throws IOException {
         // otherwise, restore the line
         else {
             redrawLine();
-            terminal.write(Buffer.printAnsi((buffer.getPrompt().length()+1)+""G""));
+            terminal.writeToStdOut(Buffer.printAnsi((buffer.getPrompt().length() + 1) + ""G""));
         }
     }
 
@@ -569,8 +602,8 @@ private void setBufferLine(String newLine) throws IOException {
                         //int totalRows = (newLine.length()+buffer.getPrompt().length()) / getTerminalWidth() +1;
                         //logger.info(""ADDING ""+numNewRows+"", totalRows:""+totalRows+
                         //        "", currentRow:""+currentRow+"", cursorRow:""+cursorRow);
-                        terminal.write(Buffer.printAnsi(numNewRows + ""S""));
-                        terminal.write(Buffer.printAnsi(numNewRows + ""A""));
+                        terminal.writeToStdOut(Buffer.printAnsi(numNewRows + ""S""));
+                        terminal.writeToStdOut(Buffer.printAnsi(numNewRows + ""A""));
                     }
                 }
             }
@@ -591,8 +624,8 @@ private void insertBufferLine(String insert, int position) throws IOException {
                     if((insert.length()+buffer.totalLength()) % getTerminalWidth() == 0)
                         numNewRows++;
                     if(numNewRows > 0) {
-                        terminal.write(Buffer.printAnsi(numNewRows+""S""));
-                        terminal.write(Buffer.printAnsi(numNewRows+""A""));
+                        terminal.writeToStdOut(Buffer.printAnsi(numNewRows + ""S""));
+                        terminal.writeToStdOut(Buffer.printAnsi(numNewRows + ""A""));
                     }
                 }
             }
@@ -615,19 +648,19 @@ private void writeChar(int c, Character mask) throws IOException {
         buffer.write((char) c);
         if(mask != null) {
             if(mask == 0)
-                terminal.write(' '); //TODO: fix this hack
+                terminal.writeToStdOut(' '); //TODO: fix this hack
             else
-                terminal.write(mask);
+                terminal.writeToStdOut(mask);
         }
         else {
-            terminal.write((char) c);
+            terminal.writeToStdOut((char) c);
         }
 
         // add a 'fake' new line when inserting at the edge of terminal
         if(buffer.getCursorWithPrompt() > getTerminalWidth() &&
                 buffer.getCursorWithPrompt() % getTerminalWidth() == 1) {
-           terminal.write((char) 32);
-            terminal.write((char) 13);
+           terminal.writeToStdOut((char) 32);
+            terminal.writeToStdOut((char) 13);
         }
 
         // if we insert somewhere other than the end of the line we need to redraw from cursor
@@ -645,8 +678,8 @@ private void writeChar(int c, Character mask) throws IOException {
                     totalRows--;
 
                 if(ansiCurrentRow+(totalRows-currentRow) > getTerminalHeight()) {
-                    terminal.write(Buffer.printAnsi(""1S"")); //adding a line
-                    terminal.write(Buffer.printAnsi(""1A"")); // moving up a line
+                    terminal.writeToStdOut(Buffer.printAnsi(""1S"")); //adding a line
+                    terminal.writeToStdOut(Buffer.printAnsi(""1A"")); // moving up a line
                 }
             }
             redrawLine();
@@ -753,10 +786,10 @@ public final void moveCursor(final int where) throws IOException {
                 (editMode.getCurrentAction() == Action.MOVE ||
                         editMode.getCurrentAction() == Action.DELETE)) {
 
-            terminal.write(buffer.move(where, getTerminalWidth(), true));
+            terminal.writeToStdOut(buffer.move(where, getTerminalWidth(), true));
         }
         else {
-            terminal.write(buffer.move(where, getTerminalWidth()));
+            terminal.writeToStdOut(buffer.move(where, getTerminalWidth()));
         }
     }
 
@@ -780,38 +813,38 @@ private void drawLine(String line) throws IOException {
             //+"", width:""+getTerminalWidth()+"", height:""+getTerminalHeight()+"", delta:""+buffer.getDelta()
             //+"", buffer:""+buffer.getLine());
 
-            terminal.write(Buffer.printAnsi(""s"")); //save cursor
+            terminal.writeToStdOut(Buffer.printAnsi(""s"")); //save cursor
 
             if(currentRow > 0)
                 for(int i=0; i<currentRow; i++)
-                    terminal.write(Buffer.printAnsi(""A"")); //move to top
+                    terminal.writeToStdOut(Buffer.printAnsi(""A"")); //move to top
 
-            terminal.write(Buffer.printAnsi(""0G"")); //clear
+            terminal.writeToStdOut(Buffer.printAnsi(""0G"")); //clear
 
-            terminal.write(line);
+            terminal.writeToStdOut(line);
             //if the current line.length < compared to previous we add spaces to the end
             // to overwrite the old chars (wtb a better way of doing this)
             if(buffer.getDelta() < 0) {
                 StringBuilder sb = new StringBuilder();
                 for(int i=0; i > buffer.getDelta(); i--)
                     sb.append(' ');
-                terminal.write(sb.toString());
+                terminal.writeToStdOut(sb.toString());
             }
 
             // move cursor to saved pos
-            terminal.write(Buffer.printAnsi(""u""));
+            terminal.writeToStdOut(Buffer.printAnsi(""u""));
         }
         // only clear the current line
         else {
-            terminal.write(Buffer.printAnsi(""s"")); //save cursor
+            terminal.writeToStdOut(Buffer.printAnsi(""s"")); //save cursor
             //move cursor to 0. - need to do this to clear the entire line
-            terminal.write(Buffer.printAnsi(""0G""));
-            terminal.write(Buffer.printAnsi(""2K"")); // clear line
+            terminal.writeToStdOut(Buffer.printAnsi(""0G""));
+            terminal.writeToStdOut(Buffer.printAnsi(""2K"")); // clear line
 
-            terminal.write(line);
+            terminal.writeToStdOut(line);
 
             // move cursor to saved pos
-            terminal.write(Buffer.printAnsi(""u""));
+            terminal.writeToStdOut(Buffer.printAnsi(""u""));
         }
     }
 
@@ -829,7 +862,7 @@ private void printSearch(String searchTerm, String result) throws IOException {
         out.append(result);
         buffer.disablePrompt(true);
         moveCursor(-buffer.getCursor());
-        terminal.write(Buffer.printAnsi(""1G""));//move the cursor all the way to the start of the line
+        terminal.writeToStdOut(Buffer.printAnsi(""1G""));//move the cursor all the way to the start of the line
         setBufferLine(out.toString());
         moveCursor(cursor);
         drawLine(buffer.getLine());
@@ -843,7 +876,7 @@ private void printSearch(String searchTerm, String result) throws IOException {
      */
     private void printNewline() throws IOException {
         moveCursor(buffer.totalLength());
-        terminal.write(Config.getLineSeparator());
+        terminal.writeToStdOut(Config.getLineSeparator());
     }
 
       /**
@@ -927,7 +960,7 @@ else if(possibleCompletions.size() == 1 &&
                     }
                     else {
                         askDisplayCompletion = true;
-                        terminal.write(Config.getLineSeparator()+""Display all ""+completions.size()+ "" possibilities? (y or n)"");
+                        terminal.writeToStdOut(Config.getLineSeparator() + ""Display all "" + completions.size() + "" possibilities? (y or n)"");
                     }
                 }
                 // display all
@@ -952,17 +985,17 @@ private void displayCompletion(String fullCompletion, String completion, boolean
         if(completion.startsWith(buffer.getLine())) {
             performAction(new PrevWordAction(buffer.getCursor(), Action.DELETE));
             buffer.write(completion);
-            terminal.write(completion);
+            terminal.writeToStdOut(completion);
 
             //only append space if its an actual complete, not a partial
         }
         else {
             buffer.write(completion);
-            terminal.write(completion);
+            terminal.writeToStdOut(completion);
         }
         if(appendSpace && fullCompletion.startsWith(buffer.getLine())) {
             buffer.write(' ');
-            terminal.write(' ');
+            terminal.writeToStdOut(' ');
         }
 
         redrawLine();
@@ -976,8 +1009,8 @@ private void displayCompletion(String fullCompletion, String completion, boolean
      */
     private void displayCompletions(List<String> completions) throws IOException {
         printNewline();
-        terminal.write(Parser.formatCompletions(completions, terminal.getHeight(), terminal.getWidth()));
-        terminal.write(buffer.getLineWithPrompt());
+        terminal.writeToStdOut(Parser.formatCompletions(completions, terminal.getHeight(), terminal.getWidth()));
+        terminal.writeToStdOut(buffer.getLineWithPrompt());
         //if we do a complete and the cursor is not at the end of the
         //buffer we need to move it to the correct place
         syncCursor();
@@ -985,9 +1018,9 @@ private void displayCompletions(List<String> completions) throws IOException {
 
     private void syncCursor() throws IOException {
         if(buffer.getCursor() != buffer.getLine().length())
-            terminal.write(Buffer.printAnsi((
-                    Math.abs( buffer.getCursor()-
-                            buffer.getLine().length())+""D"")));
+            terminal.writeToStdOut(Buffer.printAnsi((
+                    Math.abs(buffer.getCursor() -
+                            buffer.getLine().length()) + ""D"")));
 
     }
 
@@ -1008,7 +1041,7 @@ private void replace(int rChar) throws IOException {
     private int getCurrentRow() {
         if(settings.isAnsiConsole() && Config.isOSPOSIXCompatible()) {
             try {
-                terminal.write(Buffer.printAnsi(""6n""));
+                terminal.writeToStdOut(Buffer.printAnsi(""6n""));
                 StringBuilder builder = new StringBuilder(8);
                 int row;
                 while((row = terminal.read(false)[0]) > -1 && row != 'R') {
@@ -1030,7 +1063,7 @@ private int getCurrentRow() {
     private int getCurrentColumn() {
         if(settings.isAnsiConsole() && Config.isOSPOSIXCompatible()) {
             try {
-                terminal.write(Buffer.printAnsi(""6n""));
+                terminal.writeToStdOut(Buffer.printAnsi(""6n""));
                 StringBuilder builder = new StringBuilder(8);
                 int row;
                 while((row = settings.getInputStream().read()) > -1 && row != 'R' ) {
@@ -1068,12 +1101,33 @@ public void clear() throws IOException {
      */
     public void clear(boolean includeBuffer) throws IOException {
         //first clear console
-        terminal.write(Buffer.printAnsi(""2J""));
+        terminal.writeToStdOut(Buffer.printAnsi(""2J""));
         //move cursor to correct position
-        terminal.write(Buffer.printAnsi(""1;1H""));
-        //then write prompt
+        terminal.writeToStdOut(Buffer.printAnsi(""1;1H""));
+        //then writeToStdOut prompt
         if(includeBuffer)
-            terminal.write(buffer.getLineWithPrompt());
+            terminal.writeToStdOut(buffer.getLineWithPrompt());
+    }
+
+    private ConsoleOutput parseConsoleOutput(String buffer) {
+        if(buffer.contains("">"")) {
+            redirection = true;
+            this.buffer.setLine(buffer.substring(buffer.indexOf("">"")+1, buffer.length()).trim());
+            return new ConsoleOutput(buffer.substring(0, buffer.indexOf("">"")), true);
+        }
+        else {
+            return new ConsoleOutput(buffer, false);
+        }
+    }
+
+    private void persistRedirection(String fileName) throws IOException {
+        try {
+            FileUtils.saveFile(new File(fileName), redirectionBuffer.toString(), false);
+        }
+        catch (IOException e) {
+            pushToStdErr(e.getMessage());
+        }
+
     }
 
 }
diff --git a/src/main/java/org/jboss/jreadline/console/ConsoleCommand.java b/src/main/java/org/jboss/jreadline/console/ConsoleCommand.java
index bc7d89af8..5027da346 100644
--- a/src/main/java/org/jboss/jreadline/console/ConsoleCommand.java
+++ b/src/main/java/org/jboss/jreadline/console/ConsoleCommand.java
@@ -32,6 +32,7 @@ public abstract class ConsoleCommand {
 
 	boolean attached = false;
 	protected Console console = null;
+    boolean redirect = false;
 
     public ConsoleCommand(Console console) {
         this.console = console;
@@ -43,9 +44,10 @@ public ConsoleCommand(Console console) {
      *
      * @throws IOException stream
      */
-    public final void attach() throws IOException {
+    public final void attach(ConsoleOutput output) throws IOException {
 		attached = true;
         this.console.attachProcess(this);
+        this.redirect = output.hasRedirectOrPipe();
         afterAttach();
 	}
 
@@ -68,6 +70,10 @@ public final void detach() throws IOException {
         afterDetach();
 	}
 
+    public final boolean hasRedirect() {
+        return redirect;
+    }
+
     /**
      * Called after attach(..) is called.
      *
@@ -86,8 +92,7 @@ public final void detach() throws IOException {
      * Called after every operation made by the user
      *
      * @param operation operation
-     * @return string
      * @throws IOException stream
      */
-    public abstract String processOperation(Operation operation) throws IOException;
+    public abstract void processOperation(Operation operation) throws IOException;
 }
diff --git a/src/main/java/org/jboss/jreadline/console/ConsoleOutput.java b/src/main/java/org/jboss/jreadline/console/ConsoleOutput.java
new file mode 100644
index 000000000..582418bd2
--- /dev/null
+++ b/src/main/java/org/jboss/jreadline/console/ConsoleOutput.java
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jreadline.console;
+
+/**
+ * Value object returned by Console when newline is pressed
+ * If the command is part of a pipeline sequence the stdOut and stdErr is populated accordingly
+ *
+ * @author <a href=""mailto:stale.pedersen@jboss.org"">Ståle W. Pedersen</a>
+ */
+public class ConsoleOutput {
+
+    private String buffer;
+    private boolean redirectOrPipe;
+    private String stdOut;
+    private String stdErr;
+
+    public ConsoleOutput(String buffer, boolean redirectOrPipe) {
+        this.buffer = buffer;
+        this.redirectOrPipe = redirectOrPipe;
+    }
+
+    public ConsoleOutput(String buffer, String stdOut, String stdErr, boolean redirectOrPipe) {
+        this.buffer = buffer;
+        this.redirectOrPipe = redirectOrPipe;
+        this.stdOut = stdOut;
+        this.stdErr = stdErr;
+    }
+
+    public String getBuffer() {
+        return buffer;
+    }
+
+    public boolean hasRedirectOrPipe() {
+        return redirectOrPipe;
+    }
+
+    public String getStdOut() {
+        return stdOut;
+    }
+
+    public String getStdErr() {
+        return stdErr;
+    }
+}
diff --git a/src/main/java/org/jboss/jreadline/console/RedirectionCompletion.java b/src/main/java/org/jboss/jreadline/console/RedirectionCompletion.java
new file mode 100644
index 000000000..a0bff94a4
--- /dev/null
+++ b/src/main/java/org/jboss/jreadline/console/RedirectionCompletion.java
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jreadline.console;
+
+import org.jboss.jreadline.complete.CompleteOperation;
+import org.jboss.jreadline.complete.Completion;
+import org.jboss.jreadline.util.FileUtils;
+import org.jboss.jreadline.util.Parser;
+
+import java.io.File;
+
+/**
+ * Redirection completor
+ *
+ * @author <a href=""mailto:stale.pedersen@jboss.org"">Ståle W. Pedersen</a>
+ */
+public class RedirectionCompletion implements Completion {
+
+    @Override
+    public void complete(CompleteOperation completeOperation) {
+
+        if(completeOperation.getBuffer().contains("">"") &&
+                completeOperation.getCursor() >= completeOperation.getBuffer().indexOf("">"")) {
+
+            String word =
+                    Parser.findWordClosestToCursorDividedByRedirectOrPipe(
+                            completeOperation.getBuffer(), completeOperation.getCursor());
+            completeOperation.addCompletionCandidates(
+                    FileUtils.listMatchingDirectories(word,  new File(System.getProperty(""user.dir""))));
+            completeOperation.setOffset(completeOperation.getCursor());
+        }
+    }
+}
diff --git a/src/main/java/org/jboss/jreadline/console/settings/Settings.java b/src/main/java/org/jboss/jreadline/console/settings/Settings.java
index b20107da5..509907a14 100644
--- a/src/main/java/org/jboss/jreadline/console/settings/Settings.java
+++ b/src/main/java/org/jboss/jreadline/console/settings/Settings.java
@@ -40,7 +40,8 @@ public class Settings {
     private String bellStyle;
     private boolean ansiConsole = true;
     private InputStream inputStream;
-    private OutputStream outputStream;
+    private OutputStream stdOut;
+    private OutputStream stdErr;
     private Terminal terminal;
     private boolean readInputrc = true;
     private File inputrc;
@@ -69,7 +70,8 @@ public void resetToDefaults() {
         bellStyle = null;
         ansiConsole = true;
         inputStream = null;
-        outputStream = null;
+        stdOut = null;
+        stdErr = null;
         terminal = null;
         readInputrc = true;
         logFile = null;
@@ -235,21 +237,41 @@ public void setInputStream(InputStream inputStream) {
      * If not set System.out is used
      * @return out
      */
-    public OutputStream getOutputStream() {
-        if(outputStream == null)
+    public OutputStream getStdOut() {
+        if(stdOut == null)
             return System.out;
         else
-            return outputStream;
+            return stdOut;
     }
 
     /**
      * Set where output should go to
-     * @param outputStream output
+     * @param stdOut output
      */
-    public void setOutputStream(OutputStream outputStream) {
-        this.outputStream = outputStream;
+    public void setStdOut(OutputStream stdOut) {
+        this.stdOut = stdOut;
     }
 
+     /**
+     * If not set System.out is used
+     * @return out
+     */
+    public OutputStream getStdErr() {
+        if(stdErr == null)
+            return System.err;
+        else
+            return stdErr;
+    }
+
+    /**
+     * Set where output should go to
+     * @param stdErr output
+     */
+    public void setStdErr(OutputStream stdErr) {
+        this.stdErr = stdErr;
+    }
+
+
     /**
      * Use the specified terminal implementation
      * If not set, jreadline will try to use the best suited one
diff --git a/src/main/java/org/jboss/jreadline/history/FileHistory.java b/src/main/java/org/jboss/jreadline/history/FileHistory.java
index e78df7085..683ba6493 100644
--- a/src/main/java/org/jboss/jreadline/history/FileHistory.java
+++ b/src/main/java/org/jboss/jreadline/history/FileHistory.java
@@ -7,7 +7,7 @@
 import java.net.URL;
 
 /**
- * Read the history file at init and write to it at shutdown
+ * Read the history file at init and writeToStdOut to it at shutdown
  *
  * @author <a href=""mailto:stale.pedersen@jboss.org"">Ståle W. Pedersen</a>
  */
diff --git a/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java b/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java
index 0840b6a60..708bf04b5 100644
--- a/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java
+++ b/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java
@@ -37,12 +37,13 @@ public class POSIXTerminal implements Terminal {
     private boolean restored = false;
 
     private InputStream input;
-    private Writer writer;
-    
+    private Writer stdOut;
+    private Writer stdErr;
+
     private static final Logger logger = LoggerUtil.getLogger(POSIXTerminal.class.getName());
 
     @Override
-    public void init(InputStream inputStream, OutputStream outputStream) {
+    public void init(InputStream inputStream, OutputStream stdOut, OutputStream stdErr) {
         // save the initial tty configuration
         try {
             ttyConfig = stty(""-g"");
@@ -71,7 +72,8 @@ public void init(InputStream inputStream, OutputStream outputStream) {
             e.printStackTrace();
         }
 
-        writer = new PrintWriter( new OutputStreamWriter(outputStream));
+        this.stdOut = new PrintWriter( new OutputStreamWriter(stdOut));
+        this.stdErr = new PrintWriter( new OutputStreamWriter(stdErr));
     }
 
     /**
@@ -97,10 +99,10 @@ public int[] read(boolean readAhead) throws IOException {
      * @see org.jboss.jreadline.terminal.Terminal
      */
     @Override
-    public void write(String out) throws IOException {
+    public void writeToStdOut(String out) throws IOException {
         if(out != null && out.length() > 0) {
-            writer.write(out);
-            writer.flush();
+            stdOut.write(out);
+            stdOut.flush();
         }
     }
 
@@ -108,10 +110,41 @@ public void write(String out) throws IOException {
      * @see org.jboss.jreadline.terminal.Terminal
      */
     @Override
-    public void write(char[] out) throws IOException {
+    public void writeToStdOut(char[] out) throws IOException {
         if(out != null && out.length > 0) {
-            writer.write(out);
-            writer.flush();
+            stdOut.write(out);
+            stdOut.flush();
+        }
+    }
+
+    /**
+     * @see org.jboss.jreadline.terminal.Terminal
+     */
+    @Override
+    public void writeToStdOut(char out) throws IOException {
+        stdOut.write(out);
+        stdOut.flush();
+    }
+
+    /**
+     * @see org.jboss.jreadline.terminal.Terminal
+     */
+    @Override
+    public void writeToStdErr(String err) throws IOException {
+        if(err != null && err.length() > 0) {
+            stdErr.write(err);
+            stdErr.flush();
+        }
+    }
+
+    /**
+     * @see org.jboss.jreadline.terminal.Terminal
+     */
+    @Override
+    public void writeToStdErr(char[] err) throws IOException {
+        if(err != null && err.length > 0) {
+            stdErr.write(err);
+            stdErr.flush();
         }
     }
 
@@ -119,9 +152,9 @@ public void write(char[] out) throws IOException {
      * @see org.jboss.jreadline.terminal.Terminal
      */
     @Override
-    public void write(char out) throws IOException {
-        writer.write(out);
-        writer.flush();
+    public void writeToStdErr(char err) throws IOException {
+        stdErr.write(err);
+        stdErr.flush();
     }
 
     /**
diff --git a/src/main/java/org/jboss/jreadline/terminal/Terminal.java b/src/main/java/org/jboss/jreadline/terminal/Terminal.java
index ad15ba02c..f3bdb0194 100644
--- a/src/main/java/org/jboss/jreadline/terminal/Terminal.java
+++ b/src/main/java/org/jboss/jreadline/terminal/Terminal.java
@@ -31,9 +31,10 @@ public interface Terminal {
      * Initialize the Terminal with which input/output stream it should use
      *
      * @param inputStream input
-     * @param outputStream output
+     * @param stdOut standard output
+     * @param stdErr error output
      */
-    void init(InputStream inputStream, OutputStream outputStream);
+    void init(InputStream inputStream, OutputStream stdOut, OutputStream stdErr);
 
     /**
      * Read from the input stream (char by char)
@@ -44,28 +45,52 @@ public interface Terminal {
     int[] read(boolean readAhead) throws IOException;
 
     /**
-     * Write to the output stream
+     * Write to the standard output stream
      *
      * @param out what goes into the stream
      * @throws IOException stream
      */
-    void write(String out) throws IOException;
+    void writeToStdOut(String out) throws IOException;
 
     /**
-     * Write to the output stream
+     * Write to the standard output stream
      *
      * @param out what goes into the stream
      * @throws IOException stream
      */
-    void write(char[] out) throws IOException;
+    void writeToStdOut(char[] out) throws IOException;
 
     /**
-     * Write to the output stream
+     * Write to the standard output stream
      *
      * @param out what goes into the stream
      * @throws IOException stream
      */
-    void write(char out) throws IOException;
+    void writeToStdOut(char out) throws IOException;
+
+    /**
+     * Write to the standard error stream
+     *
+     * @param err what goes into the stream
+     * @throws IOException stream
+     */
+    void writeToStdErr(String err) throws IOException;
+
+    /**
+     * Write to the standard error stream
+     *
+     * @param err what goes into the stream
+     * @throws IOException stream
+     */
+    void writeToStdErr(char[] err) throws IOException;
+
+    /**
+     * Write to the standard error stream
+     *
+     * @param err what goes into the stream
+     * @throws IOException stream
+     */
+    void writeToStdErr(char err) throws IOException;
 
     /**
      * @return terminal height
diff --git a/src/main/java/org/jboss/jreadline/terminal/TestTerminal.java b/src/main/java/org/jboss/jreadline/terminal/TestTerminal.java
index 603f391e1..540da22b8 100644
--- a/src/main/java/org/jboss/jreadline/terminal/TestTerminal.java
+++ b/src/main/java/org/jboss/jreadline/terminal/TestTerminal.java
@@ -29,9 +29,9 @@ public class TestTerminal implements Terminal {
     private Writer writer;
 
     @Override
-    public void init(InputStream inputStream, OutputStream outputStream) {
+    public void init(InputStream inputStream, OutputStream stdOut, OutputStream stdErr) {
         input = inputStream;
-        writer = new PrintWriter(new OutputStreamWriter(outputStream));
+        writer = new PrintWriter(new OutputStreamWriter(stdOut));
     }
 
     @Override
@@ -51,7 +51,7 @@ public int[] read(boolean readAhead) throws IOException {
     }
 
     @Override
-    public void write(String out) throws IOException {
+    public void writeToStdOut(String out) throws IOException {
         if(out != null && out.length() > 0) {
             writer.write(out);
             writer.flush();
@@ -59,7 +59,7 @@ public void write(String out) throws IOException {
     }
 
     @Override
-    public void write(char[] out) throws IOException {
+    public void writeToStdOut(char[] out) throws IOException {
         if(out != null && out.length > 0) {
             writer.write(out);
             writer.flush();
@@ -67,11 +67,33 @@ public void write(char[] out) throws IOException {
     }
 
     @Override
-    public void write(char out) throws IOException {
+    public void writeToStdOut(char out) throws IOException {
         writer.write(out);
         writer.flush();
     }
 
+    @Override
+    public void writeToStdErr(String err) throws IOException {
+        if(err != null && err.length() > 0) {
+            writer.write(err);
+            writer.flush();
+        }
+    }
+
+    @Override
+    public void writeToStdErr(char[] err) throws IOException {
+        if(err != null && err.length > 0) {
+            writer.write(err);
+            writer.flush();
+        }
+    }
+
+    @Override
+    public void writeToStdErr(char err) throws IOException {
+        writer.write(err);
+        writer.flush();
+    }
+
     @Override
     public int getHeight() {
         return 24;
diff --git a/src/main/java/org/jboss/jreadline/terminal/WindowsTerminal.java b/src/main/java/org/jboss/jreadline/terminal/WindowsTerminal.java
index 87d31fb36..4c41b3a62 100644
--- a/src/main/java/org/jboss/jreadline/terminal/WindowsTerminal.java
+++ b/src/main/java/org/jboss/jreadline/terminal/WindowsTerminal.java
@@ -29,12 +29,13 @@
  */
 public class WindowsTerminal implements Terminal {
 
-    private Writer writer;
+    private Writer stdOut;
+    private Writer stdErr;
     private InputStream input;
 
 
     @Override
-    public void init(InputStream inputStream, OutputStream outputStream) {
+    public void init(InputStream inputStream, OutputStream stdOut, OutputStream stdErr) {
         if(inputStream == System.in) {
             System.out.println(""Using System.in"");
         }
@@ -42,10 +43,12 @@ public void init(InputStream inputStream, OutputStream outputStream) {
         //setting up reader
         try {
             //AnsiConsole.systemInstall();
-            writer = new PrintWriter( new OutputStreamWriter(new WindowsAnsiOutputStream(outputStream)));
+            this.stdOut = new PrintWriter( new OutputStreamWriter(new WindowsAnsiOutputStream(stdOut)));
+            this.stdErr = new PrintWriter( new OutputStreamWriter(new WindowsAnsiOutputStream(stdErr)));
         }
         catch (Exception ioe) {
-            writer = new PrintWriter( new OutputStreamWriter(new AnsiOutputStream(outputStream)));
+            this.stdOut = new PrintWriter( new OutputStreamWriter(new AnsiOutputStream(stdOut)));
+            this.stdErr = new PrintWriter( new OutputStreamWriter(new AnsiOutputStream(stdErr)));
         }
 
         this.input = inputStream;
@@ -72,25 +75,47 @@ public int[] read(boolean readAhead) throws IOException {
     }
 
     @Override
-    public void write(String out) throws IOException {
+    public void writeToStdOut(String out) throws IOException {
         if(out != null && out.length() > 0) {
-            writer.write(out);
-            writer.flush();
+            stdOut.write(out);
+            stdOut.flush();
         }
     }
 
     @Override
-    public void write(char[] out) throws IOException {
+    public void writeToStdOut(char[] out) throws IOException {
         if(out != null && out.length > 0) {
-            writer.write(out);
-            writer.flush();
+            stdOut.write(out);
+            stdOut.flush();
         }
     }
 
     @Override
-    public void write(char out) throws IOException {
-        writer.write(out);
-        writer.flush();
+    public void writeToStdOut(char out) throws IOException {
+        stdOut.write(out);
+        stdOut.flush();
+    }
+
+    @Override
+    public void writeToStdErr(String err) throws IOException {
+        if(err != null && err.length() > 0) {
+            stdOut.write(err);
+            stdOut.flush();
+        }
+    }
+
+    @Override
+    public void writeToStdErr(char[] err) throws IOException {
+        if(err != null && err.length > 0) {
+            stdOut.write(err);
+            stdOut.flush();
+        }
+    }
+
+    @Override
+    public void writeToStdErr(char err) throws IOException {
+        stdOut.write(err);
+        stdOut.flush();
     }
 
     @Override
diff --git a/src/main/java/org/jboss/jreadline/util/FileUtils.java b/src/main/java/org/jboss/jreadline/util/FileUtils.java
new file mode 100644
index 000000000..c8960ede5
--- /dev/null
+++ b/src/main/java/org/jboss/jreadline/util/FileUtils.java
@@ -0,0 +1,218 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jreadline.util;
+
+import org.jboss.jreadline.console.Config;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * Helper to find proper files/directories given partial paths/filenames.
+ * Should be rewritten as its now just a hack to get it working.
+ *
+ * @author <a href=""mailto:stale.pedersen@jboss.org"">Ståle W. Pedersen</a>
+ */
+public class FileUtils {
+
+    public static final Pattern startsWithParent = Pattern.compile(""^\\.\\..*"");
+    public static final Pattern containParent =
+            Pattern.compile(""[\\.\\.[""+ Config.getPathSeparator()+""]?]+"");
+    public static final Pattern space = Pattern.compile("".+\\s+.+"");
+    public static final Pattern startsWithSlash =
+            Pattern.compile(""^\\""+Config.getPathSeparator()+"".*"");
+    public static final Pattern endsWithSlash =
+            Pattern.compile("".*\\""+Config.getPathSeparator()+""$"");
+
+    public static List<String> listMatchingDirectories(String possibleDir, File cwd) {
+        // that starts with possibleDir
+        List<String> returnFiles = new ArrayList<String>();
+        if (possibleDir.trim().isEmpty()) {
+            List<String> allFiles = listDirectory(cwd);
+            for (String file : allFiles)
+                if (file.startsWith(possibleDir))
+                    returnFiles.add(file.substring(possibleDir.length()));
+
+            return returnFiles;
+        }
+        else if (!startsWithSlash.matcher(possibleDir).matches() &&
+                new File(cwd.getAbsolutePath() +
+                        Config.getPathSeparator() +possibleDir).isDirectory()) {
+            if(!endsWithSlash.matcher(possibleDir).matches()){
+                returnFiles.add(""/"");
+                return returnFiles;
+            }
+            else
+                return listDirectory(new File(cwd.getAbsolutePath() +
+                        Config.getPathSeparator()
+                        +possibleDir));
+        }
+        else if(new File(cwd.getAbsolutePath() +Config.getPathSeparator()+ possibleDir).isFile()) {
+            returnFiles.add("" "");
+            return returnFiles;
+        }
+        //else if(possibleDir.startsWith((""/"")) && new File(possibleDir).isFile()) {
+        else if(startsWithSlash.matcher(possibleDir).matches() &&
+                new File(possibleDir).isFile()) {
+            returnFiles.add("" "");
+            return returnFiles;
+        }
+        else {
+            returnFiles = new ArrayList<String>();
+            if(new File(possibleDir).isDirectory() &&
+                    !endsWithSlash.matcher(possibleDir).matches()) {
+                returnFiles.add(Config.getPathSeparator());
+                return returnFiles;
+            }
+            else if(new File(possibleDir).isDirectory() &&
+                    !endsWithSlash.matcher(possibleDir).matches()) {
+                return listDirectory(new File(possibleDir));
+            }
+
+            //1.list possibleDir.substring(pos
+            String lastDir = null;
+            String rest = null;
+            if(possibleDir.contains(Config.getPathSeparator())) {
+                lastDir = possibleDir.substring(0,possibleDir.lastIndexOf(Config.getPathSeparator()));
+                rest = possibleDir.substring(possibleDir.lastIndexOf(Config.getPathSeparator())+1);
+            }
+            else {
+                if(new File(cwd+Config.getPathSeparator()+possibleDir).exists())
+                    lastDir = possibleDir;
+                else {
+                    rest = possibleDir;
+                }
+            }
+            //System.out.println(""rest:""+rest);
+            //System.out.println(""lastDir:""+lastDir);
+
+            List<String> allFiles;
+            if(startsWithSlash.matcher(possibleDir).matches())
+                allFiles =  listDirectory(new File(Config.getPathSeparator()+lastDir));
+            else if(lastDir != null)
+                allFiles =  listDirectory(new File(cwd+
+                        Config.getPathSeparator()+lastDir));
+            else
+                allFiles =  listDirectory(cwd);
+
+            //TODO: optimize
+            //1. remove those that do not start with rest, if its more than one
+            if(rest != null && !rest.isEmpty()) {
+                for (String file : allFiles)
+                    if (file.startsWith(rest))
+                        //returnFiles.add(file);
+                        returnFiles.add(file.substring(rest.length()));
+            }
+            else {
+                for(String file : allFiles)
+                    returnFiles.add(file);
+            }
+
+            if(returnFiles.size() > 1) {
+                String startsWith = Parser.findStartsWith(returnFiles);
+                if(startsWith != null && startsWith.length() > 0) {
+                    returnFiles.clear();
+                    returnFiles.add(startsWith);
+                }
+                //need to list complete filenames
+                else {
+                    returnFiles.clear();
+                    for (String file : allFiles)
+                        if (file.startsWith(rest))
+                            returnFiles.add(file);
+                }
+            }
+
+            return returnFiles;
+
+        }
+    }
+
+    private static List<String> listDirectory(File path) {
+        List<String> fileNames = new ArrayList<String>();
+        if(path != null && path.isDirectory())
+            for(File file : path.listFiles())
+                fileNames.add(file.getName());
+
+        return fileNames;
+    }
+
+    public static String getDirectoryName(File path, File home) {
+        if(path.getAbsolutePath().startsWith(home.getAbsolutePath()))
+            return ""~""+path.getAbsolutePath().substring(home.getAbsolutePath().length());
+        else
+            return path.getAbsolutePath();
+    }
+
+    /**
+     * Parse file name
+     * 1. .. = parent dir
+     * 2. ~ = home dir
+     *
+     *
+     * @param name file
+     * @param cwd current working directory
+     * @return file correct file
+     */
+    public static File getFile(String name, String cwd) {
+        //contains ..
+        if(containParent.matcher(name).matches()) {
+            if(startsWithParent.matcher(name).matches()) {
+
+            }
+
+        }
+        else if(name.startsWith(""~"")) {
+
+        }
+        else
+            return new File(name);
+
+        return null;
+    }
+
+    public static void saveFile(File file, String text, boolean append) throws IOException {
+        if(file.isDirectory()) {
+            throw new IOException(file+"": Is a directory"");
+        }
+        else if(file.isFile()) {
+            FileWriter fileWriter;
+            // append text at the end of the file
+            if(append)
+                fileWriter = new FileWriter(file, true);
+             //overwrite the file
+            else
+                fileWriter = new FileWriter(file, false);
+
+            fileWriter.write(text);
+            fileWriter.flush();
+            fileWriter.close();
+        }
+        else {
+            //create a new file and write to it
+            FileWriter fileWriter = new FileWriter(file, false);
+            fileWriter.write(text);
+            fileWriter.flush();
+            fileWriter.close();
+        }
+    }
+}
diff --git a/src/main/java/org/jboss/jreadline/util/Parser.java b/src/main/java/org/jboss/jreadline/util/Parser.java
index 3e3617135..89e88ce53 100644
--- a/src/main/java/org/jboss/jreadline/util/Parser.java
+++ b/src/main/java/org/jboss/jreadline/util/Parser.java
@@ -136,7 +136,7 @@ public static String findWordClosestToCursor(String text, int cursor) {
                     return text.trim().substring(text.lastIndexOf("" "")).trim();
             }
             else
-                return text;
+                return text.trim();
         }
         else {
             String rest = text.substring(0, cursor+1);
@@ -150,4 +150,19 @@ public static String findWordClosestToCursor(String text, int cursor) {
                 return rest.trim();
         }
     }
+
+    public static String findWordClosestToCursorDividedByRedirectOrPipe(String text, int cursor) {
+        //1. find all occurrences of pipe/redirect.
+        //2. find position thats closest to cursor.
+        //3. return word closest to it
+        String[] splitText = text.split("">|\\|"");
+        int length = 0;
+        for(String s : splitText) {
+            length += s.length()+1;
+            if(cursor <= length) {
+                return findWordClosestToCursor(s, cursor-(length-s.length()));
+            }
+        }
+        return """";
+    }
 }
diff --git a/src/test/java/org/jboss/jreadline/JReadlineTestCase.java b/src/test/java/org/jboss/jreadline/JReadlineTestCase.java
index 46de3b132..d09512438 100644
--- a/src/test/java/org/jboss/jreadline/JReadlineTestCase.java
+++ b/src/test/java/org/jboss/jreadline/JReadlineTestCase.java
@@ -19,6 +19,7 @@
 import junit.framework.TestCase;
 import org.jboss.jreadline.console.Config;
 import org.jboss.jreadline.console.Console;
+import org.jboss.jreadline.console.ConsoleOutput;
 import org.jboss.jreadline.console.settings.Settings;
 import org.jboss.jreadline.edit.Mode;
 import org.jboss.jreadline.terminal.TestTerminal;
@@ -40,7 +41,7 @@ public void assertEquals(String expected, TestBuffer buffer) throws IOException
         settings.setReadInputrc(false);
         settings.setTerminal(new TestTerminal());
         settings.setInputStream(new ByteArrayInputStream(buffer.getBytes()));
-        settings.setOutputStream(new ByteArrayOutputStream());
+        settings.setStdOut(new ByteArrayOutputStream());
         settings.setEditMode(Mode.EMACS);
         settings.resetEditMode();
         settings.setReadAhead(false);
@@ -51,9 +52,9 @@ public void assertEquals(String expected, TestBuffer buffer) throws IOException
 
         String in = null;
         while (true) {
-            String tmp = console.read(null);
+            ConsoleOutput tmp = console.read(null);
             if(tmp != null)
-                in = tmp;
+                in = tmp.getBuffer();
             else
                 break;
         }
@@ -72,7 +73,7 @@ public void assertEqualsViMode(String expected, TestBuffer buffer) throws IOExce
         settings.setReadInputrc(false);
         settings.setTerminal(new TestTerminal());
         settings.setInputStream(new ByteArrayInputStream(buffer.getBytes()));
-        settings.setOutputStream(new ByteArrayOutputStream());
+        settings.setStdOut(new ByteArrayOutputStream());
         settings.setReadAhead(false);
         settings.setEditMode(Mode.VI);
         settings.resetEditMode();
@@ -83,9 +84,9 @@ public void assertEqualsViMode(String expected, TestBuffer buffer) throws IOExce
 
         String in = null;
         while (true) {
-            String tmp = console.read(null);
+            ConsoleOutput tmp = console.read(null);
             if(tmp != null)
-                in = tmp;
+                in = tmp.getBuffer();
             else
                 break;
         }
diff --git a/src/test/java/org/jboss/jreadline/util/ParserTestCase.java b/src/test/java/org/jboss/jreadline/util/ParserTestCase.java
index ad4614d1d..f30edfa82 100644
--- a/src/test/java/org/jboss/jreadline/util/ParserTestCase.java
+++ b/src/test/java/org/jboss/jreadline/util/ParserTestCase.java
@@ -44,4 +44,17 @@ public void testFindClosestWordToCursor() {
         assertEquals("""", Parser.findWordClosestToCursor(""ls  org/jboss/jreadlineshell/Shell.class"", 3) );
     }
 
+    public void testFindWordClosestToCursorDividedByRedirectOrPipe() {
+        assertEquals(""foo"", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls > foo"", 8));
+        assertEquals(""foo"", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls | foo"", 8));
+        assertEquals(""fo"", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls > foo"", 7));
+        assertEquals(""fo"", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls | foo"", 7));
+        assertEquals(""foo"", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls > foo "", 9));
+        assertEquals("""", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls > foo  "", 10));
+        assertEquals("""", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls > "", 5));
+        assertEquals("""", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls >  "", 6));
+        assertEquals("""", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls > bla > "", 11));
+        assertEquals("""", Parser.findWordClosestToCursorDividedByRedirectOrPipe(""ls | bla > "", 11));
+    }
+
 }"
ae3c13a83d610f3003cf800e2286a8bba69bf2b1,intellij-community,Cleanup code--,p,https://github.com/JetBrains/intellij-community,"diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
index 6be07ffa52927..ac81fea6270d7 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
@@ -20,6 +20,7 @@
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
 import org.apache.lucene.search.Query;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.idea.maven.model.MavenArtifactInfo;
@@ -137,7 +138,7 @@ public MavenIndex(MavenIndexerWrapper indexer,
     open();
   }
 
-  private String normalizePathOrUrl(String pathOrUrl) {
+  private static String normalizePathOrUrl(String pathOrUrl) {
     pathOrUrl = pathOrUrl.trim();
     pathOrUrl = FileUtil.toSystemIndependentName(pathOrUrl);
     while (pathOrUrl.endsWith(""/"")) {
@@ -169,10 +170,16 @@ private void open() throws MavenIndexException {
 
   private void doOpen() throws Exception {
     try {
+      File dataDir;
       if (myDataDirName == null) {
-        myDataDirName = findAvailableDataDirName();
+        dataDir = createNewDataDir();
+        myDataDirName = dataDir.getName();
       }
-      myData = openData(myDataDirName);
+      else {
+        dataDir = new File(myDir, myDataDirName);
+        dataDir.mkdirs();
+      }
+      myData = new IndexData(dataDir);
     }
     catch (Exception e) {
       cleanupBrokenData();
@@ -309,17 +316,16 @@ private void updateContext(int indexId, MavenGeneralSettings settings, MavenProg
   }
 
   private void updateData(MavenProgressIndicator progress) throws MavenIndexException {
-    String newDataDirName;
     IndexData newData;
 
-    newDataDirName = findAvailableDataDirName();
+    File newDataDir = createNewDataDir();
     try {
-      FileUtil.copyDir(getUpdateDir(), getDataContextDir(getDataDir(newDataDirName)));
+      FileUtil.copyDir(getUpdateDir(), getDataContextDir(newDataDir));
     }
     catch (IOException e) {
       throw new MavenIndexException(e);
     }
-    newData = openData(newDataDirName);
+    newData = new IndexData(newDataDir);
 
     try {
       doUpdateIndexData(newData, progress);
@@ -327,7 +333,7 @@ private void updateData(MavenProgressIndicator progress) throws MavenIndexExcept
     }
     catch (Throwable e) {
       newData.close(true);
-      FileUtil.delete(getDataDir(newDataDirName));
+      FileUtil.delete(newDataDir);
 
       if (e instanceof MavenServerIndexerException) throw new MavenIndexException(e);
       if (e instanceof IOException) throw new MavenIndexException(e);
@@ -338,18 +344,15 @@ private void updateData(MavenProgressIndicator progress) throws MavenIndexExcept
       IndexData oldData = myData;
 
       myData = newData;
-      myDataDirName = newDataDirName;
+      myDataDirName = newDataDir.getName();
 
       myUpdateTimestamp = System.currentTimeMillis();
 
       oldData.close(true);
 
-      File[] children = myDir.listFiles();
-      if (children != null) {
-        for (File each : children) {
-          if (each.getName().startsWith(DATA_DIR_PREFIX) && !each.getName().equals(newDataDirName)) {
-            FileUtil.delete(each);
-          }
+      for (File each : FileUtil.notNullize(myDir.listFiles())) {
+        if (each.getName().startsWith(DATA_DIR_PREFIX) && !each.getName().equals(myDataDirName)) {
+          FileUtil.delete(each);
         }
       }
     }
@@ -366,7 +369,7 @@ private void doUpdateIndexData(IndexData data,
     progress.setIndeterminate(true);
 
     try {
-      data.processArtifacts(new MavenIndicesProcessor() {
+      myIndexer.processArtifacts(data.indexId, new MavenIndicesProcessor() {
         @Override
         public void processArtifacts(Collection<MavenId> artifacts) {
           for (MavenId each : artifacts) {
@@ -393,7 +396,7 @@ public void processArtifacts(Collection<MavenId> artifacts) {
     }
   }
 
-  private <T> Set<T> getOrCreate(Map<String, Set<T>> map, String key) {
+  private static <T> Set<T> getOrCreate(Map<String, Set<T>> map, String key) {
     Set<T> result = map.get(key);
     if (result == null) {
       result = new THashSet<T>();
@@ -408,18 +411,6 @@ private static <T> void persist(Map<String, T> map, PersistentHashMap<String, T>
     }
   }
 
-  private static void persist(Set<String> groups, PersistentStringEnumerator persistent) throws IOException {
-    for (String each : groups) {
-      persistent.enumerate(each);
-    }
-  }
-
-  private IndexData openData(String dataDir) throws MavenIndexException {
-    File dir = getDataDir(dataDir);
-    dir.mkdirs();
-    return new IndexData(dir);
-  }
-
   @TestOnly
   public File getDir() {
     return myDir;
@@ -427,19 +418,16 @@ public File getDir() {
 
   @TestOnly
   protected synchronized File getCurrentDataDir() {
-    return getDataDir(myDataDirName);
-  }
-
-  private File getDataDir(String dataDirName) {
-    return new File(myDir, dataDirName);
+    return new File(myDir, myDataDirName);
   }
 
   private static File getDataContextDir(File dataDir) {
     return new File(dataDir, ""context"");
   }
 
-  private String findAvailableDataDirName() {
-    return MavenIndices.findAvailableDir(myDir, DATA_DIR_PREFIX, 100).getName();
+  @NotNull
+  private File createNewDataDir() {
+    return MavenIndices.createNewDir(myDir, DATA_DIR_PREFIX, 100);
   }
 
   public synchronized void addArtifact(final File artifactFile) {
@@ -659,10 +647,6 @@ public void flush() throws IOException {
       groupWithArtifactToVersionMap.force();
     }
 
-    public void processArtifacts(MavenIndicesProcessor processor) throws MavenServerIndexerException {
-      myIndexer.processArtifacts(indexId, processor);
-    }
-
     public MavenId addArtifact(File artifactFile) throws MavenServerIndexerException {
       return myIndexer.addArtifact(indexId, artifactFile);
     }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java
index 68554ed62af57..bb46e9d7ab1c3 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java
@@ -16,6 +16,7 @@
 package org.jetbrains.idea.maven.indices;
 
 import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.project.MavenGeneralSettings;
 import org.jetbrains.idea.maven.server.MavenIndexerWrapper;
@@ -83,7 +84,7 @@ public synchronized MavenIndex add(String repositoryId, String repositoryPathOrU
     MavenIndex index = find(repositoryId, repositoryPathOrUrl, kind);
     if (index != null) return index;
 
-    File dir = getAvailableIndexDir();
+    File dir = createNewIndexDir();
     index = new MavenIndex(myIndexer, dir, repositoryId, repositoryPathOrUrl, kind, myListener);
     myIndices.add(index);
     return index;
@@ -97,11 +98,12 @@ public MavenIndex find(String repositoryId, String repositoryPathOrUrl, MavenInd
     return null;
   }
 
-  private File getAvailableIndexDir() {
-    return findAvailableDir(myIndicesDir, ""Index"", 1000);
+  private File createNewIndexDir() {
+    return createNewDir(myIndicesDir, ""Index"", 1000);
   }
 
-  static File findAvailableDir(File parent, String prefix, int max) {
+  @NotNull
+  static File createNewDir(File parent, String prefix, int max) {
     synchronized (ourDirectoryLock) {
       for (int i = 0; i < max; i++) {
         String name = prefix + i;"
1927f040774aa75d2dfe1d95fae9b43ee821361b,hbase,HBASE-13958 RESTApiClusterManager calls kill()- instead of suspend() and resume()--,c,https://github.com/apache/hbase,"diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
index 28fac4ee2bf2..9ea126a0af90 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
@@ -158,12 +158,12 @@ public void kill(ServiceType service, String hostname, int port) throws IOExcept
 
   @Override
   public void suspend(ServiceType service, String hostname, int port) throws IOException {
-    hBaseClusterManager.kill(service, hostname, port);
+    hBaseClusterManager.suspend(service, hostname, port);
   }
 
   @Override
   public void resume(ServiceType service, String hostname, int port) throws IOException {
-    hBaseClusterManager.kill(service, hostname, port);
+    hBaseClusterManager.resume(service, hostname, port);
   }"
8e593fdf24a9af820af9cead5dc0630891905f76,Delta Spike,"DELTASPIKE-278 implement the category resolving and add tests
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageResolver.java
index 34708390b..f269e5055 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageResolver.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageResolver.java
@@ -29,10 +29,12 @@ public interface MessageResolver extends Serializable
     String MISSING_RESOURCE_MARKER = ""???"";
 
     /**
+     *
      * @param messageContext messageContext which should be used
      * @param messageTemplate the message key (or in-lined text) of the current message
+     * @param category the sub-category of the message, e.g. 'longText'. Can be <code>null</code>
      * @return the final but not interpolated message text
      *         or <code>null</code> if an error happened or the resource could not be resolved.
      */
-    String getMessage(MessageContext messageContext, String messageTemplate);
+    String getMessage(MessageContext messageContext, String messageTemplate, String category);
 }
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index cae0f48ee..42e781914 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -108,7 +108,8 @@ public String toString(String category)
         MessageResolver messageResolver = messageContext.getMessageResolver();
         if (messageResolver != null)
         {
-            String resolvedTemplate = messageResolver.getMessage(messageContext, template);
+            String resolvedTemplate = messageResolver.getMessage(messageContext, template, category);
+
             if (resolvedTemplate == null)
             {
                 // this means an error happened during message resolving
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
index 90517b778..379146702 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
@@ -36,7 +36,7 @@ public class DefaultMessageResolver implements MessageResolver
     private static final long serialVersionUID = 5834411208472341006L;
 
     @Override
-    public String getMessage(MessageContext messageContext, String messageTemplate)
+    public String getMessage(MessageContext messageContext, String messageTemplate, String category)
     {
         // we can use {{ as escaping for now
         if (messageTemplate.startsWith(""{{""))
@@ -69,6 +69,19 @@ public String getMessage(MessageContext messageContext, String messageTemplate)
                     Locale locale = messageContext.getLocale();
                     ResourceBundle messageBundle = PropertyFileUtils.getResourceBundle(currentMessageSource, locale);
 
+                    if (category != null && category.length() > 0)
+                    {
+                        try
+                        {
+                            return messageBundle.getString(resourceKey + ""."" + category);
+                        }
+                        catch (MissingResourceException e)
+                        {
+                            // we fallback on the version without the category
+                            messageBundle.getString(resourceKey);
+                        }
+                    }
+
                     return messageBundle.getString(resourceKey);
                 }
                 catch (MissingResourceException e)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
index d032b4f87..52241ee4a 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -81,6 +81,16 @@ public void testSimpleMessage()
                 simpleMessage.welcomeTo(messageContext, ""DeltaSpike"").toString());
     }
 
+    /**
+     * We test that a non-existing category will fallback on the default message
+     */
+    @Test
+    public void testSimpleMessageCategory()
+    {
+        Assert.assertEquals(""Welcome to DeltaSpike"",
+                simpleMessage.welcomeTo(messageContext, ""DeltaSpike"").toString(""notexisting""));
+    }
+
     @Test
     public void resolveTextTest()
     {
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
index 7e6e3accf..b7f19f059 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
@@ -84,4 +84,19 @@ public void testInternationalizedParametrizedMessage()
     {
         assertEquals(TestMessageInterpolator.SPECIALFORMATTED + ""Welcome to Apache DeltaSpike"", messages.welcomeTo(""Apache DeltaSpike""));
     }
+
+    @Test
+    public void testMessageCategory()
+    {
+        assertEquals(TestMessageInterpolator.SPECIALFORMATTED + ""Value good was set""
+            , messages.messageWithCategory(""good"").toString());
+
+        assertEquals(TestMessageInterpolator.SPECIALFORMATTED + ""The value of the property has been set to good.""
+            , messages.messageWithCategory(""good"").toString(""longText""));
+
+        assertEquals(TestMessageInterpolator.SPECIALFORMATTED + ""Value good was set""
+                , messages.messageWithCategory(""good"").toString(""notExistingCategory""));
+    }
+
+
 }
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
index 691d8e0e4..4246dbe0b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
@@ -36,20 +36,29 @@ protected TestMessageResolver()
     }
 
     @Override
-    public String getMessage(MessageContext messageContext, String messageTemplate)
+    public String getMessage(MessageContext messageContext, String messageTemplate, String category)
     {
         if ( messageTemplate.startsWith(""{"") && messageTemplate.endsWith(""}""))
         {
-            messageTemplate = messageTemplate.substring(1, messageTemplate.length() - 1);
+            String resourceKey = messageTemplate.substring(1, messageTemplate.length() - 1);
             try
             {
-                ResourceBundle resolvedBundle = PropertyFileUtils
+                ResourceBundle messageBundle = PropertyFileUtils
                         .getResourceBundle(TestMessages.class.getName(), messageContext.getLocale());
-                return resolvedBundle.getString(messageTemplate);
+                String value = null;
+                if (category != null && category.length() > 0)
+                {
+                    value = messageBundle.getString(resourceKey + ""."" + category);
+                }
+                if (value == null)
+                {
+                    value = messageBundle.getString(resourceKey);
+                }
+                return value;
             }
             catch (MissingResourceException e)
             {
-                return messageTemplate;
+                return resourceKey;
             }
         }
 
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessages.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessages.java
index 08cf4df99..142354197 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessages.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessages.java
@@ -18,6 +18,7 @@
  */
 package org.apache.deltaspike.test.core.api.message;
 
+import org.apache.deltaspike.core.api.message.Message;
 import org.apache.deltaspike.core.api.message.MessageContext;
 import org.apache.deltaspike.core.api.message.annotation.MessageTemplate;
 import org.apache.deltaspike.core.api.message.annotation.MessageBundle;
@@ -33,6 +34,10 @@ public interface TestMessages
     @MessageTemplate(""Spotted %s jays"")
     String numberOfJaysSpotted(int number);
 
+    @MessageTemplate(""{categoryMessage}"")
+    Message messageWithCategory(String value);
+
+
     @MessageTemplate(""{welcome_to_deltaspike}"")
     String welcomeToDeltaSpike();
 
diff --git a/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/TestMessages_en.properties b/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/TestMessages_en.properties
index ffbb58bdd..34f671a46 100644
--- a/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/TestMessages_en.properties
+++ b/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/TestMessages_en.properties
@@ -19,3 +19,6 @@ welcome_to=Welcome to %s
 welcome_to_deltaspike=Welcome to DeltaSpike
 
 hello=test message to %s
+
+categoryMessage=Value %s was set
+categoryMessage.longText=The value of the property has been set to %s."
7d5216168878a13826d5475cbf933b7799224eb5,intellij-community,CPP-560 New Welcome Screen for CLion--,a,https://github.com/JetBrains/intellij-community,"diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
index 786a5825e7837..b1b0db1fd0d74 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
@@ -107,11 +107,11 @@ public Dimension getPreferredSize() {
       JPanel progressPanel = new JPanel(new VerticalFlowLayout(true, false));
       progressPanel.add(progressBar);
       final LinkLabel cancelLink = new LinkLabel(""Cancel"", AllIcons.Actions.Cancel);
-      JPanel linkWrapper = new JPanel(new FlowLayout(FlowLayout.CENTER));
+      JPanel linkWrapper = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
       linkWrapper.add(cancelLink);
       progressPanel.add(linkWrapper);
 
-      JPanel buttonPanel = new JPanel(new VerticalFlowLayout());
+      JPanel buttonPanel = new JPanel(new VerticalFlowLayout(0, 0));
       buttonPanel.add(installButton);
 
       buttonWrapper.add(buttonPanel, ""button"");
@@ -238,7 +238,7 @@ public void linkSelected(LinkLabel aSource, Object aLinkData) {
           protected Color getColor() {
             return ColorUtil.withAlpha(JBColor.foreground(), .2);
           }
-        }, BorderFactory.createEmptyBorder(GAP, GAP, 0, GAP)));
+        }, BorderFactory.createEmptyBorder(0, GAP / 2, 0, GAP / 2)));
       cursor++;
     }"
190aabbbe8d382b9b960198d8d895ab98c117893,camel,CAMEL-3689: AdviceWith can now manipulate routes.- This allows you for example to replace parts of routes during testing.--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1072545 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/camel,"diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
new file mode 100644
index 0000000000000..1a62f43fbb1a8
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import org.apache.camel.model.PipelineDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+
+/**
+ * A builder when using the <a href=""http://camel.apache.org/advicewith.html"">advice with</a> feature.
+ */
+public class AdviceWithBuilder {
+
+    private final AdviceWithRouteBuilder builder;
+    private final String id;
+    private final String toString;
+
+    public AdviceWithBuilder(AdviceWithRouteBuilder builder, String id, String toString) {
+        this.builder = builder;
+        this.id = id;
+        this.toString = toString;
+
+        if (id == null && toString == null) {
+            throw new IllegalArgumentException(""Either id or toString must be specified"");
+        }
+    }
+
+    /**
+     * Replaces the matched node(s) with the following nodes.
+     *
+     * @return the builder to build the nodes.
+     */
+    public ProcessorDefinition replace() {
+        PipelineDefinition answer = new PipelineDefinition();
+        if (id != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.replaceById(builder.getOriginalRoute(), id, answer));
+        } else if (toString != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByToString(builder.getOriginalRoute(), toString, answer));
+        }
+        return answer;
+    }
+
+    /**
+     * Removes the matched node(s)
+     */
+    public void remove() {
+        if (id != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.removeById(builder.getOriginalRoute(), id));
+        } else if (toString != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(builder.getOriginalRoute(), toString));
+        }
+    }
+
+    /**
+     * Insert the following node(s) <b>before</b> the matched node(s)
+     *
+     * @return the builder to build the nodes.
+     */
+    public ProcessorDefinition before() {
+        PipelineDefinition answer = new PipelineDefinition();
+        if (id != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.beforeById(builder.getOriginalRoute(), id, answer));
+        } else if (toString != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(builder.getOriginalRoute(), toString, answer));
+        }
+        return answer;
+    }
+
+    /**
+     * Insert the following node(s) <b>after</b> the matched node(s)
+     *
+     * @return the builder to build the nodes.
+     */
+    public ProcessorDefinition after() {
+        PipelineDefinition answer = new PipelineDefinition();
+        if (id != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.afterById(builder.getOriginalRoute(), id, answer));
+        } else if (toString != null) {
+            builder.getAdviceWithTasks().add(AdviceWithTasks.afterByToString(builder.getOriginalRoute(), toString, answer));
+        }
+        return answer;
+    }
+
+}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
index 7d77bbb81bdb8..04d78d2267912 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
@@ -16,18 +16,56 @@
  */
 package org.apache.camel.builder;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.camel.impl.InterceptSendToMockEndpointStrategy;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.util.ObjectHelper;
 
 /**
- * A {@link RouteBuilder} which has extended features when using
- * {@link org.apache.camel.model.RouteDefinition#adviceWith(org.apache.camel.CamelContext, RouteBuilder) adviceWith}.
+ * A {@link RouteBuilder} which has extended capabilities when using
+ * the <a href=""http://camel.apache.org/advicewith.html"">advice with</a> feature.
  *
- * @version 
+ * @see org.apache.camel.model.RouteDefinition#adviceWith(org.apache.camel.CamelContext, RouteBuilder)
  */
 public abstract class AdviceWithRouteBuilder extends RouteBuilder {
 
+    private RouteDefinition originalRoute;
+    private final List<AdviceWithTask> adviceWithTasks = new ArrayList<AdviceWithTask>();
+
+    /**
+     * Sets the original route which we advice.
+     *
+     * @param originalRoute the original route we advice.
+     */
+    public void setOriginalRoute(RouteDefinition originalRoute) {
+        this.originalRoute = originalRoute;
+    }
+
+    /**
+     * Gets the original route we advice.
+     *
+     * @return the original route.
+     */
+    public RouteDefinition getOriginalRoute() {
+        return originalRoute;
+    }
+
+    /**
+     * Gets a list of additional tasks to execute after the {@link #configure()} method has been executed
+     * during the advice process.
+     *
+     * @return a list of additional {@link AdviceWithTask} tasks to be executed during the advice process.
+     */
+    public List<AdviceWithTask> getAdviceWithTasks() {
+        return adviceWithTasks;
+    }
+
     /**
      * Mock all endpoints in the route.
+     *
+     * @throws Exception can be thrown if error occurred
      */
     public void mockEndpoints() throws Exception {
         getContext().removeEndpoints(""*"");
@@ -37,7 +75,8 @@ public void mockEndpoints() throws Exception {
     /**
      * Mock all endpoints matching the given pattern.
      *
-     * @param pattern  the pattern.
+     * @param pattern the pattern.
+     * @throws Exception can be thrown if error occurred
      * @see org.apache.camel.util.EndpointHelper#matchEndpoint(String, String)
      */
     public void mockEndpoints(String pattern) throws Exception {
@@ -45,4 +84,34 @@ public void mockEndpoints(String pattern) throws Exception {
         getContext().addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(pattern));
     }
 
+    /**
+     * Advices by matching id of the nodes in the route.
+     * <p/>
+     * Uses the {@link org.apache.camel.util.EndpointHelper#matchPattern(String, String)} matching algorithm.
+     *
+     * @param pattern the pattern
+     * @return the builder
+     * @see org.apache.camel.util.EndpointHelper#matchPattern(String, String)
+     */
+    public AdviceWithBuilder adviceById(String pattern) {
+        ObjectHelper.notNull(originalRoute, ""originalRoute"", this);
+
+        return new AdviceWithBuilder(this, pattern, null);
+    }
+
+    /**
+     * Advices by matching the to string representation of the nodes in the route.
+     * <p/>
+     * Uses the {@link org.apache.camel.util.EndpointHelper#matchPattern(String, String)} matching algorithm.
+     *
+     * @param pattern the pattern
+     * @return the builder
+     * @see org.apache.camel.util.EndpointHelper#matchPattern(String, String)
+     */
+    public AdviceWithBuilder adviceByToString(String pattern) {
+        ObjectHelper.notNull(originalRoute, ""originalRoute"", this);
+
+        return new AdviceWithBuilder(this, null, pattern);
+    }
+
 }
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java
new file mode 100644
index 0000000000000..7c29422d8ac6c
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+/**
+ * Task or command being executed when using the advice with feature.
+ */
+public interface AdviceWithTask {
+
+    /**
+     * The task to execute
+     *
+     * @throws Exception is thrown if error during executing the task, or invalid input.
+     */
+    void task() throws Exception;
+
+}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
new file mode 100644
index 0000000000000..4a568d1dbf5b1
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -0,0 +1,238 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import java.util.Iterator;
+
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.ProcessorDefinitionHelper;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.util.EndpointHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * {@link AdviceWithTask} tasks which are used by the {@link AdviceWithRouteBuilder}.
+ */
+public final class AdviceWithTasks {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AdviceWithTasks.class);
+
+    private AdviceWithTasks() {
+        // utility class
+    }
+
+    /**
+     * Match by is used for pluggable match by logic.
+     */
+    private interface MatchBy {
+
+        String getId();
+
+        boolean match(ProcessorDefinition processor);
+    }
+
+    /**
+     * Will match by id of the processor.
+     */
+    private static final class MatchById implements MatchBy {
+
+        private final String id;
+
+        private MatchById(String id) {
+            this.id = id;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public boolean match(ProcessorDefinition processor) {
+            return EndpointHelper.matchPattern(processor.getId(), id);
+        }
+    }
+
+    /**
+     * Will match by the to string representation of the processor.
+     */
+    private static final class MatchByToString implements MatchBy {
+
+        private final String toString;
+
+        private MatchByToString(String toString) {
+            this.toString = toString;
+        }
+
+        public String getId() {
+            return toString;
+        }
+
+        public boolean match(ProcessorDefinition processor) {
+            return EndpointHelper.matchPattern(processor.toString(), toString);
+        }
+    }
+
+
+    public static AdviceWithTask replaceByToString(final RouteDefinition route, final String toString, final ProcessorDefinition replace) {
+        return doReplace(route, new MatchByToString(toString), replace);
+    }
+
+    public static AdviceWithTask replaceById(final RouteDefinition route, final String id, final ProcessorDefinition replace) {
+        return doReplace(route, new MatchById(id), replace);
+    }
+
+    @SuppressWarnings(""unchecked"")
+    private static AdviceWithTask doReplace(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition replace) {
+        return new AdviceWithTask() {
+            public void task() throws Exception {
+                boolean match = false;
+                Iterator<ProcessorDefinition> it = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(), ProcessorDefinition.class);
+                while (it.hasNext()) {
+                    ProcessorDefinition output = it.next();
+                    if (matchBy.match(output)) {
+                        ProcessorDefinition parent = output.getParent();
+                        if (parent != null) {
+                            int index = parent.getOutputs().indexOf(output);
+                            if (index != -1) {
+                                match = true;
+                                parent.getOutputs().add(index + 1, replace);
+                                Object old = parent.getOutputs().remove(index);
+                                LOG.info(""AdviceWith ("" + matchBy.getId() + "") : ["" + old + ""] --> replace ["" + replace + ""]"");
+                            }
+                        }
+                    }
+                }
+
+                if (!match) {
+                    throw new IllegalArgumentException(""There are no outputs which matches: "" + matchBy.getId() + "" in the route: "" + route);
+                }
+            }
+        };
+    }
+
+    public static AdviceWithTask removeByToString(final RouteDefinition route, final String toString) {
+        return doRemove(route, new MatchByToString(toString));
+    }
+
+    public static AdviceWithTask removeById(final RouteDefinition route, final String id) {
+        return doRemove(route, new MatchById(id));
+    }
+
+    @SuppressWarnings(""unchecked"")
+    private static AdviceWithTask doRemove(final RouteDefinition route, final MatchBy matchBy) {
+        return new AdviceWithTask() {
+            public void task() throws Exception {
+                boolean match = false;
+                Iterator<ProcessorDefinition> it = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(), ProcessorDefinition.class);
+                while (it.hasNext()) {
+                    ProcessorDefinition output = it.next();
+                    if (matchBy.match(output)) {
+                        ProcessorDefinition parent = output.getParent();
+                        if (parent != null) {
+                            int index = parent.getOutputs().indexOf(output);
+                            if (index != -1) {
+                                match = true;
+                                Object old = parent.getOutputs().remove(index);
+                                LOG.info(""AdviceWith ("" + matchBy.getId() + "") : ["" + old + ""] --> remove"");
+                            }
+                        }
+                    }
+                }
+
+                if (!match) {
+                    throw new IllegalArgumentException(""There are no outputs which matches: "" + matchBy.getId() + "" in the route: "" + route);
+                }
+            }
+        };
+    }
+
+    public static AdviceWithTask beforeByToString(final RouteDefinition route, final String toString, final ProcessorDefinition before) {
+        return doBefore(route, new MatchByToString(toString), before);
+    }
+
+    public static AdviceWithTask beforeById(final RouteDefinition route, final String id, final ProcessorDefinition before) {
+        return doBefore(route, new MatchById(id), before);
+    }
+
+    @SuppressWarnings(""unchecked"")
+    private static AdviceWithTask doBefore(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition before) {
+        return new AdviceWithTask() {
+            public void task() throws Exception {
+                boolean match = false;
+                Iterator<ProcessorDefinition> it = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(), ProcessorDefinition.class);
+                while (it.hasNext()) {
+                    ProcessorDefinition output = it.next();
+                    if (matchBy.match(output)) {
+                        ProcessorDefinition parent = output.getParent();
+                        if (parent != null) {
+                            int index = parent.getOutputs().indexOf(output);
+                            if (index != -1) {
+                                match = true;
+                                Object existing = parent.getOutputs().get(index);
+                                parent.getOutputs().add(index, before);
+                                LOG.info(""AdviceWith ("" + matchBy.getId() + "") : ["" + existing + ""] --> before ["" + before + ""]"");
+                            }
+                        }
+                    }
+                }
+
+                if (!match) {
+                    throw new IllegalArgumentException(""There are no outputs which matches: "" + matchBy.getId() + "" in the route: "" + route);
+                }
+            }
+        };
+    }
+
+    public static AdviceWithTask afterByToString(final RouteDefinition route, final String toString, final ProcessorDefinition after) {
+        return doAfter(route, new MatchByToString(toString), after);
+    }
+
+    public static AdviceWithTask afterById(final RouteDefinition route, final String id, final ProcessorDefinition after) {
+        return doAfter(route, new MatchById(id), after);
+    }
+
+    @SuppressWarnings(""unchecked"")
+    private static AdviceWithTask doAfter(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition after) {
+        return new AdviceWithTask() {
+            public void task() throws Exception {
+                boolean match = false;
+                Iterator<ProcessorDefinition> it = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(), ProcessorDefinition.class);
+                while (it.hasNext()) {
+                    ProcessorDefinition output = it.next();
+                    if (matchBy.match(output)) {
+
+                        ProcessorDefinition parent = output.getParent();
+                        if (parent != null) {
+                            int index = parent.getOutputs().indexOf(output);
+                            if (index != -1) {
+                                match = true;
+                                Object existing = parent.getOutputs().get(index);
+                                parent.getOutputs().add(index + 1, after);
+                                LOG.info(""AdviceWith ("" + matchBy.getId() + "") : ["" + existing + ""] --> after ["" + after + ""]"");
+                            }
+                        }
+                    }
+                }
+
+                if (!match) {
+                    throw new IllegalArgumentException(""There are no outputs which matches: "" + matchBy.getId() + "" in the route: "" + route);
+                }
+            }
+        };
+    }
+
+}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
index dba8330ba815a..b34bb6570d046 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -30,6 +30,9 @@
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.RoutesDefinition;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * A <a href=""http://camel.apache.org/dsl.html"">Java DSL</a> which is
  * used to build {@link org.apache.camel.impl.DefaultRoute} instances in a {@link CamelContext} for smart routing.
@@ -37,6 +40,7 @@
  * @version 
  */
 public abstract class RouteBuilder extends BuilderSupport implements RoutesBuilder {
+    protected Logger log = LoggerFactory.getLogger(getClass());
     private AtomicBoolean initialized = new AtomicBoolean(false);
     private RoutesDefinition routeCollection = new RoutesDefinition();
 
@@ -343,6 +347,7 @@ public RoutesDefinition getRouteCollection() {
 
     /**
      * Factory method
+     *
      * @return the CamelContext
      */
     protected CamelContext createContainer() {
@@ -356,7 +361,7 @@ protected void configureRoute(RouteDefinition route) {
     /**
      * Adds a collection of routes to this context
      *
-     * @param routes
+     * @param routes the routes
      * @throws Exception if the routes could not be created for whatever reason
      * @deprecated use {@link #includeRoutes(org.apache.camel.RoutesBuilder) includeRoutes} instead.
      */
diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
index 0c8184ae0d1a6..d6aca7071a371 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
@@ -47,4 +47,14 @@ public void setOutputs(List<ProcessorDefinition> outputs) {
             }
         }
     }
+
+    @Override
+    public String getShortName() {
+        return ""output"";
+    }
+
+    @Override
+    public String toString() {
+        return getShortName() + "" -> ["" + outputs + ""]"";
+    }
 }
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index 879552b7ce04e..ed995399f601e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -37,6 +37,8 @@
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.ShutdownRoute;
 import org.apache.camel.ShutdownRunningTask;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.AdviceWithTask;
 import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
 import org.apache.camel.builder.RouteBuilder;
@@ -179,6 +181,10 @@ public Endpoint resolveEndpoint(CamelContext camelContext, String uri) throws No
     /**
      * Advices this route with the route builder.
      * <p/>
+     * You can use a regular {@link RouteBuilder} but the specialized {@link org.apache.camel.builder.AdviceWithRouteBuilder}
+     * has additional features when using the <a href=""http://camel.apache.org/advicewith.html"">advice with</a> feature.
+     * We therefore suggest you to use the {@link org.apache.camel.builder.AdviceWithRouteBuilder}.
+     * <p/>
      * The advice process will add the interceptors, on exceptions, on completions etc. configured
      * from the route builder to this route.
      * <p/>
@@ -190,14 +196,29 @@ public Endpoint resolveEndpoint(CamelContext camelContext, String uri) throws No
      * @param builder      the route builder
      * @return a new route which is this route merged with the route builder
      * @throws Exception can be thrown from the route builder
+     * @see AdviceWithRouteBuilder
      */
     public RouteDefinition adviceWith(CamelContext camelContext, RouteBuilder builder) throws Exception {
         ObjectHelper.notNull(camelContext, ""CamelContext"");
         ObjectHelper.notNull(builder, ""RouteBuilder"");
 
+        if (log.isDebugEnabled()) {
+            log.debug(""AdviceWith route before: "" + this);
+        }
+
+        // inject this route into the advice route builder so it can access this route
+        // and offer features to manipulate the route directly
+        if (builder instanceof AdviceWithRouteBuilder) {
+            ((AdviceWithRouteBuilder) builder).setOriginalRoute(this);
+        }
+
         // configure and prepare the routes from the builder
         RoutesDefinition routes = builder.configureRoutes(camelContext);
 
+        if (log.isDebugEnabled()) {
+            log.debug(""AdviceWith routes: "" + routes);
+        }
+
         // we can only advice with a route builder without any routes
         if (!routes.getRoutes().isEmpty()) {
             throw new IllegalArgumentException(""You can only advice from a RouteBuilder which has no existing routes.""
@@ -211,12 +232,23 @@ public RouteDefinition adviceWith(CamelContext camelContext, RouteBuilder builde
         // stop and remove this existing route
         camelContext.removeRouteDefinition(this);
 
+        // any advice with tasks we should execute first?
+        if (builder instanceof AdviceWithRouteBuilder) {
+            List<AdviceWithTask> tasks = ((AdviceWithRouteBuilder) builder).getAdviceWithTasks();
+            for (AdviceWithTask task : tasks) {
+                task.task();
+            }
+        }
+
         // now merge which also ensures that interceptors and the likes get mixed in correctly as well
         RouteDefinition merged = routes.route(this);
 
         // add the new merged route
         camelContext.getRouteDefinitions().add(0, merged);
 
+        // log the merged route at info level to make it easier to end users to spot any mistakes they may have made
+        log.info(""AdviceWith route after: "" + merged);
+
         // and start it
         camelContext.startRoute(merged);
         return merged;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksMatchTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksMatchTest.java
new file mode 100644
index 0000000000000..5cb4fe212267f
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksMatchTest.java
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.interceptor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Advice with match multiple ids test
+ */
+public class AdviceWithTasksMatchTest extends ContextTestSupport {
+
+    public void testReplaceMultipleIds() throws Exception {
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // replace all gold id's with the following route path
+                adviceById(""gold*"").replace().multicast().to(""mock:a"").to(""mock:b"");
+            }
+        });
+
+        getMockEndpoint(""mock:foo"").expectedMessageCount(0);
+        getMockEndpoint(""mock:bar"").expectedMessageCount(0);
+        getMockEndpoint(""mock:a"").expectedMessageCount(2);
+        getMockEndpoint(""mock:b"").expectedMessageCount(2);
+        getMockEndpoint(""mock:result"").expectedMessageCount(1);
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from(""direct:start"")
+                    .to(""mock:foo"").id(""gold-1"")
+                    .to(""mock:bar"").id(""gold-2"")
+                    .to(""mock:result"").id(""silver-1"");
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksTest.java
new file mode 100644
index 0000000000000..7545742d743f3
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksTest.java
@@ -0,0 +1,142 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.interceptor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Advice with tests
+ */
+public class AdviceWithTasksTest extends ContextTestSupport {
+
+    public void testUnknownId() throws Exception {
+        try {
+            context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+                @Override
+                public void configure() throws Exception {
+                    adviceById(""xxx"").replace().to(""mock:xxx"");
+                }
+            });
+            fail(""Should hve thrown exception"");
+        } catch (IllegalArgumentException e) {
+            assertTrue(e.getMessage(), e.getMessage().startsWith(""There are no outputs which matches: xxx in the route""));
+        }
+    }
+
+    public void testReplace() throws Exception {
+        // START SNIPPET: e1
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // advice the node in the route which has id = bar
+                // and replace it with the following route path
+                adviceById(""bar"").replace().multicast().to(""mock:a"").to(""mock:b"");
+            }
+        });
+        // END SNIPPET: e1
+
+        getMockEndpoint(""mock:foo"").expectedMessageCount(1);
+        getMockEndpoint(""mock:bar"").expectedMessageCount(0);
+        getMockEndpoint(""mock:a"").expectedMessageCount(1);
+        getMockEndpoint(""mock:b"").expectedMessageCount(1);
+        getMockEndpoint(""mock:result"").expectedMessageCount(1);
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testRemove() throws Exception {
+        // START SNIPPET: e2
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // advice the node in the route which has id = bar and remove it
+                adviceById(""bar"").remove();
+            }
+        });
+        // END SNIPPET: e2
+
+        getMockEndpoint(""mock:foo"").expectedMessageCount(1);
+        getMockEndpoint(""mock:result"").expectedMessageCount(1);
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+
+        assertFalse(""Should not have removed id"", context.hasEndpoint(""mock:bar"") == null);
+    }
+
+    public void testBefore() throws Exception {
+        // START SNIPPET: e3
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // advice the node in the route which has id = bar
+                // and insert the following route path before the adviced node
+                adviceById(""bar"").before().to(""mock:a"").transform(constant(""Bye World""));
+            }
+        });
+        // END SNIPPET: e3
+
+        getMockEndpoint(""mock:foo"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:a"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:bar"").expectedBodiesReceived(""Bye World"");
+        getMockEndpoint(""mock:result"").expectedBodiesReceived(""Bye World"");
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testAfter() throws Exception {
+        // START SNIPPET: e4
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // advice the node in the route which has id = bar
+                // and insert the following route path after the advice node
+                adviceById(""bar"").after().to(""mock:a"").transform(constant(""Bye World""));
+            }
+        });
+        // END SNIPPET: e4
+
+        getMockEndpoint(""mock:foo"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:a"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:bar"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:result"").expectedBodiesReceived(""Bye World"");
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from(""direct:start"")
+                    .to(""mock:foo"")
+                    .to(""mock:bar"").id(""bar"")
+                    .to(""mock:result"");
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksToStringPatternTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksToStringPatternTest.java
new file mode 100644
index 0000000000000..f340167aa32e5
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTasksToStringPatternTest.java
@@ -0,0 +1,131 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.interceptor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Advice with using to string matching
+ */
+public class AdviceWithTasksToStringPatternTest extends ContextTestSupport {
+
+    public void testUnknownId() throws Exception {
+        try {
+            context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+                @Override
+                public void configure() throws Exception {
+                    adviceByToString(""xxx"").replace().to(""mock:xxx"");
+                }
+            });
+            fail(""Should hve thrown exception"");
+        } catch (IllegalArgumentException e) {
+            assertTrue(e.getMessage(), e.getMessage().startsWith(""There are no outputs which matches: xxx in the route""));
+        }
+    }
+
+    public void testReplace() throws Exception {
+        // START SNIPPET: e1
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // advice nodes in the route which has foo anywhere in their to string representation
+                // and replace them with the following route path
+                adviceByToString("".*foo.*"").replace().multicast().to(""mock:a"").to(""mock:b"");
+            }
+        });
+        // END SNIPPET: e1
+
+        getMockEndpoint(""mock:foo"").expectedMessageCount(0);
+        getMockEndpoint(""mock:a"").expectedMessageCount(1);
+        getMockEndpoint(""mock:b"").expectedMessageCount(1);
+        getMockEndpoint(""mock:bar"").expectedMessageCount(1);
+        getMockEndpoint(""mock:result"").expectedMessageCount(1);
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testRemove() throws Exception {
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                adviceByToString("".*bar.*"").remove();
+            }
+        });
+
+        getMockEndpoint(""mock:foo"").expectedMessageCount(1);
+        getMockEndpoint(""mock:result"").expectedMessageCount(1);
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+
+        assertFalse(""Should not have removed id"", context.hasEndpoint(""mock:bar"") == null);
+    }
+
+    public void testBefore() throws Exception {
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                adviceByToString("".*bar.*"").before().to(""mock:a"").transform(constant(""Bye World""));
+            }
+        });
+
+        getMockEndpoint(""mock:foo"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:a"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:bar"").expectedBodiesReceived(""Bye World"");
+        getMockEndpoint(""mock:result"").expectedBodiesReceived(""Bye World"");
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testAfter() throws Exception {
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                adviceByToString("".*bar.*"").after().to(""mock:a"").transform(constant(""Bye World""));
+            }
+        });
+
+        getMockEndpoint(""mock:foo"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:a"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:bar"").expectedBodiesReceived(""Hello World"");
+        getMockEndpoint(""mock:result"").expectedBodiesReceived(""Bye World"");
+
+        template.sendBody(""direct:start"", ""Hello World"");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from(""direct:start"")
+                    .to(""mock:foo"")
+                    .to(""mock:bar"")
+                    .to(""mock:result"");
+            }
+        };
+    }
+}
\ No newline at end of file"
20f02d1592b059d6e1a609f5be3f6cc9fb2f3dfd,aeshell$aesh,"added CharInputStreamReader that read char by char
support asciicode > 128
",a,https://github.com/aeshell/aesh,"diff --git a/src/main/java/org/jboss/jreadline/console/Console.java b/src/main/java/org/jboss/jreadline/console/Console.java
index a24060ca1..a3f445056 100644
--- a/src/main/java/org/jboss/jreadline/console/Console.java
+++ b/src/main/java/org/jboss/jreadline/console/Console.java
@@ -36,7 +36,6 @@
  */
 public class Console {
 
-    private InputStream inStream;
     private Writer outStream;
     private Buffer buffer;
     private Terminal terminal;
@@ -65,10 +64,11 @@ public Console(InputStream in, Writer out, Terminal terminal) {
     }
 
     public Console(InputStream in, Writer out, Terminal terminal, EditMode mode) {
+        setOutWriter(out);
         if(terminal == null)
-            setTerminal(new POSIXTerminal());
+            setTerminal(new POSIXTerminal(), in);
         else
-            setTerminal(terminal);
+            setTerminal(terminal, in);
 
         if(mode == null)
             editMode = new EmacsEditMode();
@@ -80,17 +80,11 @@ public Console(InputStream in, Writer out, Terminal terminal, EditMode mode) {
         buffer = new Buffer(null);
         history = new InMemoryHistory();
 
-        setInStream(in);
-        setOutWriter(out);
     }
 
-    private void setTerminal(Terminal term) {
+    private void setTerminal(Terminal term, InputStream in) {
         terminal = term;
-        terminal.init();
-    }
-
-    private void setInStream(InputStream is) {
-        inStream = is;
+        terminal.init(in);
     }
 
     private void setOutWriter(Writer out) {
@@ -115,7 +109,7 @@ public String read(String prompt) throws IOException {
 
         while(true) {
 
-            int c = terminal.read(inStream);
+            int c = terminal.read();
             //System.out.println(""got int:""+c);
             if (c == -1) {
                 return null;
diff --git a/src/main/java/org/jboss/jreadline/console/reader/CharInputStreamReader.java b/src/main/java/org/jboss/jreadline/console/reader/CharInputStreamReader.java
new file mode 100644
index 000000000..43f1b7b08
--- /dev/null
+++ b/src/main/java/org/jboss/jreadline/console/reader/CharInputStreamReader.java
@@ -0,0 +1,339 @@
+/*
+*  Licensed to the Apache Software Foundation (ASF) under one or more
+*  contributor license agreements.  See the NOTICE file distributed with
+*  this work for additional information regarding copyright ownership.
+*  The ASF licenses this file to You under the Apache License, Version 2.0
+*  (the ""License""); you may not use this file except in compliance with
+*  the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an ""AS IS"" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+
+package org.jboss.jreadline.console.reader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.UnmappableCharacterException;
+
+
+/**
+ * NOTE: This is a copy of the InputStreamWriter from Apache Harmony
+ *
+ * A class for turning a byte stream into a character stream. Data read from the
+ * source input stream is converted into characters by either a default or a
+ * provided character converter. The default encoding is taken from the
+ * ""file.encoding"" system property. {@code InputStreamReader} contains a buffer
+ * of bytes read from the source stream and converts these into characters as
+ * needed. The buffer size is 8K.
+ *
+ * @see OutputStreamWriter
+ */
+public class CharInputStreamReader extends Reader {
+    private InputStream in;
+
+    private static final int BUFFER_SIZE = 8192;
+
+    private boolean endOfInput = false;
+
+    String encoding;
+
+    CharsetDecoder decoder;
+
+    ByteBuffer bytes = ByteBuffer.allocate(BUFFER_SIZE);
+
+    /**
+     * Constructs a new {@code InputStreamReader} on the {@link InputStream}
+     * {@code in}. This constructor sets the character converter to the encoding
+     * specified in the ""file.encoding"" property and falls back to ISO 8859_1
+     * (ISO-Latin-1) if the property doesn't exist.
+     *
+     * @param in
+     *            the input stream from which to read characters.
+     */
+    public CharInputStreamReader(InputStream in) {
+        super(in);
+        this.in = in;
+        encoding = System.getProperty(""file.encoding"", ""ISO8859_1""); //$NON-NLS-1$//$NON-NLS-2$
+        decoder = Charset.forName(encoding).newDecoder().onMalformedInput(
+                CodingErrorAction.REPLACE).onUnmappableCharacter(
+                CodingErrorAction.REPLACE);
+        bytes.limit(0);
+    }
+
+    /**
+     * Constructs a new InputStreamReader on the InputStream {@code in}. The
+     * character converter that is used to decode bytes into characters is
+     * identified by name by {@code enc}. If the encoding cannot be found, an
+     * UnsupportedEncodingException error is thrown.
+     *
+     * @param in
+     *            the InputStream from which to read characters.
+     * @param enc
+     *            identifies the character converter to use.
+     * @throws NullPointerException
+     *             if {@code enc} is {@code null}.
+     * @throws UnsupportedEncodingException
+     *             if the encoding specified by {@code enc} cannot be found.
+     */
+    public CharInputStreamReader(InputStream in, final String enc)
+            throws UnsupportedEncodingException {
+        super(in);
+        if (enc == null) {
+            throw new NullPointerException();
+        }
+        this.in = in;
+        try {
+            decoder = Charset.forName(enc).newDecoder().onMalformedInput(
+                    CodingErrorAction.REPLACE).onUnmappableCharacter(
+                    CodingErrorAction.REPLACE);
+        } catch (IllegalArgumentException e) {
+            throw (UnsupportedEncodingException)
+                    new UnsupportedEncodingException(enc).initCause(e);
+        }
+        bytes.limit(0);
+    }
+
+    /**
+     * Constructs a new InputStreamReader on the InputStream {@code in} and
+     * CharsetDecoder {@code dec}.
+     *
+     * @param in
+     *            the source InputStream from which to read characters.
+     * @param dec
+     *            the CharsetDecoder used by the character conversion.
+     */
+    public CharInputStreamReader(InputStream in, CharsetDecoder dec) {
+        super(in);
+        dec.averageCharsPerByte();
+        this.in = in;
+        decoder = dec;
+        bytes.limit(0);
+    }
+
+    /**
+     * Constructs a new InputStreamReader on the InputStream {@code in} and
+     * Charset {@code charset}.
+     *
+     * @param in
+     *            the source InputStream from which to read characters.
+     * @param charset
+     *            the Charset that defines the character converter
+     */
+    public CharInputStreamReader(InputStream in, Charset charset) {
+        super(in);
+        this.in = in;
+        decoder = charset.newDecoder().onMalformedInput(
+                CodingErrorAction.REPLACE).onUnmappableCharacter(
+                CodingErrorAction.REPLACE);
+        bytes.limit(0);
+    }
+
+    /**
+     * Closes this reader. This implementation closes the source InputStream and
+     * releases all local storage.
+     *
+     * @throws IOException
+     *             if an error occurs attempting to close this reader.
+     */
+    @Override
+    public void close() throws IOException {
+        synchronized (lock) {
+            decoder = null;
+            if (in != null) {
+                in.close();
+                in = null;
+            }
+        }
+    }
+
+    /**
+     * Returns the name of the encoding used to convert bytes into characters.
+     * The value {@code null} is returned if this reader has been closed.
+     *
+     * @return the name of the character converter or {@code null} if this
+     *         reader is closed.
+     */
+    public String getEncoding() {
+        if (!isOpen()) {
+            return null;
+        }
+        return encoding;
+    }
+
+    /**
+     * Reads a single character from this reader and returns it as an integer
+     * with the two higher-order bytes set to 0. Returns -1 if the end of the
+     * reader has been reached. The byte value is either obtained from
+     * converting bytes in this reader's buffer or by first filling the buffer
+     * from the source InputStream and then reading from the buffer.
+     *
+     * @return the character read or -1 if the end of the reader has been
+     *         reached.
+     * @throws IOException
+     *             if this reader is closed or some other I/O error occurs.
+     */
+    @Override
+    public int read() throws IOException {
+        synchronized (lock) {
+            if (!isOpen()) {
+                throw new IOException(""InputStreamReader is closed."");
+            }
+
+            char buf[] = new char[1];
+            return read(buf, 0, 1) != -1 ? buf[0] : -1;
+        }
+    }
+
+    /**
+     * Reads at most {@code length} characters from this reader and stores them
+     * at position {@code offset} in the character array {@code buf}. Returns
+     * the number of characters actually read or -1 if the end of the reader has
+     * been reached. The bytes are either obtained from converting bytes in this
+     * reader's buffer or by first filling the buffer from the source
+     * InputStream and then reading from the buffer.
+     *
+     * @param buf
+     *            the array to store the characters read.
+     * @param offset
+     *            the initial position in {@code buf} to store the characters
+     *            read from this reader.
+     * @param length
+     *            the maximum number of characters to read.
+     * @return the number of characters read or -1 if the end of the reader has
+     *         been reached.
+     * @throws IndexOutOfBoundsException
+     *             if {@code offset < 0} or {@code length < 0}, or if
+     *             {@code offset + length} is greater than the length of
+     *             {@code buf}.
+     * @throws IOException
+     *             if this reader is closed or some other I/O error occurs.
+     */
+    @Override
+    public int read(char[] buf, int offset, int length) throws IOException {
+        synchronized (lock) {
+            if (!isOpen()) {
+                throw new IOException(""InputStreamReader is closed."");
+            }
+            if (offset < 0 || offset > buf.length - length || length < 0) {
+                throw new IndexOutOfBoundsException();
+            }
+            if (length == 0) {
+                return 0;
+            }
+
+            CharBuffer out = CharBuffer.wrap(buf, offset, length);
+            CoderResult result = CoderResult.UNDERFLOW;
+
+            // bytes.remaining() indicates number of bytes in buffer
+            // when 1-st time entered, it'll be equal to zero
+            boolean needInput = !bytes.hasRemaining();
+
+            while (out.hasRemaining()) {
+                // fill the buffer if needed
+                if (needInput) {
+                    try {
+                        if ((in.available() == 0)
+                            && (out.position() > offset)) {
+                            // we could return the result without blocking read
+                            break;
+                        }
+                    } catch (IOException e) {
+                        // available didn't work so just try the read
+                    }
+
+                    int to_read = bytes.capacity() - bytes.limit();
+                    int off = bytes.arrayOffset() + bytes.limit();
+                    int was_red = in.read(bytes.array(), off, to_read);
+
+                    if (was_red == -1) {
+                        endOfInput = true;
+                        break;
+                    } else if (was_red == 0) {
+                        break;
+                    }
+                    bytes.limit(bytes.limit() + was_red);
+                    needInput = false;
+                }
+
+                // decode bytes
+                result = decoder.decode(bytes, out, false);
+
+                if (result.isUnderflow()) {
+                    // compact the buffer if no space left
+                    if (bytes.limit() == bytes.capacity()) {
+                        bytes.compact();
+                        bytes.limit(bytes.position());
+                        bytes.position(0);
+                    }
+                    needInput = true;
+                } else {
+                    break;
+                }
+            }
+
+            if (result == CoderResult.UNDERFLOW && endOfInput) {
+                result = decoder.decode(bytes, out, true);
+                decoder.flush(out);
+                decoder.reset();
+            }
+            if (result.isMalformed()) {
+                throw new MalformedInputException(result.length());
+            } else if (result.isUnmappable()) {
+                throw new UnmappableCharacterException(result.length());
+            }
+
+            return out.position() - offset == 0 ? -1 : out.position() - offset;
+        }
+    }
+
+    /*
+     * Answer a boolean indicating whether or not this InputStreamReader is
+     * open.
+     */
+    private boolean isOpen() {
+        return in != null;
+    }
+
+    /**
+     * Indicates whether this reader is ready to be read without blocking. If
+     * the result is {@code true}, the next {@code read()} will not block. If
+     * the result is {@code false} then this reader may or may not block when
+     * {@code read()} is called. This implementation returns {@code true} if
+     * there are bytes available in the buffer or the source stream has bytes
+     * available.
+     *
+     * @return {@code true} if the receiver will not block when {@code read()}
+     *         is called, {@code false} if unknown or blocking will occur.
+     * @throws IOException
+     *             if this reader is closed or some other I/O error occurs.
+     */
+    @Override
+    public boolean ready() throws IOException {
+        synchronized (lock) {
+            if (in == null) {
+                throw new IOException(""InputStreamReader is closed."");
+            }
+            try {
+                return bytes.hasRemaining() || in.available() > 0;
+            } catch (IOException e) {
+                return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java b/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java
index 33b399201..f964e93ed 100644
--- a/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java
+++ b/src/main/java/org/jboss/jreadline/terminal/POSIXTerminal.java
@@ -17,6 +17,8 @@
 package org.jboss.jreadline.terminal;
 
 
+import org.jboss.jreadline.console.reader.CharInputStreamReader;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,39 +31,18 @@
  */
 public class POSIXTerminal implements Terminal {
 
-    public static final short ARROW_START = 27;
-    public static final short ARROW_PREFIX = 91;
-    public static final short ARROW_LEFT = 68;
-    public static final short ARROW_RIGHT = 67;
-    public static final short ARROW_UP = 65;
-    public static final short ARROW_DOWN = 66;
-    public static final short O_PREFIX = 79;
-    public static final short HOME_CODE = 72;
-    public static final short END_CODE = 70;
-
-    public static final short DEL_THIRD = 51;
-    public static final short DEL_SECOND = 126;
-
-    private final static char DELETE = 127;
-    private final static char BACKSPACE = '\b';
-
     private int height = -1;
     private int width = -1;
     private boolean echoEnabled;
     private String ttyConfig;
     private String ttyProps;
     private long ttyPropsLastFetched;
-    private boolean backspaceDeleteSwitched = false;
     private boolean hasBeenReseted = false;
-    private static String sttyCommand = System.getProperty(""jline.sttyCommand"", ""stty"");
-
 
-    String encoding = System.getProperty(""input.encoding"", ""UTF-8"");
-    //ReplayPrefixOneCharInputStream replayStream = new ReplayPrefixOneCharInputStream(encoding);
-    //InputStreamReader replayReader;
+    private CharInputStreamReader reader;
 
     @Override
-    public void init() {
+    public void init(InputStream inputStream) {
         // save the initial tty configuration
         try {
             ttyConfig = stty(""-g"");
@@ -82,10 +63,14 @@ public void init() {
             // disable character echoing
             stty(""-echo"");
             echoEnabled = false;
+
+            //setting up reader
+            reader = new CharInputStreamReader(inputStream);
         }
         catch (IOException ioe) {
             System.err.println(""TTY failed with: "" + ioe.getMessage());
-        } catch (InterruptedException e) {
+        }
+        catch (InterruptedException e) {
             e.printStackTrace();
         }
 
@@ -94,44 +79,18 @@ public void init() {
             public void start() {
                 try {
                     reset();
-                } catch (Exception e) {
+                }
+                catch (Exception e) {
                     e.printStackTrace();
-                    //ignored
                 }
             }
         });
 
     }
 
-    public int read(InputStream in) throws IOException {
-        int c = 0;
-
-        c = in.read();
-
-        /*
-        if (isBackspaceDeleteSwitched()) {
-            //TODO: this is just a temp fix since it will still fail for
-            // c-l, c-space
-
-                if (c == DELETE)
-                    c = BACKSPACE;
-                else if (c == BACKSPACE)
-                    c = DELETE;
-
-        }
-        */
-
-        // handle unicode characters, thanks for a patch from amyi@inf.ed.ac.uk
-        if (c > 128) {
-            // handle unicode characters longer than 2 bytes,
-            // thanks to Marc.Herbert@continuent.com
-            //replayStream.setInput(c, in);
-//            replayReader = new InputStreamReader(replayStream, encoding);
-            //c = replayReader.read();
-
-        }
-
-        return c;
+    @Override
+    public int read() throws IOException {
+        return reader.read();
     }
 
     @Override
@@ -195,7 +154,8 @@ private int getTerminalProperty(String prop) throws IOException, InterruptedExce
                 int index = str.lastIndexOf("" "");
 
                 return Integer.parseInt(str.substring(index).trim());
-            } else if (str.endsWith(prop)) {
+            }
+            else if (str.endsWith(prop)) {
                 int index = str.indexOf("" "");
 
                 return Integer.parseInt(str.substring(0, index).trim());
diff --git a/src/main/java/org/jboss/jreadline/terminal/Terminal.java b/src/main/java/org/jboss/jreadline/terminal/Terminal.java
index b6d86a429..05372acff 100644
--- a/src/main/java/org/jboss/jreadline/terminal/Terminal.java
+++ b/src/main/java/org/jboss/jreadline/terminal/Terminal.java
@@ -24,9 +24,9 @@
  */
 public interface Terminal {
 
-    void init();
+    void init(InputStream inputStream);
 
-    int read(InputStream is) throws IOException;
+    int read() throws IOException;
 
     int getHeight();"
509945a1f658f711c334c978037f07c7c3d250a7,eclipse-color-theme$eclipse-color-theme,"More flexibility to parsing functions to be used from external
",p,https://github.com/eclipse-color-theme/eclipse-color-theme,"diff --git a/com.github.eclipsecolortheme/src/com/github/eclipsecolortheme/mapper/GenericMapper.java b/com.github.eclipsecolortheme/src/com/github/eclipsecolortheme/mapper/GenericMapper.java
index 81733652..7d91fff9 100644
--- a/com.github.eclipsecolortheme/src/com/github/eclipsecolortheme/mapper/GenericMapper.java
+++ b/com.github.eclipsecolortheme/src/com/github/eclipsecolortheme/mapper/GenericMapper.java
@@ -37,12 +37,35 @@ public void parseMapping(InputStream input)
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = factory.newDocumentBuilder();
         Document document = builder.parse(input);
-        Element root = document.getDocumentElement();
-        parseMappings(root);
-        parseSemanticHighlightingMappings(root);
+        parseMapping(document.getDocumentElement());
     }
 
-    private void parseMappings(Element root) {
+    /**
+     * Parse mapping from input file.
+     * @param root Root element for parsing
+     * @throws SAXException
+     * @throws IOException
+     * @throws ParserConfigurationException
+     */
+    public void parseMapping(Element root)
+            throws SAXException, IOException, ParserConfigurationException {
+        parseMapping(root, mappings);
+    }
+
+    /**
+     * Parse mapping from input file.
+     * @param root Root element for parsing
+     * @throws SAXException
+     * @throws IOException
+     * @throws ParserConfigurationException
+     */
+    public void parseMapping(Element root, Map<String, ColorThemeMapping> map)
+            throws SAXException, IOException, ParserConfigurationException {
+        parseMappings(root, map);
+        parseSemanticHighlightingMappings(root, map);
+    }
+
+    private void parseMappings(Element root, Map<String, ColorThemeMapping> map) {
         Node mappingsNode = root.getElementsByTagName(""mappings"").item(0);
         NodeList mappingNodes = mappingsNode.getChildNodes();
         for (int i = 0; i < mappingNodes.getLength(); i++) {
@@ -50,12 +73,12 @@ private void parseMappings(Element root) {
             if (mappingNode.hasAttributes()) {
                 String pluginKey = extractAttribute(mappingNode, ""pluginKey"");
                 String themeKey = extractAttribute(mappingNode, ""themeKey"");
-                mappings.put(pluginKey, createMapping(pluginKey, themeKey));
+                map.put(pluginKey, createMapping(pluginKey, themeKey));
             }
         }
     }
 
-    private void parseSemanticHighlightingMappings(Element root) {
+    private void parseSemanticHighlightingMappings(Element root, Map<String, ColorThemeMapping> map) {
         Node mappingsNode = root.getElementsByTagName(""semanticHighlightingMappings"").item(0);
         if (mappingsNode != null) {
             NodeList mappingNodes = mappingsNode.getChildNodes();
@@ -64,7 +87,7 @@ private void parseSemanticHighlightingMappings(Element root) {
                 if (mappingNode.hasAttributes()) {
                     String pluginKey = extractAttribute(mappingNode, ""pluginKey"");
                     String themeKey = extractAttribute(mappingNode, ""themeKey"");
-                    mappings.put(pluginKey, createSemanticHighlightingMapping(pluginKey, themeKey));
+                    map.put(pluginKey, createSemanticHighlightingMapping(pluginKey, themeKey));
                 }
             }
         }"
6d11a551dcf9bb2ed2bd10530b1fbaf6f6380804,ReactiveX-RxJava,Added create with initial capacity,a,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java b/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java
index 4ea3e6e385..ff7033c0c5 100644
--- a/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java
+++ b/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java
@@ -17,8 +17,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -126,7 +124,7 @@ protected void terminate(Action1<Collection<SubjectObserver<? super T>>> onTermi
          */
         try {
             // had to circumvent type check, we know what the array contains
-            onTerminate.call((Collection)newState.observersList);
+            onTerminate.call((Collection)Arrays.asList(newState.observers));
         } finally {
             // mark that termination is completed
             newState.terminationLatch.countDown();
@@ -141,25 +139,22 @@ public SubjectObserver<Object>[] rawSnapshot() {
         return state.get().observers;
     }
 
+    @SuppressWarnings(""rawtypes"")
     protected static class State<T> {
         final boolean terminated;
         final CountDownLatch terminationLatch;
         final Subscription[] subscriptions;
-        final SubjectObserver<Object>[] observers;
+        final SubjectObserver[] observers;
         // to avoid lots of empty arrays
         final Subscription[] EMPTY_S = new Subscription[0];
-        @SuppressWarnings(""rawtypes"")
         // to avoid lots of empty arrays
         final SubjectObserver[] EMPTY_O = new SubjectObserver[0];
-        @SuppressWarnings(""rawtypes"")
-        final List<SubjectObserver<Object>> observersList;
         private State(boolean isTerminated, CountDownLatch terminationLatch, 
                 Subscription[] subscriptions, SubjectObserver[] observers) {
             this.terminationLatch = terminationLatch;
             this.terminated = isTerminated;
             this.subscriptions = subscriptions;
             this.observers = observers;
-            this.observersList = Arrays.asList(this.observers);
         }
 
         State() {
@@ -167,7 +162,6 @@ private State(boolean isTerminated, CountDownLatch terminationLatch,
             this.terminationLatch = null;
             this.subscriptions = EMPTY_S;
             this.observers = EMPTY_O;
-            observersList = Collections.emptyList();
         }
 
         public State<T> terminate() {"
e17f046915cce47bd95b4b8f4b197c8fb3d76481,intellij-community,bad linking of Xerces messages--,c,https://github.com/JetBrains/intellij-community,"diff --git a/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java b/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java
index 3355556caa120..d895468c85372 100644
--- a/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java
+++ b/xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java
@@ -83,8 +83,14 @@ public void setErrorReporter(ErrorReporter errorReporter) {
     myErrorReporter = errorReporter;
   }
 
-  private VirtualFile getFile(String publicId) {
-    if (publicId == null) return myFile.getVirtualFile();
+  public VirtualFile getFile(String publicId, String systemId) {
+    if (publicId == null) {
+      if (systemId != null) {
+        final String path = myXmlResourceResolver.getPathByPublicId(systemId);
+        if (path != null) return VfsUtil.findRelativeFile(path,null);
+      }
+      return myFile.getVirtualFile();
+    }
     final String path = myXmlResourceResolver.getPathByPublicId(publicId);
     if (path != null) return VfsUtil.findRelativeFile(path,null);
     return null;
@@ -132,7 +138,7 @@ public boolean isUniqueProblem(final SAXParseException e) {
 
   private String buildMessageString(SAXParseException ex) {
     String msg = ""("" + ex.getLineNumber() + "":"" + ex.getColumnNumber() + "") "" + ex.getMessage();
-    final VirtualFile file = getFile(ex.getPublicId());
+    final VirtualFile file = getFile(ex.getPublicId(), ex.getSystemId());
 
     if ( file != null && !file.equals(myFile.getVirtualFile())) {
       msg = file.getName() + "":"" + msg;
@@ -257,7 +263,7 @@ public void run() {
                 myErrorsView.addMessage(
                     warning ? MessageCategory.WARNING : MessageCategory.ERROR,
                     new String[]{ex.getLocalizedMessage()},
-                    getFile(ex.getPublicId()),
+                    getFile(ex.getPublicId(), ex.getSystemId()),
                     ex.getLineNumber() - 1 ,
                     ex.getColumnNumber() - 1, null);
               }
diff --git a/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java b/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
index 345ca3e1c2c50..41bcd894c1f01 100644
--- a/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
+++ b/xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
@@ -12,6 +12,7 @@
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
@@ -72,7 +73,7 @@ private static class ValidationInfo {
   private WeakReference<List<ValidationInfo>> myInfos; // last jaxp validation result
 
   private void runJaxpValidation(final XmlElement element, Validator.ValidationHost host) {
-    PsiFile file = element.getContainingFile();
+    final PsiFile file = element.getContainingFile();
 
     if (myFile == file &&
         file != null &&
@@ -116,6 +117,11 @@ public void run() {
                 return;
               }
 
+              final VirtualFile errorFile = myHandler.getFile(e.getPublicId(), e.getSystemId());
+              if (errorFile != file.getVirtualFile() && errorFile != null) {
+                return; // error in attached schema
+              }
+
               if (document.getLineCount() < e.getLineNumber() || e.getLineNumber() <= 0) {
                 return;
               }"
415be84340155fa0eb6086149a7de381a41ef480,drools,Fixing NPE--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@6187 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-core/src/main/java/org/drools/reteoo/NotNode.java b/drools-core/src/main/java/org/drools/reteoo/NotNode.java
index 62544d106f5..55470f365c5 100644
--- a/drools-core/src/main/java/org/drools/reteoo/NotNode.java
+++ b/drools-core/src/main/java/org/drools/reteoo/NotNode.java
@@ -242,10 +242,12 @@ public void retractTuple(final ReteTuple leftTuple,
         }
 
         LinkedList list = leftTuple.getLinkedTuples();
-        for ( LinkedListNode node = list.getFirst(); node != null; node = node.getNext() ) {
-            ReteTuple tuple = (ReteTuple) ((LinkedListObjectWrapper) node).getObject();
-            tuple.retractTuple( context,
-                                workingMemory );
+        if( list != null ) {
+            for ( LinkedListNode node = list.getFirst(); node != null; node = node.getNext() ) {
+                ReteTuple tuple = (ReteTuple) ((LinkedListObjectWrapper) node).getObject();
+                tuple.retractTuple( context,
+                                    workingMemory );
+            }
         }
     }"
3980e032581824d7241748c7ec56a916fdce6261,orientdb,Improved memory usage and optimized general speed--,p,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/OMemoryWatchDog.java b/core/src/main/java/com/orientechnologies/orient/core/OMemoryWatchDog.java
index 4aeb1c5992c..20972ad28ee 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/OMemoryWatchDog.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/OMemoryWatchDog.java
@@ -73,12 +73,14 @@ public OMemoryWatchDog(final float iThreshold) {
 			public void handleNotification(Notification n, Object hb) {
 				if (n.getType().equals(MemoryNotificationInfo.MEMORY_THRESHOLD_EXCEEDED)) {
 					alertTimes++;
-					final long maxMemory = tenuredGenPool.getUsage().getMax();
+					long maxMemory = tenuredGenPool.getUsage().getMax();
 					long usedMemory = tenuredGenPool.getUsage().getUsed();
 					long freeMemory = maxMemory - usedMemory;
 
-					OLogManager.instance().debug(this, ""Low memory %s%% (used %s of %s), calling listeners to free memory in soft way..."",
-							freeMemory * 100 / maxMemory, OFileUtils.getSizeAsString(usedMemory), OFileUtils.getSizeAsString(maxMemory));
+					OLogManager.instance().debug(this,
+							""Free memory is low %s %s%% (used %s of %s), calling listeners to free memory in SOFT way..."",
+							OFileUtils.getSizeAsString(freeMemory), freeMemory * 100 / maxMemory, OFileUtils.getSizeAsString(usedMemory),
+							OFileUtils.getSizeAsString(maxMemory));
 
 					final long timer = OProfiler.getInstance().startChrono();
 
@@ -90,30 +92,44 @@ public void handleNotification(Notification n, Object hb) {
 						}
 					}
 
-					System.gc();
-					try {
-						Thread.sleep(400);
-					} catch (InterruptedException e) {
-					}
+					long threshold;
+					do {
+						// INVOKE GC AND WAIT A BIT
+						System.gc();
+						try {
+							Thread.sleep(400);
+						} catch (InterruptedException e) {
+						}
 
-					freeMemory = Runtime.getRuntime().freeMemory();
-					usedMemory = maxMemory - freeMemory;
-					final long threshold = (long) (maxMemory * (1 - OGlobalConfiguration.MEMORY_OPTIMIZE_THRESHOLD.getValueAsFloat()));
-
-					if (freeMemory < threshold) {
-						OLogManager.instance().info(this,
-								""Low memory %s%% (used %s of %s) while the threshold is %s, calling listeners to free memory in hard way..."",
-								usedMemory * 100 / maxMemory, OFileUtils.getSizeAsString(usedMemory), OFileUtils.getSizeAsString(maxMemory),
-								OFileUtils.getSizeAsString(threshold));
-
-						for (Listener listener : listeners) {
-							try {
-								listener.memoryUsageCritical(TYPE.JVM, usedMemory, maxMemory);
-							} catch (Exception e) {
-								e.printStackTrace();
+						// RECHECK IF MEMORY IS OK NOW
+						maxMemory = tenuredGenPool.getUsage().getMax();
+						usedMemory = tenuredGenPool.getUsage().getUsed();
+						freeMemory = maxMemory - usedMemory;
+
+						threshold = (long) (maxMemory * (1 - OGlobalConfiguration.MEMORY_OPTIMIZE_THRESHOLD.getValueAsFloat()));
+
+						OLogManager.instance().debug(this, ""Free memory now is %s %s%% (used %s of %s) with threshold for HARD clean is %s"",
+								OFileUtils.getSizeAsString(freeMemory), freeMemory * 100 / maxMemory, OFileUtils.getSizeAsString(usedMemory),
+								OFileUtils.getSizeAsString(maxMemory), OFileUtils.getSizeAsString(threshold));
+
+						if (freeMemory < threshold) {
+							OLogManager
+									.instance()
+									.debug(
+											this,
+											""Free memory is low %s %s%% (used %s of %s) while the threshold is %s, calling listeners to free memory in HARD way..."",
+											OFileUtils.getSizeAsString(freeMemory), freeMemory * 100 / maxMemory, OFileUtils.getSizeAsString(usedMemory),
+											OFileUtils.getSizeAsString(maxMemory), OFileUtils.getSizeAsString(threshold));
+
+							for (Listener listener : listeners) {
+								try {
+									listener.memoryUsageCritical(TYPE.JVM, usedMemory, maxMemory);
+								} catch (Exception e) {
+									e.printStackTrace();
+								}
 							}
 						}
-					}
+					} while (freeMemory < threshold);
 
 					OProfiler.getInstance().stopChrono(""OMemoryWatchDog.freeResources"", timer);
 				}
diff --git a/core/src/main/java/com/orientechnologies/orient/core/cache/OAbstractRecordCache.java b/core/src/main/java/com/orientechnologies/orient/core/cache/OAbstractRecordCache.java
index 962c5f75f6d..ec68d81c627 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/cache/OAbstractRecordCache.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/cache/OAbstractRecordCache.java
@@ -156,7 +156,7 @@ public void memoryUsageLow(TYPE iType, final long usedMemory, final long maxMemo
 							// UNACTIVE
 							return;
 
-						final int threshold = (int) (oldSize * 0.5f);
+						final int threshold = (int) (oldSize * 0.9f);
 
 						entries.removeEldestItems(threshold);
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java b/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
index 531880f0f17..4de9330e56f 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
@@ -313,7 +313,7 @@ private static void autoConfig() {
 			// WINDOWS
 
 			// AVOID TO USE MMAP, SINCE COULD BE BUGGY
-			//FILE_MMAP_STRATEGY.setValue(3);
+			FILE_MMAP_STRATEGY.setValue(3);
 		}
 
 		if (System.getProperty(""os.arch"").indexOf(""64"") > -1) {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java
index 0fefb774c0f..be054f60453 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java
@@ -84,7 +84,7 @@ public void memoryUsageLow(final TYPE iType, final long usedMemory, final long m
 
 							map.setMaxUpdatesBeforeSave(maxUpdates);
 
-							optimize();
+							optimize(false);
 						} finally {
 							releaseExclusiveLock();
 						}
@@ -97,14 +97,14 @@ public void memoryUsageCritical(final TYPE iType, final long usedMemory, final l
 					if (map != null) {
 						acquireExclusiveLock();
 						try {
-							// REDUCE SOME PARAMETERS
+							// REDUCE OF 10% LAZY UPDATES
 							int maxUpdates = map.getMaxUpdatesBeforeSave();
 							if (maxUpdates > 10)
-								maxUpdates *= 0.5;
+								maxUpdates *= 0.50;
 
 							map.setMaxUpdatesBeforeSave(maxUpdates);
 
-							optimize();
+							optimize(true);
 						} finally {
 							releaseExclusiveLock();
 						}
@@ -112,13 +112,15 @@ public void memoryUsageCritical(final TYPE iType, final long usedMemory, final l
 				}
 			}
 
-			private void optimize() {
+			private void optimize(final boolean iHardMode) {
 				OLogManager.instance().debug(this, ""Forcing optimization of Index %s (%d items). Found %d entries in memory..."", name,
 						map.size(), map.getInMemoryEntries());
 
+				if (iHardMode)
+					map.freeInMemoryResources();
 				map.optimize(true);
 
-				OLogManager.instance().debug(this, ""Completed! Now %d entries resides in memory"", map.getInMemoryEntries());
+				OLogManager.instance().debug(this, ""Completed! Now %d entries reside in memory"", map.getInMemoryEntries());
 			}
 		};
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OUser.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OUser.java
index 840f4615673..02bca7f54a3 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OUser.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OUser.java
@@ -80,9 +80,10 @@ public void fromStream(final ODocument iSource) {
 
 		roles = new HashSet<ORole>();
 		final Set<ODocument> loadedRoles = iSource.field(""roles"");
-		for (ODocument d : loadedRoles) {
-			roles.add(document.getDatabase().getMetadata().getSecurity().getRole((String) d.field(""name"")));
-		}
+		if (loadedRoles != null)
+			for (ODocument d : loadedRoles) {
+				roles.add(document.getDatabase().getMetadata().getSecurity().getRole((String) d.field(""name"")));
+			}
 	}
 
 	/**
diff --git a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeEntryPersistent.java b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeEntryPersistent.java
index d4beb70cede..53c18eb423f 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeEntryPersistent.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeEntryPersistent.java
@@ -221,7 +221,7 @@ protected int disconnect(final boolean iForceDirty, final int iLevel) {
 
 		// REMOVE ME FROM THE CACHE
 		if (pTree.cache.remove(record.getIdentity()) == null)
-			OLogManager.instance().warn(this, ""Can't find current node into the cache. Is the cache invalid?"");
+			OLogManager.instance().debug(this, ""Can't find current node into the cache. Is the cache invalid?"");
 
 		int totalDisconnected = 1;
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreePersistent.java b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreePersistent.java
index e4c934c8eef..7b1d24da0dc 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreePersistent.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreePersistent.java
@@ -69,8 +69,6 @@ public abstract class OMVRBTreePersistent<K, V> extends OMVRBTree<K, V> implemen
 	protected float																					optimizeEntryPointsFactor;
 	protected volatile List<OMVRBTreeEntryPersistent<K, V>>	entryPoints								= new ArrayList<OMVRBTreeEntryPersistent<K, V>>(
 																																												entryPointsSize);
-	protected List<OMVRBTreeEntryPersistent<K, V>>					newEntryPoints						= new ArrayList<OMVRBTreeEntryPersistent<K, V>>(
-																																												entryPointsSize);
 
 	protected Map<ORID, OMVRBTreeEntryPersistent<K, V>>			cache											= new HashMap<ORID, OMVRBTreeEntryPersistent<K, V>>();
 	private final OMemoryOutputStream												entryRecordBuffer;
@@ -156,6 +154,13 @@ public void unload() {
 		}
 	}
 
+	/**
+	 * Frees all the in memory objects. It's called under hard memory pressure.
+	 */
+	public void freeInMemoryResources() {
+		entryPoints.clear();
+	}
+
 	/**
 	 * Optimize the tree memory consumption by keeping part of nodes as entry points and clearing all the rest.
 	 */
@@ -222,7 +227,7 @@ public void optimize(final boolean iForce) {
 			else
 				distance = nodes / entryPointsSize + 1;
 
-			newEntryPoints.clear();
+			final List<OMVRBTreeEntryPersistent<K, V>> newEntryPoints = new ArrayList<OMVRBTreeEntryPersistent<K, V>>(entryPointsSize + 1);
 
 			OLogManager.instance().debug(this, ""Compacting nodes with distance = %d"", distance);
 
@@ -287,9 +292,7 @@ public void optimize(final boolean iForce) {
 
 			// SWAP TMP AND REAL ENTRY POINT COLLECTIONS
 			entryPoints.clear();
-			final List<OMVRBTreeEntryPersistent<K, V>> a = entryPoints;
 			entryPoints = newEntryPoints;
-			newEntryPoints = a;
 
 			if (debug) {
 				System.out.printf(""\nEntrypoints (%d): "", entryPoints.size());"
f00ea151341c3b7a481ed512e124349990fa8c15,Vala,"libgnomeui-2.0: Update to 2.24.2.
",c,https://github.com/GNOME/vala/,"diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi
index 788397dfbb..ea8c1c5d4d 100644
--- a/vapi/libgnomeui-2.0.vapi
+++ b/vapi/libgnomeui-2.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = ""Gnome"", lower_case_cprefix = ""gnome_"")]
 namespace Gnome {
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public class App : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+	public class App : Gtk.Window, Gtk.Buildable, Atk.Implementor {
 		public weak Gtk.AccelGroup accel_group;
 		public weak Gtk.Widget contents;
 		public weak Gtk.Widget dock;
@@ -51,7 +51,7 @@ namespace Gnome {
 		public string app_id { owned get; set construct; }
 	}
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public class AppBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+	public class AppBar : Gtk.HBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (cname = ""gnome_appbar_new"", type = ""GtkWidget*"", has_construct_function = false)]
 		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = ""gnome_appbar_clear_stack"")]
@@ -163,7 +163,7 @@ namespace Gnome {
 		public virtual signal void shutdown_cancelled ();
 	}
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public class DateEdit : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+	public class DateEdit : Gtk.HBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (type = ""GtkWidget*"", has_construct_function = false)]
 		public DateEdit (ulong the_time, bool show_time, bool use_24_format);
 		public void @construct (ulong the_time, Gnome.DateEditFlags flags);
@@ -192,7 +192,7 @@ namespace Gnome {
 	public class GdkPixbufAsyncHandle {
 	}
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+	public class IconEntry : Gtk.VBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (type = ""GtkWidget*"", has_construct_function = false)]
 		public IconEntry (string history_id, string browse_dialog_title);
 		public void @construct (string history_id, string browse_dialog_title);
@@ -221,7 +221,7 @@ namespace Gnome {
 		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public class IconSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+	public class IconSelection : Gtk.VBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (type = ""GtkWidget*"", has_construct_function = false)]
 		public IconSelection ();
 		public void add_defaults ();
@@ -235,7 +235,7 @@ namespace Gnome {
 		public void stop_loading ();
 	}
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public class PasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+	public class PasswordDialog : Gtk.Dialog, Gtk.Buildable, Atk.Implementor {
 		public weak Gnome.PasswordDialogDetails details;
 		[CCode (type = ""GtkWidget*"", has_construct_function = false)]
 		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
@@ -331,14 +331,14 @@ namespace Gnome {
 		public void* user_data;
 		public weak Gtk.Widget widget;
 	}
-	[CCode (cprefix = ""GNOME_CLIENT_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_CLIENT_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	[Flags]
 	public enum ClientFlags {
 		IS_CONNECTED,
 		RESTARTED,
 		RESTORED
 	}
-	[CCode (cprefix = ""GNOME_CLIENT_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_CLIENT_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum ClientState {
 		IDLE,
 		SAVING_PHASE_1,
@@ -348,7 +348,7 @@ namespace Gnome {
 		DISCONNECTED,
 		REGISTERING
 	}
-	[CCode (cprefix = ""GNOME_DATE_EDIT_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_DATE_EDIT_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	[Flags]
 	public enum DateEditFlags {
 		SHOW_TIME,
@@ -356,32 +356,32 @@ namespace Gnome {
 		WEEK_STARTS_ON_MONDAY,
 		DISPLAY_SECONDS
 	}
-	[CCode (cprefix = ""GNOME_DIALOG_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_DIALOG_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum DialogType {
 		ERROR,
 		NORMAL
 	}
-	[CCode (cprefix = ""GNOME_EDGE_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_EDGE_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum EdgePosition {
 		START,
 		FINISH,
 		OTHER,
 		LAST
 	}
-	[CCode (cprefix = ""GNOME_FONT_PICKER_MODE_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_FONT_PICKER_MODE_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum FontPickerMode {
 		PIXMAP,
 		FONT_INFO,
 		USER_WIDGET,
 		UNKNOWN
 	}
-	[CCode (cprefix = ""GNOME_ICON_LIST_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_ICON_LIST_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum IconListMode {
 		ICONS,
 		TEXT_BELOW,
 		TEXT_RIGHT
 	}
-	[CCode (cprefix = ""GNOME_ICON_LOOKUP_FLAGS_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_ICON_LOOKUP_FLAGS_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	[Flags]
 	public enum IconLookupFlags {
 		NONE,
@@ -389,56 +389,56 @@ namespace Gnome {
 		SHOW_SMALL_IMAGES_AS_THEMSELVES,
 		ALLOW_SVG_AS_THEMSELVES
 	}
-	[CCode (cprefix = ""GNOME_ICON_LOOKUP_RESULT_FLAGS_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_ICON_LOOKUP_RESULT_FLAGS_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	[Flags]
 	public enum IconLookupResultFlags {
 		NONE,
 		THUMBNAIL
 	}
-	[CCode (cprefix = ""GNOME_INTERACT_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_INTERACT_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum InteractStyle {
 		NONE,
 		ERRORS,
 		ANY
 	}
-	[CCode (cprefix = ""GNOME_MDI_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_MDI_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum MDIMode {
 		NOTEBOOK,
 		TOPLEVEL,
 		MODAL,
 		DEFAULT_MODE
 	}
-	[CCode (cprefix = ""GNOME_PASSWORD_DIALOG_REMEMBER_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_PASSWORD_DIALOG_REMEMBER_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum PasswordDialogRemember {
 		NOTHING,
 		SESSION,
 		FOREVER
 	}
-	[CCode (cprefix = ""GNOME_PREFERENCES_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_PREFERENCES_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum PreferencesType {
 		NEVER,
 		USER,
 		ALWAYS
 	}
-	[CCode (cprefix = ""GNOME_RESTART_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_RESTART_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum RestartStyle {
 		IF_RUNNING,
 		ANYWAY,
 		IMMEDIATELY,
 		NEVER
 	}
-	[CCode (cprefix = ""GNOME_SAVE_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_SAVE_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum SaveStyle {
 		GLOBAL,
 		LOCAL,
 		BOTH
 	}
-	[CCode (cprefix = ""GNOME_THUMBNAIL_SIZE_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_THUMBNAIL_SIZE_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum ThumbnailSize {
 		NORMAL,
 		LARGE
 	}
-	[CCode (cprefix = ""GNOME_APP_CONFIGURABLE_ITEM_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_APP_CONFIGURABLE_ITEM_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum UIInfoConfigurableTypes {
 		NEW,
 		OPEN,
@@ -473,7 +473,7 @@ namespace Gnome {
 		SCORES,
 		END_GAME
 	}
-	[CCode (cprefix = ""GNOME_APP_UI_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_APP_UI_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum UIInfoType {
 		ENDOFINFO,
 		ITEM,
@@ -487,7 +487,7 @@ namespace Gnome {
 		SUBTREE_STOCK,
 		INCLUDE
 	}
-	[CCode (cprefix = ""GNOME_APP_PIXMAP_"", has_type_id = ""0"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
+	[CCode (cprefix = ""GNOME_APP_PIXMAP_"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public enum UIPixmapType {
 		NONE,
 		STOCK,
@@ -508,8 +508,6 @@ namespace Gnome {
 	public delegate void StringCallback (string str);
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"", has_target = false)]
 	public delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
-	[CCode (cname = ""LIBGNOMEUI_MODULE"", cheader_filename = ""libgnomeui/libgnomeui.h"")]
-	public static Gnome.ModuleInfo libgnomeui_module;
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
 	public const string APP_MENUBAR_NAME;
 	[CCode (cheader_filename = ""libgnomeui/libgnomeui.h"")]
diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
index 93d4fdcd3f..34f63ccf5b 100644
--- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
+++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
@@ -232,7 +232,7 @@
 			<field name=""data"" type=""gpointer""/>
 			<field name=""is_interp"" type=""gboolean""/>
 			<field name=""relay_func"" type=""GtkCallbackMarshal""/>
-			<field name=""destroy_func"" type=""GtkDestroyNotify""/>
+			<field name=""destroy_func"" type=""GDestroyNotify""/>
 		</struct>
 		<struct name=""GnomeUIInfo"">
 			<field name=""type"" type=""GnomeUIInfoType""/>
@@ -247,7 +247,7 @@
 			<field name=""ac_mods"" type=""GdkModifierType""/>
 			<field name=""widget"" type=""GtkWidget*""/>
 		</struct>
-		<enum name=""GnomeClientState"">
+		<enum name=""GnomeClientState"" type-name=""GnomeClientState"" get-type=""gnome_client_state_get_type"">
 			<member name=""GNOME_CLIENT_IDLE"" value=""0""/>
 			<member name=""GNOME_CLIENT_SAVING_PHASE_1"" value=""1""/>
 			<member name=""GNOME_CLIENT_WAITING_FOR_PHASE_2"" value=""2""/>
@@ -256,64 +256,64 @@
 			<member name=""GNOME_CLIENT_DISCONNECTED"" value=""5""/>
 			<member name=""GNOME_CLIENT_REGISTERING"" value=""6""/>
 		</enum>
-		<enum name=""GnomeDialogType"">
+		<enum name=""GnomeDialogType"" type-name=""GnomeDialogType"" get-type=""gnome_dialog_type_get_type"">
 			<member name=""GNOME_DIALOG_ERROR"" value=""0""/>
 			<member name=""GNOME_DIALOG_NORMAL"" value=""1""/>
 		</enum>
-		<enum name=""GnomeEdgePosition"">
+		<enum name=""GnomeEdgePosition"" type-name=""GnomeEdgePosition"" get-type=""gnome_edge_position_get_type"">
 			<member name=""GNOME_EDGE_START"" value=""0""/>
 			<member name=""GNOME_EDGE_FINISH"" value=""1""/>
 			<member name=""GNOME_EDGE_OTHER"" value=""2""/>
 			<member name=""GNOME_EDGE_LAST"" value=""3""/>
 		</enum>
-		<enum name=""GnomeFontPickerMode"">
+		<enum name=""GnomeFontPickerMode"" type-name=""GnomeFontPickerMode"" get-type=""gnome_font_picker_mode_get_type"">
 			<member name=""GNOME_FONT_PICKER_MODE_PIXMAP"" value=""0""/>
 			<member name=""GNOME_FONT_PICKER_MODE_FONT_INFO"" value=""1""/>
 			<member name=""GNOME_FONT_PICKER_MODE_USER_WIDGET"" value=""2""/>
 			<member name=""GNOME_FONT_PICKER_MODE_UNKNOWN"" value=""3""/>
 		</enum>
-		<enum name=""GnomeIconListMode"">
+		<enum name=""GnomeIconListMode"" type-name=""GnomeIconListMode"" get-type=""gnome_icon_list_mode_get_type"">
 			<member name=""GNOME_ICON_LIST_ICONS"" value=""0""/>
 			<member name=""GNOME_ICON_LIST_TEXT_BELOW"" value=""1""/>
 			<member name=""GNOME_ICON_LIST_TEXT_RIGHT"" value=""2""/>
 		</enum>
-		<enum name=""GnomeInteractStyle"">
+		<enum name=""GnomeInteractStyle"" type-name=""GnomeInteractStyle"" get-type=""gnome_interact_style_get_type"">
 			<member name=""GNOME_INTERACT_NONE"" value=""0""/>
 			<member name=""GNOME_INTERACT_ERRORS"" value=""1""/>
 			<member name=""GNOME_INTERACT_ANY"" value=""2""/>
 		</enum>
-		<enum name=""GnomeMDIMode"">
+		<enum name=""GnomeMDIMode"" type-name=""GnomeMDIMode"" get-type=""gnome_mdi_mode_get_type"">
 			<member name=""GNOME_MDI_NOTEBOOK"" value=""0""/>
 			<member name=""GNOME_MDI_TOPLEVEL"" value=""1""/>
 			<member name=""GNOME_MDI_MODAL"" value=""2""/>
 			<member name=""GNOME_MDI_DEFAULT_MODE"" value=""42""/>
 		</enum>
-		<enum name=""GnomePasswordDialogRemember"">
+		<enum name=""GnomePasswordDialogRemember"" type-name=""GnomePasswordDialogRemember"" get-type=""gnome_password_dialog_remember_get_type"">
 			<member name=""GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING"" value=""0""/>
 			<member name=""GNOME_PASSWORD_DIALOG_REMEMBER_SESSION"" value=""1""/>
 			<member name=""GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER"" value=""2""/>
 		</enum>
-		<enum name=""GnomePreferencesType"">
+		<enum name=""GnomePreferencesType"" type-name=""GnomePreferencesType"" get-type=""gnome_preferences_type_get_type"">
 			<member name=""GNOME_PREFERENCES_NEVER"" value=""0""/>
 			<member name=""GNOME_PREFERENCES_USER"" value=""1""/>
 			<member name=""GNOME_PREFERENCES_ALWAYS"" value=""2""/>
 		</enum>
-		<enum name=""GnomeRestartStyle"">
+		<enum name=""GnomeRestartStyle"" type-name=""GnomeRestartStyle"" get-type=""gnome_restart_style_get_type"">
 			<member name=""GNOME_RESTART_IF_RUNNING"" value=""0""/>
 			<member name=""GNOME_RESTART_ANYWAY"" value=""1""/>
 			<member name=""GNOME_RESTART_IMMEDIATELY"" value=""2""/>
 			<member name=""GNOME_RESTART_NEVER"" value=""3""/>
 		</enum>
-		<enum name=""GnomeSaveStyle"">
+		<enum name=""GnomeSaveStyle"" type-name=""GnomeSaveStyle"" get-type=""gnome_save_style_get_type"">
 			<member name=""GNOME_SAVE_GLOBAL"" value=""0""/>
 			<member name=""GNOME_SAVE_LOCAL"" value=""1""/>
 			<member name=""GNOME_SAVE_BOTH"" value=""2""/>
 		</enum>
-		<enum name=""GnomeThumbnailSize"">
+		<enum name=""GnomeThumbnailSize"" type-name=""GnomeThumbnailSize"" get-type=""gnome_thumbnail_size_get_type"">
 			<member name=""GNOME_THUMBNAIL_SIZE_NORMAL"" value=""0""/>
 			<member name=""GNOME_THUMBNAIL_SIZE_LARGE"" value=""1""/>
 		</enum>
-		<enum name=""GnomeUIInfoConfigurableTypes"">
+		<enum name=""GnomeUIInfoConfigurableTypes"" type-name=""GnomeUIInfoConfigurableTypes"" get-type=""gnome_ui_info_configurable_types_get_type"">
 			<member name=""GNOME_APP_CONFIGURABLE_ITEM_NEW"" value=""0""/>
 			<member name=""GNOME_APP_CONFIGURABLE_ITEM_OPEN"" value=""1""/>
 			<member name=""GNOME_APP_CONFIGURABLE_ITEM_SAVE"" value=""2""/>
@@ -347,7 +347,7 @@
 			<member name=""GNOME_APP_CONFIGURABLE_ITEM_SCORES"" value=""30""/>
 			<member name=""GNOME_APP_CONFIGURABLE_ITEM_END_GAME"" value=""31""/>
 		</enum>
-		<enum name=""GnomeUIInfoType"">
+		<enum name=""GnomeUIInfoType"" type-name=""GnomeUIInfoType"" get-type=""gnome_ui_info_type_get_type"">
 			<member name=""GNOME_APP_UI_ENDOFINFO"" value=""0""/>
 			<member name=""GNOME_APP_UI_ITEM"" value=""1""/>
 			<member name=""GNOME_APP_UI_TOGGLEITEM"" value=""2""/>
@@ -360,37 +360,37 @@
 			<member name=""GNOME_APP_UI_SUBTREE_STOCK"" value=""9""/>
 			<member name=""GNOME_APP_UI_INCLUDE"" value=""10""/>
 		</enum>
-		<enum name=""GnomeUIPixmapType"">
+		<enum name=""GnomeUIPixmapType"" type-name=""GnomeUIPixmapType"" get-type=""gnome_ui_pixmap_type_get_type"">
 			<member name=""GNOME_APP_PIXMAP_NONE"" value=""0""/>
 			<member name=""GNOME_APP_PIXMAP_STOCK"" value=""1""/>
 			<member name=""GNOME_APP_PIXMAP_DATA"" value=""2""/>
 			<member name=""GNOME_APP_PIXMAP_FILENAME"" value=""3""/>
 		</enum>
-		<flags name=""GnomeClientFlags"">
+		<flags name=""GnomeClientFlags"" type-name=""GnomeClientFlags"" get-type=""gnome_client_flags_get_type"">
 			<member name=""GNOME_CLIENT_IS_CONNECTED"" value=""1""/>
 			<member name=""GNOME_CLIENT_RESTARTED"" value=""2""/>
 			<member name=""GNOME_CLIENT_RESTORED"" value=""4""/>
 		</flags>
-		<flags name=""GnomeDateEditFlags"">
+		<flags name=""GnomeDateEditFlags"" type-name=""GnomeDateEditFlags"" get-type=""gnome_date_edit_flags_get_type"">
 			<member name=""GNOME_DATE_EDIT_SHOW_TIME"" value=""1""/>
 			<member name=""GNOME_DATE_EDIT_24_HR"" value=""2""/>
 			<member name=""GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY"" value=""4""/>
 			<member name=""GNOME_DATE_EDIT_DISPLAY_SECONDS"" value=""8""/>
 		</flags>
-		<flags name=""GnomeIconLookupFlags"">
+		<flags name=""GnomeIconLookupFlags"" type-name=""GnomeIconLookupFlags"" get-type=""gnome_icon_lookup_flags_get_type"">
 			<member name=""GNOME_ICON_LOOKUP_FLAGS_NONE"" value=""0""/>
 			<member name=""GNOME_ICON_LOOKUP_FLAGS_EMBEDDING_TEXT"" value=""1""/>
 			<member name=""GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES"" value=""2""/>
 			<member name=""GNOME_ICON_LOOKUP_FLAGS_ALLOW_SVG_AS_THEMSELVES"" value=""4""/>
 		</flags>
-		<flags name=""GnomeIconLookupResultFlags"">
+		<flags name=""GnomeIconLookupResultFlags"" type-name=""GnomeIconLookupResultFlags"" get-type=""gnome_icon_lookup_result_flags_get_type"">
 			<member name=""GNOME_ICON_LOOKUP_RESULT_FLAGS_NONE"" value=""0""/>
 			<member name=""GNOME_ICON_LOOKUP_RESULT_FLAGS_THUMBNAIL"" value=""1""/>
 		</flags>
 		<object name=""GnomeApp"" parent=""GtkWindow"" type-name=""GnomeApp"" get-type=""gnome_app_get_type"">
 			<implements>
-				<interface name=""AtkImplementor""/>
 				<interface name=""GtkBuildable""/>
+				<interface name=""AtkImplementor""/>
 			</implements>
 			<method name=""add_dock_item"" symbol=""gnome_app_add_dock_item"">
 				<return-type type=""void""/>
@@ -459,7 +459,7 @@
 					<parameter name=""uiinfo"" type=""GnomeUIInfo*""/>
 					<parameter name=""relay_func"" type=""GtkCallbackMarshal""/>
 					<parameter name=""data"" type=""gpointer""/>
-					<parameter name=""destroy_func"" type=""GtkDestroyNotify""/>
+					<parameter name=""destroy_func"" type=""GDestroyNotify""/>
 				</parameters>
 			</method>
 			<method name=""create_menus_with_data"" symbol=""gnome_app_create_menus_with_data"">
@@ -492,7 +492,7 @@
 					<parameter name=""uiinfo"" type=""GnomeUIInfo*""/>
 					<parameter name=""relay_func"" type=""GtkCallbackMarshal""/>
 					<parameter name=""data"" type=""gpointer""/>
-					<parameter name=""destroy_func"" type=""GtkDestroyNotify""/>
+					<parameter name=""destroy_func"" type=""GDestroyNotify""/>
 				</parameters>
 			</method>
 			<method name=""create_toolbar_with_data"" symbol=""gnome_app_create_toolbar_with_data"">
@@ -620,7 +620,7 @@
 					<parameter name=""menuinfo"" type=""GnomeUIInfo*""/>
 					<parameter name=""relay_func"" type=""GtkCallbackMarshal""/>
 					<parameter name=""data"" type=""gpointer""/>
-					<parameter name=""destroy_func"" type=""GtkDestroyNotify""/>
+					<parameter name=""destroy_func"" type=""GDestroyNotify""/>
 				</parameters>
 			</method>
 			<method name=""insert_menus_with_data"" symbol=""gnome_app_insert_menus_with_data"">
@@ -740,8 +740,9 @@
 		</object>
 		<object name=""GnomeAppBar"" parent=""GtkHBox"" type-name=""GnomeAppBar"" get-type=""gnome_appbar_get_type"">
 			<implements>
-				<interface name=""AtkImplementor""/>
 				<interface name=""GtkBuildable""/>
+				<interface name=""GtkOrientable""/>
+				<interface name=""AtkImplementor""/>
 			</implements>
 			<method name=""clear_prompt"" symbol=""gnome_appbar_clear_prompt"">
 				<return-type type=""void""/>
@@ -931,7 +932,7 @@
 					<parameter name=""dialog_type"" type=""GnomeDialogType""/>
 					<parameter name=""function"" type=""GtkCallbackMarshal""/>
 					<parameter name=""data"" type=""gpointer""/>
-					<parameter name=""destroy"" type=""GtkDestroyNotify""/>
+					<parameter name=""destroy"" type=""GDestroyNotify""/>
 				</parameters>
 			</method>
 			<method name=""request_phase_2"" symbol=""gnome_client_request_phase_2"">
@@ -1142,8 +1143,9 @@
 		</object>
 		<object name=""GnomeDateEdit"" parent=""GtkHBox"" type-name=""GnomeDateEdit"" get-type=""gnome_date_edit_get_type"">
 			<implements>
-				<interface name=""AtkImplementor""/>
 				<interface name=""GtkBuildable""/>
+				<interface name=""GtkOrientable""/>
+				<interface name=""AtkImplementor""/>
 			</implements>
 			<method name=""construct"" symbol=""gnome_date_edit_construct"">
 				<return-type type=""void""/>
@@ -1228,8 +1230,9 @@
 		</object>
 		<object name=""GnomeIconEntry"" parent=""GtkVBox"" type-name=""GnomeIconEntry"" get-type=""gnome_icon_entry_get_type"">
 			<implements>
-				<interface name=""AtkImplementor""/>
 				<interface name=""GtkBuildable""/>
+				<interface name=""GtkOrientable""/>
+				<interface name=""AtkImplementor""/>
 			</implements>
 			<method name=""construct"" symbol=""gnome_icon_entry_construct"">
 				<return-type type=""void""/>
@@ -1338,8 +1341,9 @@
 		</object>
 		<object name=""GnomeIconSelection"" parent=""GtkVBox"" type-name=""GnomeIconSelection"" get-type=""gnome_icon_selection_get_type"">
 			<implements>
-				<interface name=""AtkImplementor""/>
 				<interface name=""GtkBuildable""/>
+				<interface name=""GtkOrientable""/>
+				<interface name=""AtkImplementor""/>
 			</implements>
 			<method name=""add_defaults"" symbol=""gnome_icon_selection_add_defaults"">
 				<return-type type=""void""/>
@@ -1405,8 +1409,8 @@
 		</object>
 		<object name=""GnomePasswordDialog"" parent=""GtkDialog"" type-name=""GnomePasswordDialog"" get-type=""gnome_password_dialog_get_type"">
 			<implements>
-				<interface name=""AtkImplementor""/>
 				<interface name=""GtkBuildable""/>
+				<interface name=""AtkImplementor""/>
 			</implements>
 			<method name=""anon_selected"" symbol=""gnome_password_dialog_anon_selected"">
 				<return-type type=""gboolean""/>
diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata
index 13fd25c315..61429c1056 100644
--- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata
+++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata
@@ -29,4 +29,3 @@ GnomeMDI::add_child has_emitter=""1""
 GnomeMDI::add_view has_emitter=""1""
 GnomeMDI::remove_child has_emitter=""1""
 GnomeMDI::remove_view has_emitter=""1""
-GtkDestroyNotify namespace=""GLib"" name=""DestroyNotify"""
011627c0f38cfbc5b88858f8641aefc55b5df58a,arrayexpress$annotare2,"Added some flexibility with scan protocol assignment; will assign to raw files, or (if none uploaded) to processed files
",p,https://github.com/arrayexpress/annotare2,"diff --git a/app/om/src/main/java/uk/ac/ebi/fg/annotare2/submission/model/ProtocolSubjectType.java b/app/om/src/main/java/uk/ac/ebi/fg/annotare2/submission/model/ProtocolSubjectType.java
index 3dc01c127..ebca1b96e 100644
--- a/app/om/src/main/java/uk/ac/ebi/fg/annotare2/submission/model/ProtocolSubjectType.java
+++ b/app/om/src/main/java/uk/ac/ebi/fg/annotare2/submission/model/ProtocolSubjectType.java
@@ -28,6 +28,7 @@ public enum ProtocolSubjectType {
     EXTRACT(""extract""),
     LABELED_EXTRACT(""labeled extract""),
     ASSAY(""assay""),
+    FILE(""raw file""),
     RAW_FILE(""raw file""),
     PROCESSED_FILE(""processed file"");
 
diff --git a/app/web/src/main/java/uk/ac/ebi/fg/annotare2/web/gwt/common/shared/exepriment/ProtocolAssignment.java b/app/web/src/main/java/uk/ac/ebi/fg/annotare2/web/gwt/common/shared/exepriment/ProtocolAssignment.java
index e526c6108..a5b4d3785 100644
--- a/app/web/src/main/java/uk/ac/ebi/fg/annotare2/web/gwt/common/shared/exepriment/ProtocolAssignment.java
+++ b/app/web/src/main/java/uk/ac/ebi/fg/annotare2/web/gwt/common/shared/exepriment/ProtocolAssignment.java
@@ -111,8 +111,8 @@ protected void update(ExperimentProfile exp, Protocol protocol, Set<String> assi
         }
     }
 
-    public static class FileProtocolAssignment extends ProtocolAssignment {
-        private FileProtocolAssignment(ExperimentProfile exp, Protocol protocol) {
+    public static class BaseFileProtocolAssignment extends ProtocolAssignment {
+        private BaseFileProtocolAssignment(ExperimentProfile exp, Protocol protocol) {
             super(exp, protocol);
         }
 
@@ -120,19 +120,10 @@ private FileProtocolAssignment(ExperimentProfile exp, Protocol protocol) {
         protected ProtocolAssignmentProfile getProfile(ExperimentProfile exp, Protocol protocol) {
             Collection<FileRef> assignees = exp.getFileRefs(protocol);
             Map<Item, Boolean> assignments = new HashMap<Item, Boolean>();
-            FileType type = null;
             for (FileColumn col : exp.getFileColumns()) {
                 if (isAllowed(col.getType())) {
-                    if (null == type) {
-                        type = col.getType();
-                    }
-                    if (col.getType() == type) {
-                        for (FileRef fileRef : col.getFileRefs()) {
-                            assignments.put(new Item(fileRef.asString(),
-                                    fileRef.getName()),
-                                    assignees.contains(fileRef)
-                            );
-                        }
+                    for (FileRef fileRef : col.getFileRefs()) {
+                        assignments.put(new Item(fileRef.asString(), fileRef.getName()), assignees.contains(fileRef));
                     }
                 }
             }
@@ -153,7 +144,18 @@ protected boolean isAllowed(FileType type) {
         }
     }
 
-    public static class ProcessedFileProtocolAssignment extends FileProtocolAssignment {
+    public static class RawFileProtocolAssignment extends BaseFileProtocolAssignment {
+        private RawFileProtocolAssignment(ExperimentProfile exp, Protocol protocol) {
+            super(exp, protocol);
+        }
+
+        @Override
+        protected boolean isAllowed(FileType type) {
+            return type.isRaw();
+        }
+    }
+
+    public static class ProcessedFileProtocolAssignment extends BaseFileProtocolAssignment {
         private ProcessedFileProtocolAssignment(ExperimentProfile exp, Protocol protocol) {
             super(exp, protocol);
         }
@@ -164,6 +166,29 @@ protected boolean isAllowed(FileType type) {
         }
     }
 
+    public static class RawOrProcessedFileProtocolAssignment extends BaseFileProtocolAssignment {
+        private RawOrProcessedFileProtocolAssignment(ExperimentProfile exp, Protocol protocol) {
+            super(exp, protocol);
+        }
+
+        @Override
+        protected ProtocolAssignmentProfile getProfile(ExperimentProfile exp, Protocol protocol) {
+            Collection<FileRef> assignees = exp.getFileRefs(protocol);
+            Map<Item, Boolean> assignments = new HashMap<Item, Boolean>();
+            boolean isRawOnly = false;
+            for (FileColumn col : exp.getFileColumns()) {
+                if (!isRawOnly & col.getType().isRaw()) {
+                    isRawOnly = true;
+                }
+                if (!isRawOnly || col.getType().isRaw()) {
+                    for (FileRef fileRef : col.getFileRefs()) {
+                        assignments.put(new Item(fileRef.asString(), fileRef.getName()), assignees.contains(fileRef));
+                    }
+                }
+            }
+            return new ProtocolAssignmentProfile(protocol, assignments);
+        }
+    }
 
     public static class Item {
         private String id;
@@ -231,8 +256,10 @@ public static ProtocolAssignment createProtocolAssignment(ExperimentProfile exp,
                 return new ExtractProtocolAssignment(exp, protocol);
             case LABELED_EXTRACT:
                 return new LabeledExtractProtocolAssignment(exp, protocol);
+            case FILE:
+                return new RawOrProcessedFileProtocolAssignment(exp, protocol);
             case RAW_FILE:
-                return new FileProtocolAssignment(exp, protocol);
+                return new RawFileProtocolAssignment(exp, protocol);
             case PROCESSED_FILE:
                 return new ProcessedFileProtocolAssignment(exp, protocol);
             default:
diff --git a/app/web/src/main/resources/ProtocolTypes.json b/app/web/src/main/resources/ProtocolTypes.json
index e5860868e..e0a7dcc40 100644
--- a/app/web/src/main/resources/ProtocolTypes.json
+++ b/app/web/src/main/resources/ProtocolTypes.json
@@ -59,7 +59,7 @@
         ""label"": ""array scanning and feature extraction protocol"",
         ""id"": ""EFO_0003814"",
         ""usage"": ""MICRO_ARRAY"",
-        ""subject"": ""RAW_FILE"",
+        ""subject"": ""FILE"",
         ""precedence"": ""30"",
         ""definition"": ""A protocol describing an image acquisition process that generates an image and features extracted in numerical form from an array.""
     },"
00db7d150b22031a0c030d55f1395e0ba41c1c76,kotlin,Fix KT-10472: compare all overloads including- varargs in a single pass.--,c,https://github.com/JetBrains/kotlin,"diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt
index 312f8af24f805..70972eb033aa8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt
@@ -88,17 +88,9 @@ class OverloadingConflictResolver(private val builtIns: KotlinBuiltIns) {
             CandidateCallWithArgumentMapping.create(candidateCall) { it.arguments.filter { it.getArgumentExpression() != null } }
         }
 
-        val (varargCandidates, regularCandidates) = conflictingCandidates.partition { it.resultingDescriptor.hasVarargs }
-        val mostSpecificRegularCandidates = regularCandidates.selectMostSpecificCallsWithArgumentMapping(discriminateGenericDescriptors)
-
-        return when {
-            mostSpecificRegularCandidates.size > 1 ->
-                null
-            mostSpecificRegularCandidates.size == 1 ->
-                mostSpecificRegularCandidates.single()
-            else ->
-                varargCandidates.selectMostSpecificCallsWithArgumentMapping(discriminateGenericDescriptors).singleOrNull()
-        }
+        val mostSpecificCandidates = conflictingCandidates.selectMostSpecificCallsWithArgumentMapping(discriminateGenericDescriptors)
+
+        return mostSpecificCandidates.singleOrNull()
     }
 
     private fun <D : CallableDescriptor, K> Collection<CandidateCallWithArgumentMapping<D, K>>.selectMostSpecificCallsWithArgumentMapping(
@@ -139,7 +131,7 @@ class OverloadingConflictResolver(private val builtIns: KotlinBuiltIns) {
 
     /**
      * Returns `true` if `d1` is definitely not less specific than `d2`,
-     * `false` if `d1` is definitely less specific than `d2` or undecided.
+     * `false` otherwise.
      */
     private fun <D : CallableDescriptor, K> compareCallsWithArgumentMapping(
             call1: CandidateCallWithArgumentMapping<D, K>,
@@ -160,6 +152,11 @@ class OverloadingConflictResolver(private val builtIns: KotlinBuiltIns) {
             return it
         }
 
+        val hasVarargs1 = call1.resultingDescriptor.hasVarargs
+        val hasVarargs2 = call2.resultingDescriptor.hasVarargs
+        if (hasVarargs1 && !hasVarargs2) return false
+        if (!hasVarargs1 && hasVarargs2) return true
+
         assert(call1.argumentsCount == call2.argumentsCount) {
             ""$call1 and $call2 have different number of explicit arguments""
         }
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.kt
new file mode 100644
index 0000000000000..62c58aaf5885f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.kt
@@ -0,0 +1,13 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+object Right
+object Wrong
+
+interface A<T>
+interface B<T> : A<T>
+
+fun <T> foo(vararg t: T) = Wrong
+fun <T> foo(t: A<T>) = Wrong
+fun <T> foo(t: B<T>) = Right
+
+fun test(b: B<Int>): Right = foo(b)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.txt
new file mode 100644
index 0000000000000..34b5389048f94
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.txt
@@ -0,0 +1,32 @@
+package
+
+public fun </*0*/ T> foo(/*0*/ t: A<T>): Wrong
+public fun </*0*/ T> foo(/*0*/ t: B<T>): Right
+public fun </*0*/ T> foo(/*0*/ vararg t: T /*kotlin.Array<out T>*/): Wrong
+public fun test(/*0*/ b: B<kotlin.Int>): Right
+
+public interface A</*0*/ T> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface B</*0*/ T> : A<T> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public object Right {
+    private constructor Right()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public object Wrong {
+    private constructor Wrong()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 3e6e225e8d22e..c04cf4841aec1 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -13742,6 +13742,12 @@ public void testJavaOverloadedVarargs() throws Exception {
                     doTest(fileName);
                 }
 
+                @TestMetadata(""kt10472.kt"")
+                public void testKt10472() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata(""compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10472.kt"");
+                    doTest(fileName);
+                }
+
                 @TestMetadata(""numberOfDefaults.kt"")
                 public void testNumberOfDefaults() throws Exception {
                     String fileName = KotlinTestUtils.navigationMetadata(""compiler/testData/diagnostics/tests/resolve/overloadConflicts/numberOfDefaults.kt"");"
5dabaf626e0a3493889eadcbd5ebf73d4e145912,camel,CAMEL-1091 - Fix compilation issue on Java 1.5--git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@718279 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/camel,"diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
index b36e2faef83de..337ac66092c4a 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
@@ -15,25 +15,27 @@ public class InterfacesTest extends ContextTestSupport {
     
     private String remoteInterfaceAddress;
 
-    public InterfacesTest() throws SocketException {
-        // retirieve an address of some remote network interface
+    public InterfacesTest() throws IOException {
+        // Retrieve an address of some remote network interface
         Enumeration<NetworkInterface> interfaces =  NetworkInterface.getNetworkInterfaces();
         
         while(interfaces.hasMoreElements()) {
             NetworkInterface interfaze = interfaces.nextElement();
-            if (!interfaze.isUp() || interfaze.isLoopback()) {
-                continue;
-            }
             Enumeration<InetAddress> addresses =  interfaze.getInetAddresses();
-            if(addresses.hasMoreElements()) {
-                remoteInterfaceAddress = addresses.nextElement().getHostAddress();
+            if(addresses.hasMoreElements()) {                
+                InetAddress nextAddress = addresses.nextElement();
+                if (nextAddress.isLoopbackAddress() || nextAddress.isReachable(2000)) {
+                    break;
+                }
+                remoteInterfaceAddress = nextAddress.getHostAddress();
             }
         };
         
     }
     
     public void testLocalInterfaceHandled() throws IOException, InterruptedException {
-        getMockEndpoint(""mock:endpoint"").expectedMessageCount(3);
+        int expectedMessages = (remoteInterfaceAddress != null) ? 3 : 2;
+        getMockEndpoint(""mock:endpoint"").expectedMessageCount(expectedMessages);
         
         URL localUrl = new URL(""http://localhost:4567/testRoute"");
         String localResponse = IOUtils.toString(localUrl.openStream());
@@ -44,9 +46,11 @@ public void testLocalInterfaceHandled() throws IOException, InterruptedException
         localResponse = IOUtils.toString(localUrl.openStream());
         assertEquals(""local-differentPort"", localResponse);
         
-        URL url = new URL(""http://"" + remoteInterfaceAddress + "":4567/testRoute"");
-        String remoteResponse = IOUtils.toString(url.openStream());
-        assertEquals(""remote"", remoteResponse);
+        if (remoteInterfaceAddress != null) {
+            URL url = new URL(""http://"" + remoteInterfaceAddress + "":4567/testRoute"");
+            String remoteResponse = IOUtils.toString(url.openStream());
+            assertEquals(""remote"", remoteResponse);
+        }
         
         assertMockEndpointsSatisfied();
     }
@@ -65,9 +69,11 @@ public void configure() throws Exception {
                     .setBody().constant(""local-differentPort"")
                     .to(""mock:endpoint"");
                 
-                from(""jetty:http://"" + remoteInterfaceAddress + "":4567/testRoute"")
-                    .setBody().constant(""remote"")
-                    .to(""mock:endpoint"");
+                if (remoteInterfaceAddress != null) {
+                    from(""jetty:http://"" + remoteInterfaceAddress + "":4567/testRoute"")
+                        .setBody().constant(""remote"")
+                        .to(""mock:endpoint"");
+                }
             }
         };
     }"
37ebe0b3c428cd64734a3dd3eee4d94a3f715e26,Delta Spike,"DELTASPIKE-281 add LocaleResolver for JSF projects

if a ViewRoot is available, we take the Locale from there.
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfLocaleResolver.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfLocaleResolver.java
new file mode 100644
index 000000000..76d5f543a
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfLocaleResolver.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.jsf.impl.message;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Specializes;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+
+import java.util.Locale;
+
+import org.apache.deltaspike.core.impl.message.DefaultLocaleResolver;
+
+/**
+ * A LocaleResolver which evaluates the FacesContext.
+ */
+@ApplicationScoped
+@Specializes
+public class JsfLocaleResolver extends DefaultLocaleResolver
+{
+    @Override
+    public Locale getLocale()
+    {
+        FacesContext facesContext = FacesContext.getCurrentInstance();
+        if (facesContext != null)
+        {
+            UIViewRoot viewRoot = facesContext.getViewRoot();
+            if (viewRoot != null)
+            {
+                // if a ViewRoot is present we return the Locale from there
+                return viewRoot.getLocale();
+            }
+        }
+
+        // if no FacesContext is present we return the default Locale
+        return super.getLocale();
+    }
+}
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
index 2e1767ad1..b22b36ad5 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
@@ -1,21 +1,21 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* ""License""); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.deltaspike.test.jsf.impl.message;
 
 
@@ -39,7 +39,6 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
 
@@ -77,12 +76,7 @@ public void testViewScopedContext() throws Exception
     {
         driver.get(new URL(contextPath, ""page.xhtml"").toString());
 
-        //X TODO remove, it's just for debugging the server side:
-        //X Thread.sleep(600000L);
-
-
         // check the JSF FacesMessages
-
         Assert.assertNotNull(ExpectedConditions.presenceOfElementLocated(By.xpath(""id('messages')"")).apply(driver));
 
         Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
@@ -100,7 +94,6 @@ public void testViewScopedContext() throws Exception
         // check the free message usage
         Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
                 By.id(""test:valueOutput""), ""a simple message without a param."").apply(driver));
-
     }
 
 }"
96002c8a5530eeb589fdf2cfaac811c6509b3569,tapiji,"Fixes configuration bugs.
",c,https://github.com/tapiji/tapiji,"diff --git a/com.essiembre.eclipse.i18n.resourcebundle/plugin.xml b/com.essiembre.eclipse.i18n.resourcebundle/plugin.xml
index 9e48013b..8e68e6a7 100644
--- a/com.essiembre.eclipse.i18n.resourcebundle/plugin.xml
+++ b/com.essiembre.eclipse.i18n.resourcebundle/plugin.xml
@@ -10,7 +10,7 @@
    <runtime>
    	  <library name=""resourcebundle.jar"">
          <export
-               name=""com.essiembre.eclipse.rbe.api.*"">
+               name=""*"">
          </export>
       </library>
    </runtime>
@@ -26,7 +26,7 @@
       <import plugin=""org.eclipse.jdt.ui"" optional=""true""/>
       <import plugin=""org.eclipse.ui.views""/>
       <import plugin=""org.eclipse.jdt.core"" version=""3.5.2""/>
-      <import plugin=""org.eclipselabs.tapiji.translator.rbe"" version=""0.0.1""/>
+      <import plugin=""org.eclipselabs.tapiji.translator.rbe"" version=""0.0.2""/>
    </requires>
 
    <extension-point id=""resourceFactory"" name=""resourceFactory"" schema=""schema/resourceFactory.exsd""/>
diff --git a/org.eclipselabs.tapiji.tools.core/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.core/META-INF/MANIFEST.MF
index 3916f443..c09cbcbc 100644
--- a/org.eclipselabs.tapiji.tools.core/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.core/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.core;bundle-version=""3.5.2"",
  org.eclipse.core.resources,
  org.eclipse.jface.text;bundle-version=""3.5.2"",
- com.essiembre.eclipse.i18n.resourcebundle;bundle-version=""0.7.7"",
- org.eclipselabs.tapiji.translator.rbe;bundle-version=""0.0.1""
+ org.eclipselabs.tapiji.translator.rbe;bundle-version=""0.0.2"",
+ com.essiembre.eclipse.i18n.resourcebundle;bundle-version=""0.7.8""
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.filebuffers,
diff --git a/org.eclipselabs.tapiji.tools.core/build.properties b/org.eclipselabs.tapiji.tools.core/build.properties
index 498c204b..f163057e 100644
--- a/org.eclipselabs.tapiji.tools.core/build.properties
+++ b/org.eclipselabs.tapiji.tools.core/build.properties
@@ -1,4 +1,8 @@
-source.. = src/
+source.. = src/,\
+           schema/,\
+           META-INF/,\
+           icons/,\
+           bin/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
@@ -12,7 +16,10 @@ bin.includes = plugin.xml,\
                TapiJI.png,\
                Splash.bmp,\
                TapiJI.gif,\
-               epl-v10.html
+               epl-v10.html,\
+               bin/,\
+               src/,\
+               resourcebundle.jar
 bin.excludes = icons/original/,\
                icons/photoshop/
 src.excludes = icons/original/,\
@@ -30,3 +37,12 @@ src.includes = src/,\
                TapiJI.gif,\
                plugin.xml,\
                epl-v10.html
+jars.compile.order = .,\
+                     resourcebundle.jar
+output.resourcebundle.jar = bin/
+source.resourcebundle.jar = bin/,\
+                            src/,\
+                            schema/,\
+                            META-INF/,\
+                            icons/,\
+                            .settings/
diff --git a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java
index 96aa6d78..2f9bcdc2 100644
--- a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java
+++ b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java
@@ -149,7 +149,11 @@ public void buildResource(IResource resource, IProgressMonitor monitor) {
 			resources.add(resource);
 			// TODO: create instance of progressmonitor and hand it over to
 			// auditResources
-			auditResources(resources, monitor, getProject());
+			try {
+				auditResources(resources, monitor, getProject());
+			} catch (Exception e) {
+				Logger.logError(e);
+			}
 		}
 	}
 
diff --git a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java
index f2b4b631..3f6493fd 100644
--- a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java
+++ b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java
@@ -18,6 +18,7 @@
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.events.MenuAdapter;
 import org.eclipse.swt.events.MenuEvent;
@@ -63,7 +64,7 @@ public void fill(Menu menu, int index) {
 			return;
 		
 		// Toggle Internatinalization
-		mnuToggleInt = new MenuItem (menu, index);
+		mnuToggleInt = new MenuItem (menu, SWT.PUSH);
 		mnuToggleInt.addSelectionListener(new SelectionAdapter () {
 
 			@Override
@@ -74,7 +75,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 		
 		// Exclude Resource
-		excludeResource = new MenuItem (menu, index+1);
+		excludeResource = new MenuItem (menu, SWT.PUSH);
 		excludeResource.addSelectionListener(new SelectionAdapter () {
 
 			@Override
@@ -84,10 +85,10 @@ public void widgetSelected(SelectionEvent e) {
 
 		});
 		
-		new MenuItem(menu, index+2);
+		new MenuItem(menu, SWT.SEPARATOR);
 		
 		// Add Language
-		addLanguage = new MenuItem(menu, index);
+		addLanguage = new MenuItem(menu, SWT.PUSH);
 		addLanguage.addSelectionListener(new SelectionAdapter() {
 			
 			@Override
@@ -98,7 +99,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 		
 		// Remove Language	
-		removeLanguage = new MenuItem(menu, index);
+		removeLanguage = new MenuItem(menu, SWT.PUSH);
 		removeLanguage.addSelectionListener(new SelectionAdapter() {
 			
 			@Override
diff --git a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java
index cfff937c..0b43e616 100644
--- a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java
+++ b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java
@@ -498,8 +498,10 @@ public void run() {
 	
 	@Override
 	public void dispose(){
-		super.dispose();
-		treeViewer.dispose();
-		ResourceBundleManager.getManager(viewState.getSelectedProjectName()).unregisterResourceBundleChangeListener(viewState.getSelectedBundleId(), this);
+		try {
+			super.dispose();
+			treeViewer.dispose();
+			ResourceBundleManager.getManager(viewState.getSelectedProjectName()).unregisterResourceBundleChangeListener(viewState.getSelectedBundleId(), this);
+		} catch (Exception e) {}
 	}
 }
\ No newline at end of file
diff --git a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FragmentProjectUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FragmentProjectUtils.java
index 663a757c..4edce110 100644
--- a/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FragmentProjectUtils.java
+++ b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FragmentProjectUtils.java
@@ -4,34 +4,31 @@
 
 import org.eclipse.core.resources.IProject;
 
-import com.essiembre.eclipse.rbe.api.PDEUtilsForwarder;
-
-
 public class FragmentProjectUtils{
 	
 	public static String getPluginId(IProject project){
-		return PDEUtilsForwarder.getPluginId(project);
+		return PDEUtils.getPluginId(project);
 	}
 
 	
 	public static IProject[] lookupFragment(IProject pluginProject){
-		return PDEUtilsForwarder.lookupFragment(pluginProject);
+		return PDEUtils.lookupFragment(pluginProject);
 	}
 	
 	public static boolean isFragment(IProject pluginProject){
-		return PDEUtilsForwarder.isFragment(pluginProject);
+		return PDEUtils.isFragment(pluginProject);
 	}
 	
 	public static List<IProject> getFragments(IProject hostProject){
-		return PDEUtilsForwarder.getFragments(hostProject);
+		return PDEUtils.getFragments(hostProject);
 	}
 	 
 	public static String getFragmentId(IProject project, String hostPluginId){
-		return PDEUtilsForwarder.getFragmentId(project, hostPluginId);
+		return PDEUtils.getFragmentId(project, hostPluginId);
 	}
 	
 	public static IProject getFragmentHost(IProject fragment){
-		return PDEUtilsForwarder.getFragmentHost(fragment);
+		return PDEUtils.getFragmentHost(fragment);
 	}
 	
 }
diff --git a/org.eclipselabs.tapiji.tools.feature/feature.xml b/org.eclipselabs.tapiji.tools.feature/feature.xml
index f185d570..c1fe149a 100644
--- a/org.eclipselabs.tapiji.tools.feature/feature.xml
+++ b/org.eclipselabs.tapiji.tools.feature/feature.xml
@@ -127,18 +127,15 @@ This Agreement is governed by the laws of the State of New York and the intellec
       <import plugin=""org.eclipse.swt""/>
       <import plugin=""org.eclipse.text""/>
       <import plugin=""org.eclipse.ui.workbench""/>
-      <import plugin=""org.eclipse.ui.editors""/>
-      <import plugin=""org.eclipse.ui.workbench.texteditor""/>
-      <import plugin=""org.eclipse.ui.views""/>
-      <import plugin=""org.eclipse.jdt.core"" version=""3.5.2"" match=""compatible""/>
+      <import plugin=""org.eclipse.ui.ide"" version=""3.6.0"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipse.ui.navigator"" version=""3.5.0"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipse.core.runtime"" version=""3.7.0"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipse.ui"" version=""3.7.0"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipse.ui.editors"" version=""3.7.0"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipse.ui.ide.application"" version=""1.0.300"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipse.ui.views"" version=""3.6.0"" match=""greaterOrEqual""/>
    </requires>
 
-   <plugin
-         id=""com.essiembre.eclipse.i18n.resourcebundle""
-         download-size=""0""
-         install-size=""0""
-         version=""0.7.8""/>
-
    <plugin
          id=""org.eclipselabs.tapiji.tools.core""
          download-size=""0""
@@ -167,4 +164,10 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version=""0.0.2.qualifier""
          unpack=""false""/>
 
+   <plugin
+         id=""com.essiembre.eclipse.i18n.resourcebundle""
+         download-size=""0""
+         install-size=""0""
+         version=""0.7.8.qualifier""/>
+
 </feature>
diff --git a/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
index 7286ce8e..efa8d267 100644
--- a/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.core.runtime;bundle-version=""3.6.0"",
  org.eclipse.jdt.ui;bundle-version=""3.6.0"",
  org.eclipse.jface,
- org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.1""
+ org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.2""
 Import-Package: org.eclipselabs.tapiji.translator.rbe.model.bundle,
  org.eclipselabs.tapiji.translator.rbe.ui.wizards,
  org.eclipse.core.filebuffers,
@@ -24,3 +24,5 @@ Import-Package: org.eclipselabs.tapiji.translator.rbe.model.bundle,
  org.eclipse.ui.progress,
  org.eclipse.ui.wizards
 Bundle-Vendor: Vienna University of Technology
+
+
diff --git a/org.eclipselabs.tapiji.tools.jsf.feature/feature.xml b/org.eclipselabs.tapiji.tools.jsf.feature/feature.xml
index 731cfe18..bed901fa 100644
--- a/org.eclipselabs.tapiji.tools.jsf.feature/feature.xml
+++ b/org.eclipselabs.tapiji.tools.jsf.feature/feature.xml
@@ -107,21 +107,19 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </license>
 
    <requires>
-      <import plugin=""org.eclipselabs.tapiji.tools.core"" version=""0.0.1"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.core.resources"" version=""3.6.0"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.jface""/>
-      <import plugin=""org.eclipselabs.tapiji.translator.rbe"" version=""0.0.1"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.jface.text""/>
-      <import plugin=""org.eclipse.jdt.core"" version=""3.6.0"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.jdt.ui"" version=""3.6.0"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.jst.jsf.common"" version=""1.2.0"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.jst.jsp.core"" version=""1.2.300"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.wst.sse.ui""/>
       <import plugin=""org.eclipse.core.runtime"" version=""3.6.0"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipselabs.tapiji.tools.core"" version=""0.0.2"" match=""greaterOrEqual""/>
+      <import plugin=""org.eclipselabs.tapiji.translator.rbe"" version=""0.0.2"" match=""greaterOrEqual""/>
       <import plugin=""org.eclipse.core.filebuffers""/>
       <import plugin=""org.eclipse.swt""/>
       <import plugin=""org.eclipse.ui.ide""/>
-      <import plugin=""org.eclipse.ui.workbench""/>
       <import plugin=""org.eclipse.wst.validation""/>
       <import plugin=""org.eclipse.wst.xml.core""/>
    </requires>
diff --git a/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
index a3b8cf0a..66d2f8b4 100644
--- a/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.0.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.jface,
- org.eclipselabs.tapiji.translator.rbe;bundle-version=""0.0.1"",
+ org.eclipselabs.tapiji.translator.rbe;bundle-version=""0.0.2"",
  org.eclipse.jface.text,
  org.eclipse.jdt.core;bundle-version=""3.6.0"",
  org.eclipse.jdt.ui;bundle-version=""3.6.0"",
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.jst.jsp.core;bundle-version=""1.2.300"",
  org.eclipse.wst.sse.ui,
  org.eclipse.core.runtime;bundle-version=""3.6.0"",
- org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.1""
+ org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.2""
 Import-Package: org.eclipse.core.filebuffers,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
diff --git a/org.eclipselabs.tapiji.tools.rbmanager/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.rbmanager/META-INF/MANIFEST.MF
index 0549af22..56a744ff 100644
--- a/org.eclipselabs.tapiji.tools.rbmanager/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.tools.rbmanager/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version=""3.6.0"",
  org.eclipse.ui.navigator;bundle-version=""3.5"",
- org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.1""
+ org.eclipselabs.tapiji.tools.core;bundle-version=""0.0.2""
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipselabs.tapiji.translator.rbe.model.bundle
diff --git a/org.eclipselabs.tapiji.translator/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.translator/META-INF/MANIFEST.MF
index 36fd70c2..22ebde58 100644
--- a/org.eclipselabs.tapiji.translator/META-INF/MANIFEST.MF
+++ b/org.eclipselabs.tapiji.translator/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources;bundle-version=""3.6.0"",
  org.eclipse.ui.ide;bundle-version=""3.6.0"",
  org.junit,
- com.essiembre.eclipse.i18n.resourcebundle;bundle-version=""0.7.7"",
- org.eclipselabs.tapiji.translator.rbe;bundle-version=""0.0.1""
+ org.eclipselabs.tapiji.translator.rbe;bundle-version=""0.0.2"",
+ com.essiembre.eclipse.i18n.resourcebundle;bundle-version=""0.7.8""
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipselabs.tapiji.translator.rbe.model.bundle
diff --git a/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product b/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
index 1bc71ce1..6d9879fe 100644
--- a/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
+++ b/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
@@ -21,7 +21,6 @@ by Stefan Strobl &amp; Martin Reiterer
 
    <windowImages i16=""/org.eclipselabs.tapiji.translator/icons/TapiJI_16.png"" i32=""/org.eclipselabs.tapiji.translator/icons/TapiJI_32.png"" i48=""/org.eclipselabs.tapiji.translator/icons/TapiJI_48.png"" i64=""/org.eclipselabs.tapiji.translator/icons/TapiJI_64.png"" i128=""/org.eclipselabs.tapiji.translator/icons/TapiJI_128.png""/>
 
-
    <license>
         <url>http://www.eclipse.org/legal/epl-v10.html</url>
         <text>
@@ -257,6 +256,7 @@ litigation.
       <plugin id=""org.eclipse.equinox.preferences""/>
       <plugin id=""org.eclipse.equinox.registry""/>
       <plugin id=""org.eclipse.equinox.security""/>
+      <plugin id=""org.eclipse.equinox.security.win32.x86_64"" fragment=""true""/>
       <plugin id=""org.eclipse.help""/>
       <plugin id=""org.eclipse.jdt.compiler.apt"" fragment=""true""/>
       <plugin id=""org.eclipse.jdt.compiler.tool"" fragment=""true""/>
diff --git a/org.eclipselabs.tapiji.translator/plugin.xml b/org.eclipselabs.tapiji.translator/plugin.xml
index 7bdc0338..4ca5318b 100644
--- a/org.eclipselabs.tapiji.translator/plugin.xml
+++ b/org.eclipselabs.tapiji.translator/plugin.xml
@@ -161,6 +161,10 @@
               name=""aboutImage""
               value=""icons/TapiJI_128.png"">
         </property>
+        <property
+              name=""appName""
+              value=""TapiJI Translator"">
+        </property>
      </product>
   </extension>
 </plugin>"
72d780f2cab2892259331c8d6f2d5b33d291d416,drools,"JBRULES-3200 Support for dynamic typing (aka- ""traits"")--",a,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java b/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java
index dbfb8b253b6..bfb18418e9f 100644
--- a/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java
+++ b/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java
@@ -102,6 +102,18 @@ public void setType( String name, String namespace ) {
         type = new QualifiedName( name, namespace );
     }
 
+    public String getSuperTypeName() {
+        return superTypes == null ? null : superTypes.get(0).getName();
+    }
+
+    public String getSuperTypeNamespace() {
+        return superTypes == null ? null : superTypes.get(0).getNamespace();
+    }
+
+    public String getSupertTypeFullName() {
+        return superTypes == null ? null : superTypes.get(0).getFullName();
+    }
+
 
     /**
     * @return the fields"
8ee632caa79b92b1af98684f83b01c3447a119ee,hadoop,YARN-2740. Fix NodeLabelsManager to properly handle- node label modifications when distributed node label configuration enabled.- (Naganarasimha G R via wangda)--(cherry picked from commit db1b674b50ddecf2774f4092d677c412722bdcb1)-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 20de1edb7efbe..ca9247f13eb2d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -217,6 +217,9 @@ Release 2.8.0 - UNRELEASED
     YARN-3530. ATS throws exception on trying to filter results without otherinfo.
     (zhijie shen via xgong)
 
+    YARN-2740. Fix NodeLabelsManager to properly handle node label modifications 
+    when distributed node label configuration enabled. (Naganarasimha G R via wangda)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index c8f9648147fb3..4dd01d24bb8d9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1779,6 +1779,12 @@ private static void addDeprecatedKeys() {
   public static final String DEFAULT_NODELABEL_CONFIGURATION_TYPE =
       CENTALIZED_NODELABEL_CONFIGURATION_TYPE;
 
+  @Private
+  public static boolean isDistributedNodeLabelConfiguration(Configuration conf) {
+    return DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE.equals(conf.get(
+        NODELABEL_CONFIGURATION_TYPE, DEFAULT_NODELABEL_CONFIGURATION_TYPE));
+  }
+
   public YarnConfiguration() {
     super();
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
index 7493169201ebc..f2ff0f629971c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -97,6 +97,8 @@ public class CommonNodeLabelsManager extends AbstractService {
   protected NodeLabelsStore store;
   private boolean nodeLabelsEnabled = false;
 
+  private boolean isDistributedNodeLabelConfiguration = false;
+
   /**
    * A <code>Host</code> can have multiple <code>Node</code>s 
    */
@@ -213,6 +215,10 @@ protected void serviceInit(Configuration conf) throws Exception {
     nodeLabelsEnabled =
         conf.getBoolean(YarnConfiguration.NODE_LABELS_ENABLED,
             YarnConfiguration.DEFAULT_NODE_LABELS_ENABLED);
+
+    isDistributedNodeLabelConfiguration  =
+        YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
+
     if (nodeLabelsEnabled) {
       initNodeLabelStore(conf);
     }
@@ -223,7 +229,7 @@ protected void serviceInit(Configuration conf) throws Exception {
   protected void initNodeLabelStore(Configuration conf) throws Exception {
     this.store = new FileSystemNodeLabelsStore(this);
     this.store.init(conf);
-    this.store.recover();
+    this.store.recover(isDistributedNodeLabelConfiguration);
   }
 
   // for UT purpose
@@ -613,7 +619,10 @@ protected void internalUpdateLabelsOnNodes(
       }
     }
     
-    if (null != dispatcher) {
+    if (null != dispatcher && !isDistributedNodeLabelConfiguration) {
+      // In case of DistributedNodeLabelConfiguration, no need to save the the
+      // NodeLabels Mapping to the back-end store, as on RM restart/failover
+      // NodeLabels are collected from NM through Register/Heartbeat again
       dispatcher.getEventHandler().handle(
           new UpdateNodeToLabelsMappingsEvent(newNMToLabels));
     }
@@ -799,8 +808,10 @@ public List<NodeLabel> getClusterNodeLabels() {
       readLock.lock();
       List<NodeLabel> nodeLabels = new ArrayList<>();
       for (RMNodeLabel label : labelCollections.values()) {
-        nodeLabels.add(NodeLabel.newInstance(label.getLabelName(),
-            label.getIsExclusive()));
+        if (!label.getLabelName().equals(NO_LABEL)) {
+          nodeLabels.add(NodeLabel.newInstance(label.getLabelName(),
+              label.getIsExclusive()));
+        }
       }
       return nodeLabels;
     } finally {
@@ -824,7 +835,6 @@ public boolean isExclusiveNodeLabel(String nodeLabel) throws IOException {
       readLock.unlock();
     }
   }
-  
 
   private void checkAndThrowLabelName(String label) throws IOException {
     if (label == null || label.isEmpty() || label.length() > MAX_LABEL_LENGTH) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
index ea185f2c0a248..f26e2048a02cd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
@@ -154,8 +154,12 @@ public void removeClusterNodeLabels(Collection<String> labels)
     ensureCloseEditlogFile();
   }
 
+  /* (non-Javadoc)
+   * @see org.apache.hadoop.yarn.nodelabels.NodeLabelsStore#recover(boolean)
+   */
   @Override
-  public void recover() throws YarnException, IOException {
+  public void recover(boolean ignoreNodeToLabelsMappings) throws YarnException,
+      IOException {
     /*
      * Steps of recover
      * 1) Read from last mirror (from mirror or mirror.old)
@@ -222,7 +226,15 @@ public void recover() throws YarnException, IOException {
                 new ReplaceLabelsOnNodeRequestPBImpl(
                     ReplaceLabelsOnNodeRequestProto.parseDelimitedFrom(is))
                     .getNodeToLabels();
-            mgr.replaceLabelsOnNode(map);
+            if (!ignoreNodeToLabelsMappings) {
+              /*
+               * In case of Distributed NodeLabels setup,
+               * ignoreNodeToLabelsMappings will be set to true and recover will
+               * be invoked. As RM will collect the node labels from NM through
+               * registration/HB
+               */
+              mgr.replaceLabelsOnNode(map);
+            }
             break;
           }
           }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java
index 47b7370dff843..46b94fd0d5c9a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelsStore.java
@@ -56,9 +56,18 @@ public abstract void removeClusterNodeLabels(Collection<String> labels)
       throws IOException;
 
   /**
-   * Recover labels and node to labels mappings from store
+   * Recover labels and node to labels mappings from store, but if
+   * ignoreNodeToLabelsMappings is true then node to labels mappings should not
+   * be recovered. In case of Distributed NodeLabels setup
+   * ignoreNodeToLabelsMappings will be set to true and recover will be invoked
+   * as RM will collect the node labels from NM through registration/HB
+   *
+   * @param ignoreNodeToLabelsMappings
+   * @throws IOException
+   * @throws YarnException
    */
-  public abstract void recover() throws IOException, YarnException;
+  public abstract void recover(boolean ignoreNodeToLabelsMappings)
+      throws IOException, YarnException;
   
   public void init(Configuration conf) throws Exception {}
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java
index 48d6dc877154b..fce663a1c952c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/DummyCommonNodeLabelsManager.java
@@ -39,7 +39,8 @@ public void initNodeLabelStore(Configuration conf) {
     this.store = new NodeLabelsStore(this) {
 
       @Override
-      public void recover() throws IOException {
+      public void recover(boolean ignoreNodeToLabelsMappings)
+          throws IOException {
       }
 
       @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java
index beb2cf8585851..09838b43ada1d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java
@@ -554,4 +554,29 @@ private void verifyNodeLabelAdded(Set<String> expectedAddedLabelNames,
       Assert.assertTrue(expectedAddedLabelNames.contains(label.getName()));
     }
   }
+
+  @Test(timeout = 5000)
+  public void testReplaceLabelsOnNodeInDistributedMode() throws Exception {
+    //create new DummyCommonNodeLabelsManager than the one got from @before
+    mgr.stop();
+    mgr = new DummyCommonNodeLabelsManager();
+    Configuration conf = new YarnConfiguration();
+    conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true);
+    conf.set(YarnConfiguration.NODELABEL_CONFIGURATION_TYPE,
+        YarnConfiguration.DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE);
+
+    mgr.init(conf);
+    mgr.start();
+
+    mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p1"", ""p2"", ""p3""));
+    mgr.replaceLabelsOnNode(ImmutableMap.of(toNodeId(""n1""), toSet(""p1"")));
+    Set<String> labelsByNode = mgr.getLabelsByNode(toNodeId(""n1""));
+
+    Assert.assertNull(
+        ""Labels are not expected to be written to the NodeLabelStore"",
+        mgr.lastNodeToLabels);
+    Assert.assertNotNull(""Updated labels should be available from the Mgr"",
+        labelsByNode);
+    Assert.assertTrue(labelsByNode.contains(""p1""));
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
index f070c205f5a1c..fb60cd6a6427c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
@@ -144,6 +144,40 @@ public void testRecoverWithMirror() throws Exception {
     mgr.stop();
   }
 
+  @SuppressWarnings({ ""unchecked"", ""rawtypes"" })
+  @Test(timeout = 10000)
+  public void testRecoverWithDistributedNodeLabels() throws Exception {
+    mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p1"", ""p2"", ""p3""));
+    mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p4""));
+    mgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet(""p5"", ""p6""));
+    mgr.replaceLabelsOnNode((Map) ImmutableMap.of(toNodeId(""n1""), toSet(""p1""),
+        toNodeId(""n2""), toSet(""p2"")));
+    mgr.replaceLabelsOnNode((Map) ImmutableMap.of(toNodeId(""n3""), toSet(""p3""),
+        toNodeId(""n4""), toSet(""p4""), toNodeId(""n5""), toSet(""p5""),
+        toNodeId(""n6""), toSet(""p6""), toNodeId(""n7""), toSet(""p6"")));
+
+    mgr.removeFromClusterNodeLabels(toSet(""p1""));
+    mgr.removeFromClusterNodeLabels(Arrays.asList(""p3"", ""p5""));
+    mgr.stop();
+
+    mgr = new MockNodeLabelManager();
+    Configuration cf = new Configuration(conf);
+    cf.set(YarnConfiguration.NODELABEL_CONFIGURATION_TYPE,
+        YarnConfiguration.DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE);
+    mgr.init(cf);
+
+    // check variables
+    Assert.assertEquals(3, mgr.getClusterNodeLabels().size());
+    Assert.assertTrue(mgr.getClusterNodeLabelNames().containsAll(
+        Arrays.asList(""p2"", ""p4"", ""p6"")));
+
+    Assert.assertTrue(""During recovery in distributed node-labels setup, ""
+        + ""node to labels mapping should not be recovered "", mgr
+        .getNodeLabels().size() == 0);
+
+    mgr.stop();
+  }
+
   @SuppressWarnings({ ""unchecked"", ""rawtypes"" })
   @Test(timeout = 10000)
   public void testEditlogRecover() throws Exception {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
index c921326fbdce3..0ad90c0ed4c6b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
@@ -112,6 +112,9 @@ public class AdminService extends CompositeService implements
   private final RecordFactory recordFactory = 
     RecordFactoryProvider.getRecordFactory(null);
 
+  @VisibleForTesting
+  boolean isDistributedNodeLabelConfiguration = false;
+
   public AdminService(ResourceManager rm, RMContext rmContext) {
     super(AdminService.class.getName());
     this.rm = rm;
@@ -141,6 +144,10 @@ public void serviceInit(Configuration conf) throws Exception {
         YarnConfiguration.DEFAULT_YARN_ADMIN_ACL)), UserGroupInformation
         .getCurrentUser());
     rmId = conf.get(YarnConfiguration.RM_HA_ID);
+
+    isDistributedNodeLabelConfiguration =
+        YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
+
     super.serviceInit(conf);
   }
 
@@ -637,32 +644,35 @@ public AddToClusterNodeLabelsResponse addToClusterNodeLabels(AddToClusterNodeLab
   @Override
   public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
       RemoveFromClusterNodeLabelsRequest request) throws YarnException, IOException {
-    String argName = ""removeFromClusterNodeLabels"";
+    String operation = ""removeFromClusterNodeLabels"";
     final String msg = ""remove labels."";
-    UserGroupInformation user = checkAcls(argName);
 
-    checkRMStatus(user.getShortUserName(), argName, msg);
+    UserGroupInformation user = checkAcls(operation);
+
+    checkRMStatus(user.getShortUserName(), operation, msg);
 
     RemoveFromClusterNodeLabelsResponse response =
         recordFactory.newRecordInstance(RemoveFromClusterNodeLabelsResponse.class);
     try {
       rmContext.getNodeLabelManager().removeFromClusterNodeLabels(request.getNodeLabels());
       RMAuditLogger
-          .logSuccess(user.getShortUserName(), argName, ""AdminService"");
+          .logSuccess(user.getShortUserName(), operation, ""AdminService"");
       return response;
     } catch (IOException ioe) {
-      throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
+      throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
     }
   }
 
   @Override
   public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
       ReplaceLabelsOnNodeRequest request) throws YarnException, IOException {
-    String argName = ""replaceLabelsOnNode"";
+    String operation = ""replaceLabelsOnNode"";
     final String msg = ""set node to labels."";
-    UserGroupInformation user = checkAcls(argName);
 
-    checkRMStatus(user.getShortUserName(), argName, msg);
+    checkAndThrowIfDistributedNodeLabelConfEnabled(operation);
+    UserGroupInformation user = checkAcls(operation);
+
+    checkRMStatus(user.getShortUserName(), operation, msg);
 
     ReplaceLabelsOnNodeResponse response =
         recordFactory.newRecordInstance(ReplaceLabelsOnNodeResponse.class);
@@ -670,30 +680,41 @@ public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
       rmContext.getNodeLabelManager().replaceLabelsOnNode(
           request.getNodeToLabels());
       RMAuditLogger
-          .logSuccess(user.getShortUserName(), argName, ""AdminService"");
+          .logSuccess(user.getShortUserName(), operation, ""AdminService"");
       return response;
     } catch (IOException ioe) {
-      throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
+      throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
     }
   }
 
-  private void checkRMStatus(String user, String argName, String msg)
+  private void checkRMStatus(String user, String operation, String msg)
       throws StandbyException {
     if (!isRMActive()) {
-      RMAuditLogger.logFailure(user, argName, """", 
+      RMAuditLogger.logFailure(user, operation, """",
           ""AdminService"", ""ResourceManager is not active. Can not "" + msg);
       throwStandbyException();
     }
   }
 
   private YarnException logAndWrapException(Exception exception, String user,
-      String argName, String msg) throws YarnException {
+      String operation, String msg) throws YarnException {
     LOG.warn(""Exception "" + msg, exception);
-    RMAuditLogger.logFailure(user, argName, """", 
+    RMAuditLogger.logFailure(user, operation, """",
         ""AdminService"", ""Exception "" + msg);
     return RPCUtil.getRemoteException(exception);
   }
 
+  private void checkAndThrowIfDistributedNodeLabelConfEnabled(String operation)
+      throws YarnException {
+    if (isDistributedNodeLabelConfiguration) {
+      String msg =
+          String.format(""Error when invoke method=%s because of ""
+              + ""distributed node label configuration enabled."", operation);
+      LOG.error(msg);
+      throw RPCUtil.getRemoteException(new IOException(msg));
+    }
+  }
+
   @Override
   public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
       CheckForDecommissioningNodesRequest checkForDecommissioningNodesRequest)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
index 5e2dc7e4f2543..16b6a890ac923 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
@@ -104,7 +104,7 @@ public class ResourceTrackerService extends AbstractService implements
   private int minAllocMb;
   private int minAllocVcores;
 
-  private boolean isDistributesNodeLabelsConf;
+  private boolean isDistributedNodeLabelsConf;
 
   static {
     resync.setNodeAction(NodeAction.RESYNC);
@@ -155,13 +155,8 @@ protected void serviceInit(Configuration conf) throws Exception {
         YarnConfiguration.RM_NODEMANAGER_MINIMUM_VERSION,
         YarnConfiguration.DEFAULT_RM_NODEMANAGER_MINIMUM_VERSION);
 
-    String nodeLabelConfigurationType =
-        conf.get(YarnConfiguration.NODELABEL_CONFIGURATION_TYPE,
-            YarnConfiguration.DEFAULT_NODELABEL_CONFIGURATION_TYPE);
-
-    isDistributesNodeLabelsConf =
-        YarnConfiguration.DISTRIBUTED_NODELABEL_CONFIGURATION_TYPE
-            .equals(nodeLabelConfigurationType);
+    isDistributedNodeLabelsConf =
+        YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
 
     super.serviceInit(conf);
   }
@@ -352,7 +347,7 @@ public RegisterNodeManagerResponse registerNodeManager(
 
     // Update node's labels to RM's NodeLabelManager.
     Set<String> nodeLabels = request.getNodeLabels();
-    if (isDistributesNodeLabelsConf && nodeLabels != null) {
+    if (isDistributedNodeLabelsConf && nodeLabels != null) {
       try {
         updateNodeLabelsFromNMReport(nodeLabels, nodeId);
         response.setAreNodeLabelsAcceptedByRM(true);
@@ -470,7 +465,7 @@ public NodeHeartbeatResponse nodeHeartbeat(NodeHeartbeatRequest request)
     this.rmContext.getDispatcher().getEventHandler().handle(nodeStatusEvent);
 
     // 5. Update node's labels to RM's NodeLabelManager.
-    if (isDistributesNodeLabelsConf && request.getNodeLabels() != null) {
+    if (isDistributedNodeLabelsConf && request.getNodeLabels() != null) {
       try {
         updateNodeLabelsFromNMReport(request.getNodeLabels(), nodeId);
         nodeHeartBeatResponse.setAreNodeLabelsAcceptedByRM(true);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
index 6cd6d56281f66..9aea62d1c8408 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
@@ -149,6 +149,7 @@
 import org.apache.hadoop.yarn.webapp.NotFoundException;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -165,6 +166,9 @@ public class RMWebServices {
   private final Configuration conf;
   private @Context HttpServletResponse response;
 
+  @VisibleForTesting
+  boolean isDistributedNodeLabelConfiguration = false;
+
   public final static String DELEGATION_TOKEN_HEADER =
       ""Hadoop-YARN-RM-Delegation-Token"";
 
@@ -172,6 +176,19 @@ public class RMWebServices {
   public RMWebServices(final ResourceManager rm, Configuration conf) {
     this.rm = rm;
     this.conf = conf;
+    isDistributedNodeLabelConfiguration =
+        YarnConfiguration.isDistributedNodeLabelConfiguration(conf);
+  }
+
+  private void checkAndThrowIfDistributedNodeLabelConfEnabled(String operation)
+      throws IOException {
+    if (isDistributedNodeLabelConfiguration) {
+      String msg =
+          String.format(""Error when invoke method=%s because of ""
+              + ""distributed node label configuration enabled."", operation);
+      LOG.error(msg);
+      throw new IOException(msg);
+    }
   }
 
   RMWebServices(ResourceManager rm, Configuration conf,
@@ -816,38 +833,64 @@ public LabelsToNodesInfo getLabelsToNodes(
   @POST
   @Path(""/replace-node-to-labels"")
   @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response replaceLabelsOnNodes(
-    final NodeToLabelsInfo newNodeToLabels,
-    @Context HttpServletRequest hsr) 
-    throws IOException {
+  public Response replaceLabelsOnNodes(final NodeToLabelsInfo newNodeToLabels,
+      @Context HttpServletRequest hsr) throws IOException {
+    Map<NodeId, Set<String>> nodeIdToLabels =
+        new HashMap<NodeId, Set<String>>();
+
+    for (Map.Entry<String, NodeLabelsInfo> nitle : newNodeToLabels
+        .getNodeToLabels().entrySet()) {
+      nodeIdToLabels.put(
+          ConverterUtils.toNodeIdWithDefaultPort(nitle.getKey()),
+          new HashSet<String>(nitle.getValue().getNodeLabels()));
+    }
+
+    return replaceLabelsOnNode(nodeIdToLabels, hsr, ""/replace-node-to-labels"");
+  }
+
+  @POST
+  @Path(""/nodes/{nodeId}/replace-labels"")
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+  public Response replaceLabelsOnNode(NodeLabelsInfo newNodeLabelsInfo,
+      @Context HttpServletRequest hsr, @PathParam(""nodeId"") String nodeId)
+      throws Exception {
+    NodeId nid = ConverterUtils.toNodeIdWithDefaultPort(nodeId);
+    Map<NodeId, Set<String>> newLabelsForNode =
+        new HashMap<NodeId, Set<String>>();
+    newLabelsForNode.put(nid,
+        new HashSet<String>(newNodeLabelsInfo.getNodeLabels()));
+
+    return replaceLabelsOnNode(newLabelsForNode, hsr, ""/nodes/nodeid/replace-labels"");
+  }
+
+  private Response replaceLabelsOnNode(
+      Map<NodeId, Set<String>> newLabelsForNode, HttpServletRequest hsr,
+      String operation) throws IOException {
     init();
-    
+
+    checkAndThrowIfDistributedNodeLabelConfEnabled(""replaceLabelsOnNode"");
+
     UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
     if (callerUGI == null) {
-      String msg = ""Unable to obtain user name, user not authenticated for""
-        + "" post to .../replace-node-to-labels"";
+      String msg =
+          ""Unable to obtain user name, user not authenticated for""
+              + "" post to ..."" + operation;
       throw new AuthorizationException(msg);
     }
+
     if (!rm.getRMContext().getNodeLabelManager().checkAccess(callerUGI)) {
-      String msg = ""User "" + callerUGI.getShortUserName() + "" not authorized""
-        + "" for post to .../replace-node-to-labels "";
+      String msg =
+          ""User "" + callerUGI.getShortUserName() + "" not authorized""
+              + "" for post to ..."" + operation;
       throw new AuthorizationException(msg);
     }
-    
-    Map<NodeId, Set<String>> nodeIdToLabels = 
-      new HashMap<NodeId, Set<String>>();
 
-    for (Map.Entry<String, NodeLabelsInfo> nitle : 
-      newNodeToLabels.getNodeToLabels().entrySet()) {
-     nodeIdToLabels.put(ConverterUtils.toNodeIdWithDefaultPort(nitle.getKey()),
-       new HashSet<String>(nitle.getValue().getNodeLabels()));
-    }
-    
-    rm.getRMContext().getNodeLabelManager().replaceLabelsOnNode(nodeIdToLabels);
+    rm.getRMContext().getNodeLabelManager()
+        .replaceLabelsOnNode(newLabelsForNode);
 
     return Response.status(Status.OK).build();
   }
-  
+
   @GET
   @Path(""/get-node-labels"")
   @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@@ -897,7 +940,7 @@ public Response removeFromCluserNodeLabels(final NodeLabelsInfo oldNodeLabels,
       @Context HttpServletRequest hsr)
       throws Exception {
     init();
-    
+
     UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
     if (callerUGI == null) {
       String msg = ""Unable to obtain user name, user not authenticated for""
@@ -931,40 +974,6 @@ public NodeLabelsInfo getLabelsOnNode(@Context HttpServletRequest hsr,
       rm.getRMContext().getNodeLabelManager().getLabelsOnNode(nid));
 
   }
-  
-  @POST
-  @Path(""/nodes/{nodeId}/replace-labels"")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response replaceLabelsOnNode(NodeLabelsInfo newNodeLabelsInfo,
-      @Context HttpServletRequest hsr, @PathParam(""nodeId"") String nodeId)
-      throws Exception {
-    init();
-    
-    UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
-    if (callerUGI == null) {
-      String msg = ""Unable to obtain user name, user not authenticated for""
-        + "" post to .../nodes/nodeid/replace-labels"";
-      throw new AuthorizationException(msg);
-    }
-
-    if (!rm.getRMContext().getNodeLabelManager().checkAccess(callerUGI)) {
-      String msg = ""User "" + callerUGI.getShortUserName() + "" not authorized""
-        + "" for post to .../nodes/nodeid/replace-labels"";
-      throw new AuthorizationException(msg);
-    }
-    
-    NodeId nid = ConverterUtils.toNodeIdWithDefaultPort(nodeId);
-    
-    Map<NodeId, Set<String>> newLabelsForNode = new HashMap<NodeId,
-      Set<String>>();
-    
-    newLabelsForNode.put(nid, new HashSet<String>(newNodeLabelsInfo.getNodeLabels()));
-    
-    rm.getRMContext().getNodeLabelManager().replaceLabelsOnNode(newLabelsForNode);
-    
-    return Response.status(Status.OK).build();
-
-  }
 
   protected Response killApp(RMApp app, UserGroupInformation callerUGI,
       HttpServletRequest hsr) throws IOException, InterruptedException {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
index da04c9ec32b11..fe0b8a8d1ff35 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.io.DataOutputStream;
@@ -44,6 +45,7 @@
 import org.apache.hadoop.security.authorize.ProxyUsers;
 import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
 import org.apache.hadoop.yarn.api.records.DecommissionType;
+import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.conf.HAUtil;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
@@ -53,6 +55,9 @@
 import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
 import org.junit.After;
@@ -60,6 +65,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 public class TestRMAdminService {
 
@@ -754,6 +761,67 @@ public void testRMInitialsWithFileSystemBasedConfigurationProvider()
     }
   }
 
+  @Test
+  public void testModifyLabelsOnNodesWithDistributedConfigurationDisabled()
+      throws IOException, YarnException {
+    // create RM and set it's ACTIVE
+    MockRM rm = new MockRM();
+    ((RMContextImpl) rm.getRMContext())
+        .setHAServiceState(HAServiceState.ACTIVE);
+    RMNodeLabelsManager labelMgr = rm.rmContext.getNodeLabelManager();
+
+    // by default, distributed configuration for node label is disabled, this
+    // should pass
+    labelMgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of(""x"", ""y""));
+    rm.adminService.replaceLabelsOnNode(ReplaceLabelsOnNodeRequest
+        .newInstance(ImmutableMap.of(NodeId.newInstance(""host"", 0),
+            (Set<String>) ImmutableSet.of(""x""))));
+    rm.close();
+  }
+
+  @Test(expected = YarnException.class)
+  public void testModifyLabelsOnNodesWithDistributedConfigurationEnabled()
+      throws IOException, YarnException {
+    // create RM and set it's ACTIVE, and set distributed node label
+    // configuration to true
+    MockRM rm = new MockRM();
+    rm.adminService.isDistributedNodeLabelConfiguration = true;
+
+    ((RMContextImpl) rm.getRMContext())
+        .setHAServiceState(HAServiceState.ACTIVE);
+    RMNodeLabelsManager labelMgr = rm.rmContext.getNodeLabelManager();
+
+    // by default, distributed configuration for node label is disabled, this
+    // should pass
+    labelMgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of(""x"", ""y""));
+    rm.adminService.replaceLabelsOnNode(ReplaceLabelsOnNodeRequest
+        .newInstance(ImmutableMap.of(NodeId.newInstance(""host"", 0),
+            (Set<String>) ImmutableSet.of(""x""))));
+    rm.close();
+  }
+
+  @Test
+  public void testRemoveClusterNodeLabelsWithDistributedConfigurationEnabled()
+      throws IOException, YarnException {
+    // create RM and set it's ACTIVE
+    MockRM rm = new MockRM();
+    ((RMContextImpl) rm.getRMContext())
+        .setHAServiceState(HAServiceState.ACTIVE);
+    RMNodeLabelsManager labelMgr = rm.rmContext.getNodeLabelManager();
+    rm.adminService.isDistributedNodeLabelConfiguration = true;
+
+    // by default, distributed configuration for node label is disabled, this
+    // should pass
+    labelMgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of(""x"", ""y""));
+    rm.adminService
+        .removeFromClusterNodeLabels(RemoveFromClusterNodeLabelsRequest
+            .newInstance((Set<String>) ImmutableSet.of(""x"")));
+
+    Set<String> clusterNodeLabels = labelMgr.getClusterNodeLabelNames();
+    assertEquals(1,clusterNodeLabels.size());
+    rm.close();
+  }
+
   private String writeConfigurationXML(Configuration conf, String confXMLName)
       throws IOException {
     DataOutputStream output = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java
index 9548029d08769..2e21d261f615f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NullRMNodeLabelsManager.java
@@ -40,7 +40,8 @@ public void initNodeLabelStore(Configuration conf) {
     this.store = new NodeLabelsStore(this) {
 
       @Override
-      public void recover() throws IOException {
+      public void recover(boolean ignoreNodeToLabelsMappings)
+          throws IOException {
         // do nothing
       }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
index 298246ca301e2..e4614f8c9ec7e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java
@@ -51,6 +51,7 @@
 import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContextImpl;
 import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
@@ -623,6 +624,7 @@ public void testAppsRace() throws Exception {
         null, null, null, null, null);
     when(mockRM.getRMContext()).thenReturn(rmContext);
     when(mockRM.getClientRMService()).thenReturn(mockClientSvc);
+    rmContext.setNodeLabelManager(mock(RMNodeLabelsManager.class));
 
     RMWebServices webSvc = new RMWebServices(mockRM, new Configuration(),
         mock(HttpServletResponse.class));
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
index 40c54a30a6a8d..2d5518dc03cf8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
@@ -19,10 +19,10 @@
 package org.apache.hadoop.yarn.server.resourcemanager.webapp;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
 
 import javax.ws.rs.core.MediaType;
@@ -51,7 +51,6 @@
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.json.JSONJAXBContext;
 import com.sun.jersey.api.json.JSONMarshaller;
-import com.sun.jersey.api.json.JSONUnmarshaller;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 import com.sun.jersey.test.framework.WebAppDescriptor;
@@ -66,13 +65,13 @@ public class TestRMWebServicesNodeLabels extends JerseyTestBase {
 
   private String userName;
   private String notUserName;
+  private RMWebServices rmWebService;
 
   private Injector injector = Guice.createInjector(new ServletModule() {
+
     @Override
     protected void configureServlets() {
       bind(JAXBContextResolver.class);
-      bind(RMWebServices.class);
-      bind(GenericExceptionHandler.class);
       try {
         userName = UserGroupInformation.getCurrentUser().getShortUserName();
       } catch (IOException ioe) {
@@ -83,6 +82,9 @@ protected void configureServlets() {
       conf = new YarnConfiguration();
       conf.set(YarnConfiguration.YARN_ADMIN_ACL, userName);
       rm = new MockRM(conf);
+      rmWebService = new RMWebServices(rm,conf);
+      bind(RMWebServices.class).toInstance(rmWebService);
+      bind(GenericExceptionHandler.class);
       bind(ResourceManager.class).toInstance(rm);
       filter(""/*"").through(
           TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class);
@@ -113,7 +115,6 @@ public void testNodeLabels() throws JSONException, Exception {
     ClientResponse response;
     JSONObject json;
     JSONArray jarr;
-    String responseString;
 
     // Add a label
     response =
@@ -386,6 +387,93 @@ public void testNodeLabels() throws JSONException, Exception {
     assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
     String res = response.getEntity(String.class);
     assertTrue(res.equals(""null""));
+
+    // Following test cases are to test replace when distributed node label
+    // configuration is on
+    // Reset for testing : add cluster labels
+    response =
+        r.path(""ws"")
+            .path(""v1"")
+            .path(""cluster"")
+            .path(""add-node-labels"")
+            .queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON)
+            .entity(""{\""nodeLabels\"":[\""x\"",\""y\""]}"",
+                MediaType.APPLICATION_JSON).post(ClientResponse.class);
+    // Reset for testing : Add labels to a node
+    response =
+        r.path(""ws"").path(""v1"").path(""cluster"").path(""nodes"").path(""nid:0"")
+            .path(""replace-labels"").queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON)
+            .entity(""{\""nodeLabels\"": [\""y\""]}"", MediaType.APPLICATION_JSON)
+            .post(ClientResponse.class);
+    LOG.info(""posted node nodelabel"");
+
+    //setting rmWebService for Distributed NodeLabel Configuration
+    rmWebService.isDistributedNodeLabelConfiguration = true;
+
+    // Case1 : Replace labels using node-to-labels
+    ntli = new NodeToLabelsInfo();
+    nli = new NodeLabelsInfo();
+    nli.getNodeLabels().add(""x"");
+    ntli.getNodeToLabels().put(""nid:0"", nli);
+    response =
+        r.path(""ws"")
+            .path(""v1"")
+            .path(""cluster"")
+            .path(""replace-node-to-labels"")
+            .queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON)
+            .entity(toJson(ntli, NodeToLabelsInfo.class),
+                MediaType.APPLICATION_JSON).post(ClientResponse.class);
+
+    // Verify, using node-to-labels that previous operation has failed
+    response =
+        r.path(""ws"").path(""v1"").path(""cluster"").path(""get-node-to-labels"")
+            .queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+    assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
+    ntli = response.getEntity(NodeToLabelsInfo.class);
+    nli = ntli.getNodeToLabels().get(""nid:0"");
+    assertEquals(1, nli.getNodeLabels().size());
+    assertFalse(nli.getNodeLabels().contains(""x""));
+
+    // Case2 : failure to Replace labels using replace-labels
+    response =
+        r.path(""ws"").path(""v1"").path(""cluster"").path(""nodes"").path(""nid:0"")
+            .path(""replace-labels"").queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON)
+            .entity(""{\""nodeLabels\"": [\""x\""]}"", MediaType.APPLICATION_JSON)
+            .post(ClientResponse.class);
+    LOG.info(""posted node nodelabel"");
+
+    // Verify, using node-to-labels that previous operation has failed
+    response =
+        r.path(""ws"").path(""v1"").path(""cluster"").path(""get-node-to-labels"")
+            .queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+    assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
+    ntli = response.getEntity(NodeToLabelsInfo.class);
+    nli = ntli.getNodeToLabels().get(""nid:0"");
+    assertEquals(1, nli.getNodeLabels().size());
+    assertFalse(nli.getNodeLabels().contains(""x""));
+
+    //  Case3 : Remove cluster label should be successfull
+    response =
+        r.path(""ws"").path(""v1"").path(""cluster"")
+            .path(""remove-node-labels"")
+            .queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON)
+            .entity(""{\""nodeLabels\"":\""x\""}"", MediaType.APPLICATION_JSON)
+            .post(ClientResponse.class);
+    // Verify
+    response =
+        r.path(""ws"").path(""v1"").path(""cluster"")
+            .path(""get-node-labels"").queryParam(""user.name"", userName)
+            .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+    assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
+    json = response.getEntity(JSONObject.class);
+    assertEquals(""y"", json.getString(""nodeLabels""));
   }
 
   @SuppressWarnings(""rawtypes"")
@@ -396,13 +484,4 @@ private String toJson(Object nsli, Class klass) throws Exception {
     jm.marshallToJSON(nsli, sw);
     return sw.toString();
   }
-
-  @SuppressWarnings({ ""rawtypes"", ""unchecked"" })
-  private Object fromJson(String json, Class klass) throws Exception {
-    StringReader sr = new StringReader(json);
-    JSONJAXBContext ctx = new JSONJAXBContext(klass);
-    JSONUnmarshaller jm = ctx.createJSONUnmarshaller();
-    return jm.unmarshalFromJSON(sr, klass);
-  }
-
 }"
4634ca5cb8c8ad0a3c725363f3705a4078c04c9c,elasticsearch,Mapping: When _all is disabled,a,https://github.com/elastic/elasticsearch,"diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java
index 3eafa63f880ef..79a3b4a43b6df 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java
@@ -25,4 +25,9 @@
 public interface AllFieldMapper extends FieldMapper<Void>, InternalMapper {
 
     public static final String NAME = ""_all"";
+
+    /**
+     * Is the all field enabled or not.
+     */
+    public boolean enabled();
 }
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ByteFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ByteFieldMapper.java
index 1bde6b18de857..e890ff6c13104 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ByteFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ByteFieldMapper.java
@@ -160,7 +160,7 @@ protected ByteFieldMapper(Names names, int precisionStep, Field.Index index, Fie
             } else {
                 value = ((Number) externalValue).byteValue();
             }
-            if (includeInAll == null || includeInAll) {
+            if (context.includeInAll(includeInAll)) {
                 context.allEntries().addText(names.fullName(), Byte.toString(value), boost);
             }
         } else {
@@ -169,12 +169,12 @@ protected ByteFieldMapper(Names names, int precisionStep, Field.Index index, Fie
                     return null;
                 }
                 value = nullValue;
-                if (nullValueAsString != null && (includeInAll == null || includeInAll)) {
+                if (nullValueAsString != null && (context.includeInAll(includeInAll))) {
                     context.allEntries().addText(names.fullName(), nullValueAsString, boost);
                 }
             } else {
                 value = (byte) context.parser().shortValue();
-                if (includeInAll == null || includeInAll) {
+                if (context.includeInAll(includeInAll)) {
                     context.allEntries().addText(names.fullName(), context.parser().text(), boost);
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DateFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DateFieldMapper.java
index 3ab03f09b0d0f..92b30ac51bf1b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DateFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DateFieldMapper.java
@@ -194,7 +194,7 @@ protected DateFieldMapper(Names names, FormatDateTimeFormatter dateTimeFormatter
         if (dateAsString == null) {
             return null;
         }
-        if (includeInAll == null || includeInAll) {
+        if (context.includeInAll(includeInAll)) {
             context.allEntries().addText(names.fullName(), dateAsString, boost);
         }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DoubleFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DoubleFieldMapper.java
index 406a49ebb3468..8fa0484fe45f3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DoubleFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/DoubleFieldMapper.java
@@ -162,7 +162,7 @@ protected DoubleFieldMapper(Names names, int precisionStep,
             } else {
                 value = ((Number) externalValue).doubleValue();
             }
-            if (includeInAll == null || includeInAll) {
+            if (context.includeInAll(includeInAll)) {
                 context.allEntries().addText(names.fullName(), Double.toString(value), boost);
             }
         } else {
@@ -171,12 +171,12 @@ protected DoubleFieldMapper(Names names, int precisionStep,
                     return null;
                 }
                 value = nullValue;
-                if (nullValueAsString != null && (includeInAll == null || includeInAll)) {
+                if (nullValueAsString != null && (context.includeInAll(includeInAll))) {
                     context.allEntries().addText(names.fullName(), nullValueAsString, boost);
                 }
             } else {
                 value = context.parser().doubleValue();
-                if (includeInAll == null || includeInAll) {
+                if (context.includeInAll(includeInAll)) {
                     context.allEntries().addText(names.fullName(), context.parser().text(), boost);
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/FloatFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/FloatFieldMapper.java
index 2553e11110f63..c4e859d146ade 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/FloatFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/FloatFieldMapper.java
@@ -161,7 +161,7 @@ protected FloatFieldMapper(Names names, int precisionStep, Field.Index index, Fi
             } else {
                 value = ((Number) externalValue).floatValue();
             }
-            if (includeInAll == null || includeInAll) {
+            if (context.includeInAll(includeInAll)) {
                 context.allEntries().addText(names.fullName(), Float.toString(value), boost);
             }
         } else {
@@ -170,12 +170,12 @@ protected FloatFieldMapper(Names names, int precisionStep, Field.Index index, Fi
                     return null;
                 }
                 value = nullValue;
-                if (nullValueAsString != null && (includeInAll == null || includeInAll)) {
+                if (nullValueAsString != null && (context.includeInAll(includeInAll))) {
                     context.allEntries().addText(names.fullName(), nullValueAsString, boost);
                 }
             } else {
                 value = context.parser().floatValue();
-                if (includeInAll == null || includeInAll) {
+                if (context.includeInAll(includeInAll)) {
                     context.allEntries().addText(names.fullName(), context.parser().text(), boost);
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/IntegerFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/IntegerFieldMapper.java
index 292adcd425048..40d77a15430e6 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/IntegerFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/IntegerFieldMapper.java
@@ -161,7 +161,7 @@ protected IntegerFieldMapper(Names names, int precisionStep, Field.Index index,
             } else {
                 value = ((Number) externalValue).intValue();
             }
-            if (includeInAll == null || includeInAll) {
+            if (context.includeInAll(includeInAll)) {
                 context.allEntries().addText(names.fullName(), Integer.toString(value), boost);
             }
         } else {
@@ -170,12 +170,12 @@ protected IntegerFieldMapper(Names names, int precisionStep, Field.Index index,
                     return null;
                 }
                 value = nullValue;
-                if (nullValueAsString != null && (includeInAll == null || includeInAll)) {
+                if (nullValueAsString != null && (context.includeInAll(includeInAll))) {
                     context.allEntries().addText(names.fullName(), nullValueAsString, boost);
                 }
             } else {
                 value = context.parser().intValue();
-                if (includeInAll == null || includeInAll) {
+                if (context.includeInAll(includeInAll)) {
                     context.allEntries().addText(names.fullName(), context.parser().text(), boost);
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/LongFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/LongFieldMapper.java
index 08f6512ff37f6..9498cd5ca2351 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/LongFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/LongFieldMapper.java
@@ -161,7 +161,7 @@ protected LongFieldMapper(Names names, int precisionStep, Field.Index index, Fie
             } else {
                 value = ((Number) externalValue).longValue();
             }
-            if (includeInAll == null || includeInAll) {
+            if (context.includeInAll(includeInAll)) {
                 context.allEntries().addText(names.fullName(), Long.toString(value), boost);
             }
         } else {
@@ -170,12 +170,12 @@ protected LongFieldMapper(Names names, int precisionStep, Field.Index index, Fie
                     return null;
                 }
                 value = nullValue;
-                if (nullValueAsString != null && (includeInAll == null || includeInAll)) {
+                if (nullValueAsString != null && (context.includeInAll(includeInAll))) {
                     context.allEntries().addText(names.fullName(), nullValueAsString, boost);
                 }
             } else {
                 value = context.parser().longValue();
-                if (includeInAll == null || includeInAll) {
+                if (context.includeInAll(includeInAll)) {
                     context.allEntries().addText(names.fullName(), context.parser().text(), boost);
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ParseContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ParseContext.java
index 31c998915f0e6..668e56394bb91 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ParseContext.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ParseContext.java
@@ -199,6 +199,18 @@ public void uid(String uid) {
         this.uid = uid;
     }
 
+    /**
+     * Is all included or not. Will always disable it if {@link org.elasticsearch.index.mapper.AllFieldMapper#enabled()}
+     * is <tt>false</tt>. If its enabled, then will return <tt>true</tt> only if the specific flag is <tt>null</tt> or
+     * its actual value (so, if not set, defaults to ""true"").
+     */
+    public boolean includeInAll(Boolean specificIncludeInAll) {
+        if (!docMapper.allFieldMapper().enabled()) {
+            return false;
+        }
+        return specificIncludeInAll == null || specificIncludeInAll;
+    }
+
     public AllEntries allEntries() {
         return this.allEntries;
     }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ShortFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ShortFieldMapper.java
index e82db319d9642..a685a18f6718c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ShortFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ShortFieldMapper.java
@@ -161,7 +161,7 @@ protected ShortFieldMapper(Names names, int precisionStep, Field.Index index, Fi
             } else {
                 value = ((Number) externalValue).shortValue();
             }
-            if (includeInAll == null || includeInAll) {
+            if (context.includeInAll(includeInAll)) {
                 context.allEntries().addText(names.fullName(), Short.toString(value), boost);
             }
         } else {
@@ -170,12 +170,12 @@ protected ShortFieldMapper(Names names, int precisionStep, Field.Index index, Fi
                     return null;
                 }
                 value = nullValue;
-                if (nullValueAsString != null && (includeInAll == null || includeInAll)) {
+                if (nullValueAsString != null && (context.includeInAll(includeInAll))) {
                     context.allEntries().addText(names.fullName(), nullValueAsString, boost);
                 }
             } else {
                 value = context.parser().shortValue();
-                if (includeInAll == null || includeInAll) {
+                if (context.includeInAll(includeInAll)) {
                     context.allEntries().addText(names.fullName(), context.parser().text(), boost);
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/StringFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/StringFieldMapper.java
index fa9831ecf6d11..36b31b05102de 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/StringFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/StringFieldMapper.java
@@ -140,7 +140,7 @@ protected StringFieldMapper(Names names, Field.Index index, Field.Store store, F
         if (value == null) {
             return null;
         }
-        if (includeInAll == null || includeInAll) {
+        if (context.includeInAll(includeInAll)) {
             context.allEntries().addText(names.fullName(), value, boost);
         }
         if (!indexed() && !stored()) {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ip/IpFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ip/IpFieldMapper.java
index 112f0e405f20f..0b9cb391b314e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ip/IpFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ip/IpFieldMapper.java
@@ -210,7 +210,7 @@ protected IpFieldMapper(Names names, int precisionStep,
         if (ipAsString == null) {
             return null;
         }
-        if (includeInAll == null || includeInAll) {
+        if (context.includeInAll(includeInAll)) {
             context.allEntries().addText(names.fullName(), ipAsString, boost);
         }"
e85e76dec1010dae4e01c859978ca2c3f02014b2,Valadoc,"libvaladoc: gir-reader: accept &pi;, &gt;, &lt;, &solidus;
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/documentation/gtkdoccommentscanner.vala b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
index 5b8793c5b3..fd16e3b153 100644
--- a/src/libvaladoc/documentation/gtkdoccommentscanner.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
@@ -134,6 +134,51 @@ public class Valadoc.Gtkdoc.Scanner {
 	public Scanner () {
 	}
 
+	public static string unescape (string txt) {
+		StringBuilder builder = new StringBuilder ();
+		unowned string start = txt;
+		unowned string pos;
+		unichar c;
+
+		for (pos = txt; (c = pos.get_char ()) != '\0'; pos = pos.next_char ()) {
+			if (c == '&') {
+				if (pos.has_prefix (""&solidus;"")) {
+					builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));
+					start = (string) ((char*) pos + 9);
+					pos = (string) ((char*) pos + 8);
+					builder.append_unichar ('⁄');
+				} else if (pos.has_prefix (""&ast;"")) {
+					builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));
+					start = (string) ((char*) pos + 5);
+					pos = (string) ((char*) pos + 4);
+					builder.append_c ('*');
+				} else if (pos.has_prefix (""&pi;"")) {
+					builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));
+					start = (string) ((char*) pos + 4);
+					pos = (string) ((char*) pos + 3);
+					builder.append_unichar ('π');
+				} else if (pos.has_prefix (""&lt;"")) {
+					builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));
+					start = (string) ((char*) pos + 4);
+					pos = (string) ((char*) pos + 3);
+					builder.append_c ('<');
+				} else if (pos.has_prefix (""&gt;"")) {
+					builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));
+					start = (string) ((char*) pos + 4);
+					pos = (string) ((char*) pos + 3);
+					builder.append_c ('>');
+				}
+			}
+		} 
+
+		if (&txt == &start) {
+			return txt;
+		} else {
+			builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));
+			return (owned) builder.str;
+		}
+	}
+
 	public void reset (string content) {
 		this.content = content;
 		this.tmp_token = null;
@@ -396,7 +441,7 @@ public class Valadoc.Gtkdoc.Scanner {
 						next_char ();
 						next_char ();
 						next_char ();
-						return new Token (TokenType.WORD, content, null, start, offset (this.pos, start), this.line, column_start, this.column);
+						return new Token (TokenType.WORD, unescape (content), null, start, offset (this.pos, start), this.line, column_start, this.column);
 					}
 				}
 			}
@@ -549,7 +594,7 @@ public class Valadoc.Gtkdoc.Scanner {
 			return null;
 		}
 
-		return new Token (TokenType.WORD, start.substring (0, len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+		return new Token (TokenType.WORD, unescape (start.substring (0, len)), null, start, offset (this.pos, start), this.line, column_start, this.column);
 	}
 
 	private Token? gtkdoc_source_open_prefix () {
diff --git a/src/libvaladoc/markupwriter.vala b/src/libvaladoc/markupwriter.vala
index 7472d02638..d463d0eb35 100755
--- a/src/libvaladoc/markupwriter.vala
+++ b/src/libvaladoc/markupwriter.vala
@@ -38,7 +38,7 @@ public class Valadoc.MarkupWriter {
 		unowned string pos;
 		unichar c;
 
-		for (pos = txt; (c = pos.get_char ()) != '\0'  ; pos = pos.next_char ()) {
+		for (pos = txt; (c = pos.get_char ()) != '\0'; pos = pos.next_char ()) {
 			switch (c) {
 			case '""':
 				builder.append_len (start, (ssize_t) ((char*) pos - (char*) start));"
ef619fcd7aa5e84de31405431b244cdd3de2e3e0,adangel$pmd,"Changes from Brian Remedios.
Refactored UseIndexOfChar to extract common functionality into AbstractPoorMethodCall.
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4442 51baf565-9d33-0410-a72c-fc3788e3496d
",p,https://github.com/adangel/pmd,"diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 0d299f5c608..ba05b673c34 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -11,6 +11,7 @@ Fixed a bug in AvoidProtectedFieldInFinalClass - it no longer reports false posi
 Fixed a bug in the C++ grammar - the tokenizer now properly recognizes macro definitions which are followed by a multiline comment.
 Applied patch 1481024 (fulfilling RFE 1490181)- NOPMD messages can now be reported with a user specified msg, e.g., //NOPMD - this is expected
 Added JSP support to the copy/paste detector.
+Refactored UseIndexOfChar to extract common functionality into AbstractPoorMethodCall.
 
 June 1, 2006 - 3.7:
 New rules:
diff --git a/pmd/src/net/sourceforge/pmd/rules/AbstractPoorMethodCall.java b/pmd/src/net/sourceforge/pmd/rules/AbstractPoorMethodCall.java
new file mode 100644
index 00000000000..a35d912bd9e
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/rules/AbstractPoorMethodCall.java
@@ -0,0 +1,120 @@
+package net.sourceforge.pmd.rules;
+
+import net.sourceforge.pmd.AbstractRule;
+import net.sourceforge.pmd.ast.ASTAdditiveExpression;
+import net.sourceforge.pmd.ast.ASTLiteral;
+import net.sourceforge.pmd.ast.ASTPrimaryExpression;
+import net.sourceforge.pmd.ast.ASTVariableDeclaratorId;
+import net.sourceforge.pmd.ast.SimpleNode;
+import net.sourceforge.pmd.symboltable.NameOccurrence;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Detects and flags the occurrences of specific method calls against an instance of
+ * a designated class. I.e. String.indexOf. The goal is to be able to suggest more
+ * efficient/modern ways of implementing the same function.
+ * 
+ * Concrete subclasses are expected to provide the name of the target class and an 
+ * array of method names that we are looking for. We then pass judgement on any literal
+ * arguments we find in the subclass as well.
+ * 
+ * @author Brian Remedios 
+ * @version $Revision$
+ */
+public abstract class AbstractPoorMethodCall extends AbstractRule {
+    
+    
+    /**
+     * The name of the type the method will be invoked against.
+     * @return String
+     */
+    protected abstract String targetTypename();
+    
+    /**
+     * Return the names of all the methods we are scanning for, no brackets or
+     * argument types.
+     * 
+     * @return String[]
+     */
+    protected abstract String[] methodNames();
+    
+    /**
+     * Returns whether the string argument at the stated position being sent to 
+     * the method is ok or not. Return true if you want to record the method call 
+     * as a violation, false otherwise.
+     * 
+     * @param argIndex int
+     * @param arg String
+     * @return boolean
+     */
+    protected abstract boolean isViolationArgument(int argIndex, String arg);
+    
+    /**
+     * Returns whether the name occurrence is one of the method calls
+     * we are interested in.
+     * 
+     * @param occurrence NameOccurrence
+     * @return boolean
+     */
+    private boolean isNotedMethod(NameOccurrence occurrence) {
+        
+        if (occurrence == null) return false;
+        
+        String methodCall = occurrence.getImage();      
+        String[] methodNames = methodNames();
+        
+        for (int i=0; i<methodNames.length; i++) {
+            if (methodCall.indexOf(methodNames[i]) != -1) return true;
+        }
+        return false;
+    }
+        
+    /**
+     * Returns whether the value argument is a single character string.
+     * 
+     * @param value String
+     * @return boolean
+     */
+    public static boolean isSingleCharAsString(String value) {
+        return value.length() == 3 && value.charAt(0) == '\""';
+    }
+    
+    /**
+     * Method visit.
+     * @param node ASTVariableDeclaratorId
+     * @param data Object
+     * @return Object
+     * @see net.sourceforge.pmd.ast.JavaParserVisitor#visit(ASTVariableDeclaratorId, Object)
+     */
+    public Object visit(ASTVariableDeclaratorId node, Object data) {
+        
+        if (!node.getNameDeclaration().getTypeImage().equals(targetTypename())) {
+            return data;
+        }
+        
+        for (Iterator i = node.getUsages().iterator(); i.hasNext();) {
+            NameOccurrence occ = (NameOccurrence) i.next();
+            if (isNotedMethod(occ.getNameForWhichThisIsAQualifier())) {
+                SimpleNode parent = (SimpleNode)occ.getLocation().jjtGetParent().jjtGetParent();
+                if (parent instanceof ASTPrimaryExpression) {
+                    // bail out if it's something like indexOf(""a"" + ""b"")
+                    List additives = parent.findChildrenOfType(ASTAdditiveExpression.class);
+                    if (!additives.isEmpty()) {
+                        return data;
+                    }
+                    List literals = parent.findChildrenOfType(ASTLiteral.class);
+                    for (int l=0; l<literals.size(); l++) {
+                        ASTLiteral literal = (ASTLiteral)literals.get(l);
+                        if (isViolationArgument(l, literal.getImage())) {
+                            addViolation(data, occ.getLocation());
+                        }
+                    }
+                }
+            }
+        }
+        return data;
+    }
+}
+
diff --git a/pmd/src/net/sourceforge/pmd/rules/strings/UseIndexOfChar.java b/pmd/src/net/sourceforge/pmd/rules/strings/UseIndexOfChar.java
index e928d2d1725..c298736d892 100644
--- a/pmd/src/net/sourceforge/pmd/rules/strings/UseIndexOfChar.java
+++ b/pmd/src/net/sourceforge/pmd/rules/strings/UseIndexOfChar.java
@@ -1,44 +1,43 @@
 package net.sourceforge.pmd.rules.strings;
 
-import net.sourceforge.pmd.AbstractRule;
-import net.sourceforge.pmd.ast.ASTAdditiveExpression;
-import net.sourceforge.pmd.ast.ASTLiteral;
-import net.sourceforge.pmd.ast.ASTPrimaryExpression;
-import net.sourceforge.pmd.ast.ASTVariableDeclaratorId;
-import net.sourceforge.pmd.ast.SimpleNode;
-import net.sourceforge.pmd.symboltable.NameOccurrence;
+import net.sourceforge.pmd.rules.AbstractPoorMethodCall;
 
-import java.util.Iterator;
-import java.util.List;
+/**
+ */
+public class UseIndexOfChar extends AbstractPoorMethodCall {
 
-public class UseIndexOfChar extends AbstractRule {
-    public Object visit(ASTVariableDeclaratorId node, Object data) {
-        if (!node.getNameDeclaration().getTypeImage().equals(""String"")) {
-            return data;
-        }
-        for (Iterator i = node.getUsages().iterator(); i.hasNext();) {
-            NameOccurrence occ = (NameOccurrence) i.next();
-            if (occ.getNameForWhichThisIsAQualifier() != null &&
-                (occ.getNameForWhichThisIsAQualifier().getImage().indexOf(""indexOf"") != -1 ||
-                occ.getNameForWhichThisIsAQualifier().getImage().indexOf(""lastIndexOf"") != -1)) {
-                SimpleNode parent = (SimpleNode)occ.getLocation().jjtGetParent().jjtGetParent();
-                if (parent instanceof ASTPrimaryExpression) {
-                    // bail out if it's something like indexOf(""a"" + ""b"")
-                    List additives = parent.findChildrenOfType(ASTAdditiveExpression.class);
-                    if (!additives.isEmpty()) {
-                        return data;
-                    }
-                    List literals = parent.findChildrenOfType(ASTLiteral.class);
-                    for (Iterator j = literals.iterator(); j.hasNext();) {
-                        ASTLiteral literal = (ASTLiteral)j.next();
-                        if (literal.getImage().length() == 3 && literal.getImage().charAt(0) == '\""') {
-                            addViolation(data, occ.getLocation());
-                        }
-                    }
-                }
-            }
-        }
-        return data;
+    private static final String targetTypeName = ""String"";
+    private static final String[] methodNames = new String[] { ""indexOf"", ""lastIndexOf"" };
+    
+    public UseIndexOfChar() {
+        super();
+    }
+
+    /**
+     * Method targetTypeName.
+     * @return String
+     */
+    protected String targetTypename() { 
+        return targetTypeName;
+    }
+
+    /**
+     * Method methodNames.
+     * @return String[]
+     */
+    protected String[] methodNames() {
+        return methodNames;
+    }
+
+    /**
+     * Method isViolationArgument.
+     * @param argIndex int
+     * @param arg String
+     * @return boolean
+     */
+    protected boolean isViolationArgument(int argIndex, String arg) {
+        
+        return isSingleCharAsString(arg);
     }
-}
 
+}
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 5f1e1b78526..30beee2044e 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -105,7 +105,7 @@
             <li>Raja Rajan - 2 bug reports for CompareObjectswithEquals</li>
             <li>Jeff Chamblee - suggested better message for UnnecessaryCaseChange, bug report for CompareObjectsWithEquals</li>
             <li>Dave Brosius - suggested MisleadingVariableName rule, a couple of nice patches to clean up some string handling inefficiencies, non-static class usages, and unclosed streams/readers - found with Findbugs, I daresay :-)</li>
-            <li>Brian Remedios - code improvements to Eclipse plugin</li>
+            <li>Brian Remedios - code improvements to Eclipse plugin, Created AbstractPoorMethodCall & Refactored UseIndexOfChar</li>
             <li>Chris Grindstaff - fixed SWTException when Eclipse plugin is run on a file with syntax error</li>
             <li>Eduard Naum - fixed JDK 1.3 runtime problems in Eclipse plugin</li>
             <li>Jacques Lebourgeois - fix for UTF8 characters in Eclipse plugin</li>"
21760a8b6b030233d4a82d8026bc9910e0a93ea5,spring-framework,Provide alternative message code resolver styles--Introduce new 'style' property to DefaultMessageCodesResolver allowing-for alternative message styles. Current styles are PREFIX_ERROR_CODE-and POSTFIX_ERROR_CODE. The default style retains existing behavior.--Issue: SPR-9707-,a,https://github.com/spring-projects/spring-framework,"diff --git a/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
index ad282eb1d19c..44d8b65c720c 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,18 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.util.StringUtils;
 
 /**
  * Default implementation of the {@link MessageCodesResolver} interface.
  *
- * <p>Will create two message codes for an object error, in the following order:
+ * <p>Will create two message codes for an object error, in the following order (when
+ * using the {@link Style#PREFIX_ERROR_CODE prefixed} {@link #setStyle(Style) style}):
  * <ul>
  * <li>1.: code + ""."" + object name
  * <li>2.: code
@@ -68,11 +72,16 @@
  * <li>7. try ""typeMismatch""
  * </ul>
  *
+ * <p>By default the {@code errorCode}s will be placed at the beginning of constructed
+ * message strings.  The {@link #setStyle(Style) style} property can be used to specify
+ * alternative {@link Style styles} of concatination.
+ *
  * <p>In order to group all codes into a specific category within your resource bundles,
  * e.g. ""validation.typeMismatch.name"" instead of the default ""typeMismatch.name"",
  * consider specifying a {@link #setPrefix prefix} to be applied.
  *
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 1.0.1
  */
 @SuppressWarnings(""serial"")
@@ -83,9 +92,13 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
 	 */
 	public static final String CODE_SEPARATOR = ""."";
 
+	private static final Style DEFAULT_STYLE = Style.PREFIX_ERROR_CODE;
+
 
 	private String prefix = """";
 
+	private Style style = DEFAULT_STYLE;
+
 
 	/**
 	 * Specify a prefix to be applied to any code built by this resolver.
@@ -96,6 +109,14 @@ public void setPrefix(String prefix) {
 		this.prefix = (prefix != null ? prefix : """");
 	}
 
+	/**
+	 * Specify the style of message code that will be built by this resolver.
+	 * <p>Default is {@link Style#PREFIX_ERROR_CODE}.
+	 */
+	public void setStyle(Style style) {
+		this.style = (style == null ? DEFAULT_STYLE : style);
+	}
+
 	/**
 	 * Return the prefix to be applied to any code built by this resolver.
 	 * <p>Returns an empty String in case of no prefix.
@@ -106,9 +127,7 @@ protected String getPrefix() {
 
 
 	public String[] resolveMessageCodes(String errorCode, String objectName) {
-		return new String[] {
-				postProcessMessageCode(errorCode + CODE_SEPARATOR + objectName),
-				postProcessMessageCode(errorCode)};
+		return resolveMessageCodes(errorCode, objectName, """", null);
 	}
 
 	/**
@@ -121,26 +140,54 @@ public String[] resolveMessageCodes(String errorCode, String objectName) {
 	 * @return the list of codes
 	 */
 	public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class<?> fieldType) {
-		List<String> codeList = new ArrayList<String>();
+		Set<String> codeList = new LinkedHashSet<String>();
 		List<String> fieldList = new ArrayList<String>();
 		buildFieldList(field, fieldList);
-		for (String fieldInList : fieldList) {
-			codeList.add(postProcessMessageCode(errorCode + CODE_SEPARATOR + objectName + CODE_SEPARATOR + fieldInList));
-		}
+		addCodes(codeList, errorCode, objectName, fieldList);
 		int dotIndex = field.lastIndexOf('.');
 		if (dotIndex != -1) {
 			buildFieldList(field.substring(dotIndex + 1), fieldList);
 		}
-		for (String fieldInList : fieldList) {
-			codeList.add(postProcessMessageCode(errorCode + CODE_SEPARATOR + fieldInList));
-		}
+		addCodes(codeList, errorCode, null, fieldList);
 		if (fieldType != null) {
-			codeList.add(postProcessMessageCode(errorCode + CODE_SEPARATOR + fieldType.getName()));
+			addCode(codeList, errorCode, null, fieldType.getName());
 		}
-		codeList.add(postProcessMessageCode(errorCode));
+		addCode(codeList, errorCode, null, null);
 		return StringUtils.toStringArray(codeList);
 	}
 
+	private void addCodes(Collection<String> codeList, String errorCode, String objectName, Iterable<String> fields) {
+		for (String field : fields) {
+			addCode(codeList, errorCode, objectName, field);
+		}
+	}
+
+	private void addCode(Collection<String> codeList, String errorCode, String objectName, String field) {
+		String code = getCode(errorCode, objectName, field);
+		codeList.add(postProcessMessageCode(code));
+	}
+
+	private String getCode(String errorCode, String objectName, String field) {
+		switch (this.style) {
+			case PREFIX_ERROR_CODE:
+				return toDelimitedString(errorCode, objectName, field);
+			case POSTFIX_ERROR_CODE:
+				return toDelimitedString(objectName, field, errorCode);
+		}
+		throw new IllegalStateException(""Unknown style "" + this.style);
+	}
+
+	private String toDelimitedString(String... elements) {
+		StringBuilder rtn = new StringBuilder();
+		for (String element : elements) {
+			if(StringUtils.hasLength(element)) {
+				rtn.append(rtn.length() == 0 ? """" : CODE_SEPARATOR);
+				rtn.append(element);
+			}
+		}
+		return rtn.toString();
+	}
+
 	/**
 	 * Add both keyed and non-keyed entries for the supplied <code>field</code>
 	 * to the supplied field list.
@@ -173,4 +220,23 @@ protected String postProcessMessageCode(String code) {
 		return getPrefix() + code;
 	}
 
+
+	/**
+	 * The various styles that can be used to construct message codes.
+	 */
+	public static enum Style {
+
+		/**
+		 * Prefix the error code at the beginning of the generated message code. eg:
+		 * {@code errorCode + ""."" + object name + ""."" + field}
+		 */
+		PREFIX_ERROR_CODE,
+
+		/**
+		 * Postfix the error code at the end of the generated message code. eg:
+		 * {@code object name + ""."" + field + ""."" + errorCode}
+		 */
+		POSTFIX_ERROR_CODE
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
index 33083409ae6e..18bb109b5a32 100644
--- a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
@@ -22,6 +22,7 @@
 
 import org.junit.Test;
 import org.springframework.beans.TestBean;
+import org.springframework.validation.DefaultMessageCodesResolver.Style;
 
 /**
  * Tests for {@link DefaultMessageCodesResolver}.
@@ -119,5 +120,26 @@ public void shouldSupportNullFieldType() throws Exception {
 				""errorCode.objectName.field"",
 				""errorCode.field"",
 				""errorCode"" })));
-		}
+	}
+
+	@Test
+	public void shouldSupportPostfixStyle() throws Exception {
+		resolver.setStyle(Style.POSTFIX_ERROR_CODE);
+		String[] codes = resolver.resolveMessageCodes(""errorCode"", ""objectName"");
+		assertThat(codes, is(equalTo(new String[] {
+				""objectName.errorCode"",
+				""errorCode"" })));
+	}
+
+	@Test
+	public void shouldSupportFieldPostfixStyle() throws Exception {
+		resolver.setStyle(Style.POSTFIX_ERROR_CODE);
+		String[] codes = resolver.resolveMessageCodes(""errorCode"", ""objectName"", ""field"",
+				TestBean.class);
+		assertThat(codes, is(equalTo(new String[] {
+				""objectName.field.errorCode"",
+				""field.errorCode"",
+				""org.springframework.beans.TestBean.errorCode"",
+				""errorCode"" })));
+	}
 }"
a3ecc3b910aa3bbc3ede2b8ba1bd040d02a26ca8,hadoop,HDFS-4733. Make HttpFS username pattern- configurable. Contributed by Alejandro Abdelnur.--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477241 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hadoop,"diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
index d217322b6ae89..1410b8b8cdfce 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
@@ -193,7 +193,7 @@ public static class DoAsParam extends StringParam {
      * Constructor.
      */
     public DoAsParam() {
-      super(NAME, null, UserProvider.USER_PATTERN);
+      super(NAME, null, UserProvider.getUserPattern());
     }
 
     /**
@@ -248,7 +248,7 @@ public static class GroupParam extends StringParam {
      * Constructor.
      */
     public GroupParam() {
-      super(NAME, null, UserProvider.USER_PATTERN);
+      super(NAME, null, UserProvider.getUserPattern());
     }
 
   }
@@ -344,7 +344,7 @@ public static class OwnerParam extends StringParam {
      * Constructor.
      */
     public OwnerParam() {
-      super(NAME, null, UserProvider.USER_PATTERN);
+      super(NAME, null, UserProvider.getUserPattern());
     }
 
   }
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
index 440d7c9702b0c..f8e53d4bb3adf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
@@ -24,6 +24,7 @@
 import org.apache.hadoop.lib.server.ServerException;
 import org.apache.hadoop.lib.service.FileSystemAccess;
 import org.apache.hadoop.lib.servlet.ServerWebApp;
+import org.apache.hadoop.lib.wsrs.UserProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -102,6 +103,9 @@ public void init() throws ServerException {
     LOG.info(""Connects to Namenode [{}]"",
              get().get(FileSystemAccess.class).getFileSystemConfiguration().
                get(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY));
+    String userPattern = getConfig().get(UserProvider.USER_PATTERN_KEY, 
+      UserProvider.USER_PATTERN_DEFAULT);
+    UserProvider.setUserPattern(userPattern);
   }
 
   /**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
index fd59b19dc3443..cd1cfc7f4ef27 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
@@ -41,12 +41,27 @@ public class UserProvider extends AbstractHttpContextInjectable<Principal> imple
 
   public static final String USER_NAME_PARAM = ""user.name"";
 
-  public static final Pattern USER_PATTERN = Pattern.compile(""^[A-Za-z_][A-Za-z0-9._-]*[$]?$"");
+
+  public static final String USER_PATTERN_KEY 
+    = ""httpfs.user.provider.user.pattern"";
+
+  public static final String USER_PATTERN_DEFAULT 
+    = ""^[A-Za-z_][A-Za-z0-9._-]*[$]?$"";
+
+  private static Pattern userPattern = Pattern.compile(USER_PATTERN_DEFAULT);
+
+  public static void setUserPattern(String pattern) {
+    userPattern = Pattern.compile(pattern);
+  }
+
+  public static Pattern getUserPattern() {
+    return userPattern;
+  }
 
   static class UserParam extends StringParam {
 
     public UserParam(String user) {
-      super(USER_NAME_PARAM, user, USER_PATTERN);
+      super(USER_NAME_PARAM, user, getUserPattern());
     }
 
     @Override
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml
index 7171d388fe9ee..87cd73020d151 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml
@@ -226,4 +226,12 @@
     </description>
   </property>
 
+  <property>
+    <name>httpfs.user.provider.user.pattern</name>
+    <value>^[A-Za-z_][A-Za-z0-9._-]*[$]?$</value>
+    <description>
+      Valid pattern for user and group names, it must be a valid java regex.
+    </description>
+  </property>
+
 </configuration>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java
new file mode 100644
index 0000000000000..e8407fc30cd80
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java
@@ -0,0 +1,94 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.fs.http.server;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.http.client.HttpFSKerberosAuthenticator;
+import org.apache.hadoop.lib.server.Service;
+import org.apache.hadoop.lib.server.ServiceException;
+import org.apache.hadoop.lib.service.Groups;
+import org.apache.hadoop.lib.wsrs.UserProvider;
+import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
+import org.apache.hadoop.security.authentication.server.AuthenticationToken;
+import org.apache.hadoop.security.authentication.util.Signer;
+import org.apache.hadoop.test.HFSTestCase;
+import org.apache.hadoop.test.HadoopUsersConfTestHelper;
+import org.apache.hadoop.test.TestDir;
+import org.apache.hadoop.test.TestDirHelper;
+import org.apache.hadoop.test.TestHdfs;
+import org.apache.hadoop.test.TestHdfsHelper;
+import org.apache.hadoop.test.TestJetty;
+import org.apache.hadoop.test.TestJettyHelper;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.List;
+
+public class TestHttpFSCustomUserName extends HFSTestCase {
+
+  @Test
+  @TestDir
+  @TestJetty
+  public void defaultUserName() throws Exception {
+    String dir = TestDirHelper.getTestDir().getAbsolutePath();
+
+    Configuration httpfsConf = new Configuration(false);
+    HttpFSServerWebApp server = 
+      new HttpFSServerWebApp(dir, dir, dir, dir, httpfsConf);
+    server.init();
+    Assert.assertEquals(UserProvider.USER_PATTERN_DEFAULT, 
+      UserProvider.getUserPattern().pattern());
+    server.destroy();
+  }
+
+  @Test
+  @TestDir
+  @TestJetty
+  public void customUserName() throws Exception {
+    String dir = TestDirHelper.getTestDir().getAbsolutePath();
+
+    Configuration httpfsConf = new Configuration(false);
+    httpfsConf.set(UserProvider.USER_PATTERN_KEY, ""1"");
+    HttpFSServerWebApp server =
+      new HttpFSServerWebApp(dir, dir, dir, dir, httpfsConf);
+    server.init();
+    Assert.assertEquals(""1"", UserProvider.getUserPattern().pattern());
+    server.destroy();
+  }
+
+}
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
index 694e8dc3185bd..e8942fbe4ef75 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
@@ -104,34 +104,39 @@ public void getters() {
   @Test
   @TestException(exception = IllegalArgumentException.class)
   public void userNameEmpty() {
-    UserProvider.UserParam userParam = new UserProvider.UserParam(""username"");
-    userParam.parseParam("""");
+    new UserProvider.UserParam("""");
   }
 
   @Test
   @TestException(exception = IllegalArgumentException.class)
   public void userNameInvalidStart() {
-    UserProvider.UserParam userParam = new UserProvider.UserParam(""username"");
-    userParam.parseParam(""1x"");
+    new UserProvider.UserParam(""1x"");
   }
 
   @Test
   @TestException(exception = IllegalArgumentException.class)
   public void userNameInvalidDollarSign() {
-    UserProvider.UserParam userParam = new UserProvider.UserParam(""username"");
-    userParam.parseParam(""1$x"");
+    new UserProvider.UserParam(""1$x"");
   }
 
   @Test
   public void userNameMinLength() {
-    UserProvider.UserParam userParam = new UserProvider.UserParam(""username"");
-    assertNotNull(userParam.parseParam(""a""));
+    new UserProvider.UserParam(""a"");
   }
 
   @Test
   public void userNameValidDollarSign() {
-    UserProvider.UserParam userParam = new UserProvider.UserParam(""username"");
-    assertNotNull(userParam.parseParam(""a$""));
+    new UserProvider.UserParam(""a$"");
+  }
+
+  @Test
+  public void customUserPattern() {
+    try {
+      UserProvider.setUserPattern(""1"");
+      new UserProvider.UserParam(""1"");      
+    } finally {
+      UserProvider.setUserPattern(UserProvider.USER_PATTERN_DEFAULT);
+    }
   }
 
 }"
5fee1b116bcd427168f1fafc7948c2e44520cc5c,intellij-community,PY-16335 Preserve formatting of converted- collection literals--,c,https://github.com/JetBrains/intellij-community,"diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/PyBaseConvertCollectionLiteralIntention.java b/python/src/com/jetbrains/python/codeInsight/intentions/PyBaseConvertCollectionLiteralIntention.java
index 0ac0409edf1f4..daa669af001e3 100644
--- a/python/src/com/jetbrains/python/codeInsight/intentions/PyBaseConvertCollectionLiteralIntention.java
+++ b/python/src/com/jetbrains/python/codeInsight/intentions/PyBaseConvertCollectionLiteralIntention.java
@@ -98,16 +98,17 @@ public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws
       replacedElement = literal;
     }
 
+    final String innerText = stripLiteralBraces(replacedElement);
     final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
     final PyExpression newLiteral = elementGenerator.createExpressionFromText(LanguageLevel.forElement(file),
-                                                                              myLeftBrace + stripLiteralBraces(literal) + myRightBrace);
+                                                                              myLeftBrace + innerText + myRightBrace);
     replacedElement.replace(newLiteral);
   }
 
   @NotNull
-  private static String stripLiteralBraces(@NotNull PySequenceExpression literal) {
+  private static String stripLiteralBraces(@NotNull PsiElement literal) {
     if (literal instanceof PyTupleExpression) {
-      return literal.getText().trim();
+      return literal.getText();
     }
 
     final PsiElement firstChild = literal.getFirstChild();
@@ -130,7 +131,7 @@ private static String stripLiteralBraces(@NotNull PySequenceExpression literal)
       contentEndOffset = replacedText.length();
     }
 
-    return literal.getText().substring(contentStartOffset, contentEndOffset).trim();
+    return literal.getText().substring(contentStartOffset, contentEndOffset);
   }
 
   @Nullable
diff --git a/python/testData/intentions/PyConvertCollectionLiteralIntentionTest/convertLiteralPreservesFormattingAndComments.py b/python/testData/intentions/PyConvertCollectionLiteralIntentionTest/convertLiteralPreservesFormattingAndComments.py
new file mode 100644
index 0000000000000..0c688956c9b78
--- /dev/null
+++ b/python/testData/intentions/PyConvertCollectionLiteralIntentionTest/convertLiteralPreservesFormattingAndComments.py
@@ -0,0 +1,4 @@
+xs = (<caret>
+    1, 2,  # comment 1
+    3  # comment 2
+)
\ No newline at end of file
diff --git a/python/testData/intentions/PyConvertCollectionLiteralIntentionTest/convertLiteralPreservesFormattingAndComments_after.py b/python/testData/intentions/PyConvertCollectionLiteralIntentionTest/convertLiteralPreservesFormattingAndComments_after.py
new file mode 100644
index 0000000000000..adccc398ae06a
--- /dev/null
+++ b/python/testData/intentions/PyConvertCollectionLiteralIntentionTest/convertLiteralPreservesFormattingAndComments_after.py
@@ -0,0 +1,4 @@
+xs = [
+    1, 2,  # comment 1
+    3  # comment 2
+]
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/intentions/PyConvertCollectionLiteralIntentionTest.java b/python/testSrc/com/jetbrains/python/intentions/PyConvertCollectionLiteralIntentionTest.java
index 0e50c05e8d1f3..7b10e2bd57cf1 100644
--- a/python/testSrc/com/jetbrains/python/intentions/PyConvertCollectionLiteralIntentionTest.java
+++ b/python/testSrc/com/jetbrains/python/intentions/PyConvertCollectionLiteralIntentionTest.java
@@ -103,4 +103,9 @@ public void testConvertSetWithoutClosingBraceToTuple() {
   public void testConvertSetToList() {
     doIntentionTest(CONVERT_SET_TO_LIST);
   }
+
+  // PY-16335
+  public void testConvertLiteralPreservesFormattingAndComments() {
+    doIntentionTest(CONVERT_TUPLE_TO_LIST);
+  }
 }"
1f363c2f0b1d5ee8cb7501a2a7a8994349724cc6,apache$hama,"Improve message buffering to save memory
git-svn-id: https://svn.apache.org/repos/asf/incubator/hama/trunk@1331732 13f79535-47bb-0310-9956-ffa450edef68
",p,https://github.com/apache/hama,"diff --git a/CHANGES.txt b/CHANGES.txt
index ae4bd86f0..b430dddbb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@ Release 0.5 - April 10, 2012
 
   IMPROVEMENTS
 
+    HAMA-521: Improve message buffering to save memory (Thomas Jungblut via edwardyoon)
     HAMA-494: Remove hard-coded webapp path in HttpServer (edwardyoon)
     HAMA-562: Record Reader/Writer objects should be initialized (edwardyoon)
     HAMA-555: Separate bin and src distributions (edwardyoon)
diff --git a/conf/hama-default.xml b/conf/hama-default.xml
index 12fcdc306..f204ab861 100644
--- a/conf/hama-default.xml
+++ b/conf/hama-default.xml
@@ -80,6 +80,11 @@
     <value>/tmp/hama-${user.name}</value>
     <description>Temporary directory on the local filesystem.</description>
   </property>
+  <property>
+    <name>bsp.disk.queue.dir</name>
+    <value>${hama.tmp.dir}/messages/</value>
+    <description>Temporary directory on the local message buffer on disk.</description>
+  </property>
   <property>
     <name>bsp.child.java.opts</name>
     <value>-Xmx512m</value>
diff --git a/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java b/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
index abd0801f9..8c8213557 100644
--- a/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
+++ b/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map.Entry;
 
 import org.apache.commons.logging.Log;
@@ -37,6 +36,7 @@
 import org.apache.hama.bsp.Counters.Counter;
 import org.apache.hama.bsp.message.MessageManager;
 import org.apache.hama.bsp.message.MessageManagerFactory;
+import org.apache.hama.bsp.message.MessageQueue;
 import org.apache.hama.bsp.sync.SyncClient;
 import org.apache.hama.bsp.sync.SyncException;
 import org.apache.hama.bsp.sync.SyncServiceFactory;
@@ -165,7 +165,7 @@ public BSPPeerImpl(BSPJob job, Configuration conf, TaskAttemptID taskId,
         TaskStatus.Phase.STARTING, counters));
 
     messenger = MessageManagerFactory.getMessageManager(conf);
-    messenger.init(this, conf, peerAddress);
+    messenger.init(taskId, this, conf, peerAddress);
 
     final String combinerName = conf.get(""bsp.combiner.class"");
     if (combinerName != null) {
@@ -294,7 +294,9 @@ public final void sync() throws IOException, SyncException,
       InterruptedException {
     long startBarrier = System.currentTimeMillis();
     enterBarrier();
-    Iterator<Entry<InetSocketAddress, LinkedList<M>>> it = messenger
+    // normally all messages should been send now, finalizing the send phase
+    messenger.finishSendPhase();
+    Iterator<Entry<InetSocketAddress, MessageQueue<M>>> it = messenger
         .getMessageIterator();
 
     boolean shouldCheckPoint = false;
@@ -304,7 +306,7 @@ public final void sync() throws IOException, SyncException,
     }
 
     while (it.hasNext()) {
-      Entry<InetSocketAddress, LinkedList<M>> entry = it.next();
+      Entry<InetSocketAddress, MessageQueue<M>> entry = it.next();
       final InetSocketAddress addr = entry.getKey();
       final Iterable<M> messages = entry.getValue();
 
@@ -357,16 +359,33 @@ protected final void leaveBarrier() throws SyncException {
 
   public final void close() throws SyncException, IOException,
       InterruptedException {
+    // there are many catches, because we want to close always every component
+    // even if the one before failed.
     if (in != null) {
-      in.close();
+      try {
+        in.close();
+      } catch (Exception e) {
+        LOG.error(e);
+      }
     }
     if (outWriter != null) {
-      outWriter.close();
+      try {
+        outWriter.close();
+      } catch (Exception e) {
+        LOG.error(e);
+      }
     }
     this.clear();
-    syncClient.close();
-
-    messenger.close();
+    try {
+      syncClient.close();
+    } catch (Exception e) {
+      LOG.error(e);
+    }
+    try {
+      messenger.close();
+    } catch (Exception e) {
+      LOG.error(e);
+    }
   }
 
   @Override
diff --git a/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java b/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java
index c773c9d88..f3b17ce5c 100644
--- a/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java
+++ b/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java
@@ -45,8 +45,10 @@
 import org.apache.hama.HamaConfiguration;
 import org.apache.hama.bsp.BSPJobClient.RawSplit;
 import org.apache.hama.bsp.BSPMaster.State;
+import org.apache.hama.bsp.message.MemoryQueue;
 import org.apache.hama.bsp.message.MessageManager;
 import org.apache.hama.bsp.message.MessageManagerFactory;
+import org.apache.hama.bsp.message.MessageQueue;
 import org.apache.hama.bsp.sync.SyncClient;
 import org.apache.hama.bsp.sync.SyncException;
 import org.apache.hama.bsp.sync.SyncServiceFactory;
@@ -332,14 +334,15 @@ public static class LocalMessageManager<M extends Writable> implements
     @SuppressWarnings(""rawtypes"")
     private static final ConcurrentHashMap<InetSocketAddress, LocalMessageManager> managerMap = new ConcurrentHashMap<InetSocketAddress, LocalBSPRunner.LocalMessageManager>();
 
-    private final HashMap<InetSocketAddress, LinkedList<M>> localOutgoingMessages = new HashMap<InetSocketAddress, LinkedList<M>>();
+    private final HashMap<InetSocketAddress, MessageQueue<M>> localOutgoingMessages = new HashMap<InetSocketAddress, MessageQueue<M>>();
     private static final ConcurrentHashMap<String, InetSocketAddress> socketCache = new ConcurrentHashMap<String, InetSocketAddress>();
     private final LinkedBlockingDeque<M> localIncomingMessages = new LinkedBlockingDeque<M>();
 
     private BSPPeer<?, ?, ?, ?, M> peer;
 
     @Override
-    public void init(BSPPeer<?, ?, ?, ?, M> peer, Configuration conf, InetSocketAddress peerAddress) {
+    public void init(TaskAttemptID attemptId, BSPPeer<?, ?, ?, ?, M> peer,
+        Configuration conf, InetSocketAddress peerAddress) {
       this.peer = peer;
       managerMap.put(peerAddress, this);
     }
@@ -365,9 +368,9 @@ public void send(String peerName, M msg) throws IOException {
         inetSocketAddress = BSPNetUtils.getAddress(peerName);
         socketCache.put(peerName, inetSocketAddress);
       }
-      LinkedList<M> msgs = localOutgoingMessages.get(inetSocketAddress);
+      MessageQueue<M> msgs = localOutgoingMessages.get(inetSocketAddress);
       if (msgs == null) {
-        msgs = new LinkedList<M>();
+        msgs = new MemoryQueue<M>();
       }
       msgs.add(msg);
       peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_SENT, 1L);
@@ -380,12 +383,13 @@ public void transfer(InetSocketAddress addr, BSPMessageBundle<M> bundle)
         throws IOException {
       for (M value : bundle.getMessages()) {
         managerMap.get(addr).localIncomingMessages.add(value);
-        peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED, 1L);
+        peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED,
+            1L);
       }
     }
 
     @Override
-    public Iterator<Entry<InetSocketAddress, LinkedList<M>>> getMessageIterator() {
+    public Iterator<Entry<InetSocketAddress, MessageQueue<M>>> getMessageIterator() {
       return localOutgoingMessages.entrySet().iterator();
     }
 
@@ -399,6 +403,12 @@ public int getNumCurrentMessages() {
       return localIncomingMessages.size();
     }
 
+    @Override
+    public void finishSendPhase() throws IOException {
+      // TODO Auto-generated method stub
+
+    }
+
   }
 
   public static class LocalUmbilical implements BSPPeerProtocol {
diff --git a/core/src/main/java/org/apache/hama/bsp/message/AbstractMessageManager.java b/core/src/main/java/org/apache/hama/bsp/message/AbstractMessageManager.java
new file mode 100644
index 000000000..509a66b03
--- /dev/null
+++ b/core/src/main/java/org/apache/hama/bsp/message/AbstractMessageManager.java
@@ -0,0 +1,160 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp.message;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hama.bsp.BSPPeer;
+import org.apache.hama.bsp.BSPPeerImpl;
+import org.apache.hama.bsp.TaskAttemptID;
+import org.apache.hama.util.BSPNetUtils;
+
+public abstract class AbstractMessageManager<M extends Writable> implements
+    MessageManager<M>, Configurable {
+
+  private static final Log LOG = LogFactory
+      .getLog(AbstractMessageManager.class);
+
+  // conf is injected via reflection of the factory
+  protected Configuration conf;
+  protected final HashMap<String, InetSocketAddress> peerSocketCache = new HashMap<String, InetSocketAddress>();
+  protected final HashMap<InetSocketAddress, MessageQueue<M>> outgoingQueues = new HashMap<InetSocketAddress, MessageQueue<M>>();
+  protected MessageQueue<M> localQueue;
+  // this must be a synchronized implementation: this is accessed per RPC
+  protected SynchronizedQueue<M> localQueueForNextIteration;
+  protected BSPPeer<?, ?, ?, ?, M> peer;
+  // the peer address of this peer
+  protected InetSocketAddress peerAddress;
+  // the task attempt id
+  protected TaskAttemptID attemptId;
+
+  @Override
+  public void init(TaskAttemptID attemptId, BSPPeer<?, ?, ?, ?, M> peer,
+      Configuration conf, InetSocketAddress peerAddress) {
+    this.attemptId = attemptId;
+    this.peer = peer;
+    this.conf = conf;
+    this.peerAddress = peerAddress;
+    localQueue = getQueue();
+    localQueue.init(conf, attemptId);
+    localQueueForNextIteration = getSynchronizedQueue();
+    localQueueForNextIteration.init(conf, attemptId);
+  }
+
+  @Override
+  public void close() {
+    Collection<MessageQueue<M>> values = outgoingQueues.values();
+    for (MessageQueue<M> msgQueue : values) {
+      msgQueue.close();
+    }
+    localQueue.close();
+  }
+
+  @Override
+  public void finishSendPhase() throws IOException {
+    Collection<MessageQueue<M>> values = outgoingQueues.values();
+    for (MessageQueue<M> msgQueue : values) {
+      msgQueue.prepareRead();
+    }
+  }
+
+  @Override
+  public final M getCurrentMessage() throws IOException {
+    return localQueue.poll();
+  }
+
+  @Override
+  public final int getNumCurrentMessages() {
+    return localQueue.size();
+  }
+
+  @Override
+  public final void clearOutgoingQueues() {
+    this.outgoingQueues.clear();
+    localQueueForNextIteration.prepareRead();
+    localQueue.prepareWrite();
+    localQueue.addAll(localQueueForNextIteration.getMessageQueue());
+    localQueue.prepareRead();
+    localQueueForNextIteration.clear();
+  }
+
+  @Override
+  public void send(String peerName, M msg) throws IOException {
+    LOG.debug(""Send message ("" + msg.toString() + "") to "" + peerName);
+    InetSocketAddress targetPeerAddress = null;
+    // Get socket for target peer.
+    if (peerSocketCache.containsKey(peerName)) {
+      targetPeerAddress = peerSocketCache.get(peerName);
+    } else {
+      targetPeerAddress = BSPNetUtils.getAddress(peerName);
+      peerSocketCache.put(peerName, targetPeerAddress);
+    }
+    MessageQueue<M> queue = outgoingQueues.get(targetPeerAddress);
+    if (queue == null) {
+      queue = getQueue();
+    }
+    queue.add(msg);
+    peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_SENT, 1L);
+    outgoingQueues.put(targetPeerAddress, queue);
+  }
+
+  @Override
+  public final Iterator<Entry<InetSocketAddress, MessageQueue<M>>> getMessageIterator() {
+    return this.outgoingQueues.entrySet().iterator();
+  }
+
+  /**
+   * Returns a new queue implementation based on what was configured. If nothing
+   * has been configured for ""hama.messenger.queue.class"" then the
+   * {@link MemoryQueue} is used.
+   * 
+   * @return a <b>new</b> queue implementation.
+   */
+  protected MessageQueue<M> getQueue() {
+    Class<?> queueClass = conf.getClass(QUEUE_TYPE_CLASS, MemoryQueue.class);
+    @SuppressWarnings(""unchecked"")
+    MessageQueue<M> newInstance = (MessageQueue<M>) ReflectionUtils
+        .newInstance(queueClass, conf);
+    newInstance.init(conf, attemptId);
+    return newInstance;
+  }
+
+  protected SynchronizedQueue<M> getSynchronizedQueue() {
+    return SynchronizedQueue.synchronize(getQueue());
+  }
+
+  public final Configuration getConf() {
+    return conf;
+  }
+
+  public final void setConf(Configuration conf) {
+    this.conf = conf;
+  }
+
+}
diff --git a/core/src/main/java/org/apache/hama/bsp/message/AvroMessageManagerImpl.java b/core/src/main/java/org/apache/hama/bsp/message/AvroMessageManagerImpl.java
index 91558d14a..8f1f61592 100644
--- a/core/src/main/java/org/apache/hama/bsp/message/AvroMessageManagerImpl.java
+++ b/core/src/main/java/org/apache/hama/bsp/message/AvroMessageManagerImpl.java
@@ -24,12 +24,8 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.avro.AvroRemoteException;
 import org.apache.avro.ipc.NettyServer;
@@ -41,8 +37,8 @@
 import org.apache.hama.bsp.BSPMessageBundle;
 import org.apache.hama.bsp.BSPPeer;
 import org.apache.hama.bsp.BSPPeerImpl;
+import org.apache.hama.bsp.TaskAttemptID;
 import org.apache.hama.bsp.message.compress.BSPCompressedBundle;
-import org.apache.hama.util.BSPNetUtils;
 
 public final class AvroMessageManagerImpl<M extends Writable> extends
     CompressableMessageManager<M> implements Sender<M> {
@@ -50,39 +46,24 @@ public final class AvroMessageManagerImpl<M extends Writable> extends
   private NettyServer server = null;
 
   private final HashMap<InetSocketAddress, Sender<M>> peers = new HashMap<InetSocketAddress, Sender<M>>();
-  private final HashMap<String, InetSocketAddress> peerSocketCache = new HashMap<String, InetSocketAddress>();
-
-  private final HashMap<InetSocketAddress, LinkedList<M>> outgoingQueues = new HashMap<InetSocketAddress, LinkedList<M>>();
-  private Deque<M> localQueue = new LinkedList<M>();
-  // this must be a synchronized implementation: this is accessed per RPC
-  private final ConcurrentLinkedQueue<M> localQueueForNextIteration = new ConcurrentLinkedQueue<M>();
-
-  private BSPPeer<?, ?, ?, ?, M> peer;
 
   @Override
-  public void init(BSPPeer<?, ?, ?, ?, M> peer, Configuration conf,
-      InetSocketAddress addr) {
-    this.peer = peer;
+  public void init(TaskAttemptID attemptId, BSPPeer<?, ?, ?, ?, M> peer,
+      Configuration conf, InetSocketAddress addr) {
+    super.init(attemptId, peer, conf, addr);
     super.initCompression(conf);
     server = new NettyServer(new SpecificResponder(Sender.class, this), addr);
   }
 
   @Override
   public void close() {
+    super.close();
     server.close();
   }
 
-  @Override
-  public void clearOutgoingQueues() {
-    this.outgoingQueues.clear();
-    localQueue.addAll(localQueueForNextIteration);
-    localQueueForNextIteration.clear();
-  }
-
   public void put(BSPMessageBundle<M> messages) {
-    peer.incrementCounter(
-        BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED, messages.getMessages()
-            .size());
+    peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED,
+        messages.getMessages().size());
     Iterator<M> iterator = messages.getMessages().iterator();
     while (iterator.hasNext()) {
       this.localQueueForNextIteration.add(iterator.next());
@@ -90,11 +71,6 @@ public void put(BSPMessageBundle<M> messages) {
     }
   }
 
-  @Override
-  public int getNumCurrentMessages() {
-    return localQueue.size();
-  }
-
   @SuppressWarnings(""unchecked"")
   @Override
   public void transfer(InetSocketAddress addr, BSPMessageBundle<M> bundle)
@@ -125,42 +101,19 @@ public Void transfer(AvroBSPMessageBundle<M> messagebundle)
     return null;
   }
 
-  @Override
-  public M getCurrentMessage() throws IOException {
-    return localQueue.poll();
-  }
-
-  @Override
-  public void send(String peerName, M msg) throws IOException {
-    InetSocketAddress targetPeerAddress = null;
-    // Get socket for target peer.
-    if (peerSocketCache.containsKey(peerName)) {
-      targetPeerAddress = peerSocketCache.get(peerName);
-    } else {
-      targetPeerAddress = BSPNetUtils.getAddress(peerName);
-      peerSocketCache.put(peerName, targetPeerAddress);
-    }
-    LinkedList<M> queue = outgoingQueues.get(targetPeerAddress);
-    if (queue == null) {
-      queue = new LinkedList<M>();
-    }
-    queue.add(msg);
-    outgoingQueues.put(targetPeerAddress, queue);
-  }
-
   private final BSPMessageBundle<M> deserializeMessage(ByteBuffer buffer)
       throws IOException {
     BSPMessageBundle<M> msg = new BSPMessageBundle<M>();
     byte[] byteArray = buffer.array();
     if (compressor == null) {
-      peer.incrementCounter(
-          BSPPeerImpl.PeerCounter.MESSAGE_BYTES_RECEIVED, byteArray.length);
+      peer.incrementCounter(BSPPeerImpl.PeerCounter.MESSAGE_BYTES_RECEIVED,
+          byteArray.length);
       ByteArrayInputStream inArray = new ByteArrayInputStream(byteArray);
       DataInputStream in = new DataInputStream(inArray);
       msg.readFields(in);
     } else {
-      peer.incrementCounter(
-          BSPPeerImpl.PeerCounter.COMPRESSED_BYTES_RECEIVED, byteArray.length);
+      peer.incrementCounter(BSPPeerImpl.PeerCounter.COMPRESSED_BYTES_RECEIVED,
+          byteArray.length);
       msg = compressor.decompressBundle(new BSPCompressedBundle(byteArray));
     }
 
@@ -175,20 +128,16 @@ private final ByteBuffer serializeMessage(BSPMessageBundle<M> msg)
       msg.write(out);
       out.close();
       byte[] byteArray = outArray.toByteArray();
-      peer.incrementCounter(
-          BSPPeerImpl.PeerCounter.MESSAGE_BYTES_TRANSFERED, byteArray.length);
+      peer.incrementCounter(BSPPeerImpl.PeerCounter.MESSAGE_BYTES_TRANSFERED,
+          byteArray.length);
       return ByteBuffer.wrap(byteArray);
     } else {
       BSPCompressedBundle compMsgBundle = compressor.compressBundle(msg);
       byte[] data = compMsgBundle.getData();
-      peer.incrementCounter(
-          BSPPeerImpl.PeerCounter.COMPRESSED_BYTES_SENT, data.length);
+      peer.incrementCounter(BSPPeerImpl.PeerCounter.COMPRESSED_BYTES_SENT,
+          data.length);
       return ByteBuffer.wrap(data);
     }
   }
 
-  @Override
-  public Iterator<Entry<InetSocketAddress, LinkedList<M>>> getMessageIterator() {
-    return this.outgoingQueues.entrySet().iterator();
-  }
 }
diff --git a/core/src/main/java/org/apache/hama/bsp/message/CompressableMessageManager.java b/core/src/main/java/org/apache/hama/bsp/message/CompressableMessageManager.java
index 26d863498..269a4907c 100644
--- a/core/src/main/java/org/apache/hama/bsp/message/CompressableMessageManager.java
+++ b/core/src/main/java/org/apache/hama/bsp/message/CompressableMessageManager.java
@@ -27,8 +27,7 @@
  * 
  * @param <M>
  */
-public abstract class CompressableMessageManager<M extends Writable> implements
-    MessageManager<M> {
+public abstract class CompressableMessageManager<M extends Writable> extends AbstractMessageManager<M> {
 
   protected BSPMessageCompressor<M> compressor;
 
diff --git a/core/src/main/java/org/apache/hama/bsp/message/DiskQueue.java b/core/src/main/java/org/apache/hama/bsp/message/DiskQueue.java
new file mode 100644
index 000000000..22644ca45
--- /dev/null
+++ b/core/src/main/java/org/apache/hama/bsp/message/DiskQueue.java
@@ -0,0 +1,289 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp.message;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.io.ObjectWritable;
+import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.io.Writable;
+import org.apache.hama.bsp.TaskAttemptID;
+
+/**
+ * A disk based queue that is backed by a sequencefile. <br/>
+ * Structure is as follows: <br/>
+ * If ""bsp.disk.queue.dir"" is not defined, ""hama.tmp.dir"" will be used instead. <br/>
+ * ${hama.tmp.dir}/diskqueue/job_id/task_attempt_id/ <br/>
+ * An ongoing sequencenumber will be appended to prevent inner collisions,
+ * however the job_id dir will never be deleted. So you need a cronjob to do the
+ * cleanup for you. <br/>
+ * <b>This is currently not intended to be production ready</b>
+ */
+public final class DiskQueue<M extends Writable> implements MessageQueue<M> {
+
+  public static final String DISK_QUEUE_PATH_KEY = ""bsp.disk.queue.dir"";
+
+  private final Log LOG = LogFactory.getLog(DiskQueue.class);
+
+  private static volatile int ONGOING_SEQUENCE_NUMBER = 0;
+  private static final int MAX_RETRIES = 4;
+  private static final NullWritable NULL_WRITABLE = NullWritable.get();
+
+  private int size = 0;
+  // injected via reflection
+  private Configuration conf;
+  private FileSystem fs;
+
+  private SequenceFile.Writer writer;
+  private SequenceFile.Reader reader;
+  private Path queuePath;
+  private TaskAttemptID id;
+  private final ObjectWritable writable = new ObjectWritable();
+
+  @Override
+  public void init(Configuration conf, TaskAttemptID id) {
+    this.id = id;
+    writable.setConf(conf);
+    try {
+      fs = FileSystem.get(conf);
+      String configuredQueueDir = conf.get(DISK_QUEUE_PATH_KEY);
+      Path queueDir = null;
+      if (configuredQueueDir == null) {
+        String hamaTmpDir = conf.get(""hama.tmp.dir"");
+        if (hamaTmpDir != null) {
+          queueDir = createDiskQueuePath(id, hamaTmpDir);
+        } else {
+          // use some local tmp dir
+          queueDir = createDiskQueuePath(id, ""/tmp/messageStorage/"");
+        }
+      } else {
+        queueDir = createDiskQueuePath(id, configuredQueueDir);
+      }
+      fs.mkdirs(queueDir);
+      queuePath = new Path(queueDir, (ONGOING_SEQUENCE_NUMBER++)
+          + ""_messages.seq"");
+      prepareWrite();
+    } catch (IOException e) {
+      // we can't recover if something bad happens here..
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public void close() {
+    closeInternal(true);
+    try {
+      fs.delete(queuePath.getParent(), true);
+    } catch (IOException e) {
+      LOG.error(e);
+    }
+  }
+
+  /**
+   * Close our writer internal, basically should be called after the computation
+   * phase ended.
+   */
+  private void closeInternal(boolean delete) {
+    try {
+      if (writer != null) {
+        writer.close();
+        writer = null;
+      }
+    } catch (IOException e) {
+      LOG.error(e);
+    } finally {
+      if (fs != null && delete) {
+        try {
+          fs.delete(queuePath, true);
+        } catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+      if (writer != null) {
+        try {
+          writer.close();
+          writer = null;
+        } catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+    }
+    try {
+      if (reader != null) {
+        reader.close();
+        reader = null;
+      }
+    } catch (IOException e) {
+      LOG.error(e);
+    } finally {
+      if (reader != null) {
+        try {
+          reader.close();
+          reader = null;
+        } catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+    }
+  }
+
+  @Override
+  public void prepareRead() {
+    // make sure we've closed
+    closeInternal(false);
+    try {
+      reader = new SequenceFile.Reader(fs, queuePath, conf);
+    } catch (IOException e) {
+      // can't recover from that
+      LOG.error(e);
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public void prepareWrite() {
+    try {
+      writer = new SequenceFile.Writer(fs, conf, queuePath,
+          ObjectWritable.class, NullWritable.class);
+    } catch (IOException e) {
+      // can't recover from that
+      LOG.error(e);
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public final void addAll(Collection<M> col) {
+    for (M item : col) {
+      add(item);
+    }
+  }
+
+  @Override
+  public void addAll(MessageQueue<M> otherqueue) {
+    M poll = null;
+    while ((poll = otherqueue.poll()) != null) {
+      add(poll);
+    }
+  }
+
+  @Override
+  public final void add(M item) {
+    size++;
+    try {
+      writer.append(new ObjectWritable(item), NULL_WRITABLE);
+    } catch (IOException e) {
+      LOG.error(e);
+    }
+  }
+
+  @Override
+  public final void clear() {
+    closeInternal(true);
+    size = 0;
+    init(conf, id);
+  }
+
+  @SuppressWarnings(""unchecked"")
+  @Override
+  public final M poll() {
+    size--;
+    int tries = 1;
+    while (tries <= MAX_RETRIES) {
+      try {
+        boolean next = reader.next(writable, NULL_WRITABLE);
+        if (next) {
+          return (M) writable.get();
+        } else {
+          closeInternal(false);
+          return null;
+        }
+      } catch (IOException e) {
+        LOG.error(""Retrying for the "" + tries + ""th time!"", e);
+      }
+      tries++;
+    }
+    throw new RuntimeException(""Message couldn't be read for "" + tries
+        + "" times! Giving up!"");
+  }
+
+  @Override
+  public int size() {
+    return size;
+  }
+
+  @Override
+  public Iterator<M> iterator() {
+    return new DiskIterator();
+  }
+
+  @Override
+  public void setConf(Configuration conf) {
+    this.conf = conf;
+  }
+
+  @Override
+  public Configuration getConf() {
+    return conf;
+  }
+
+  private class DiskIterator implements Iterator<M> {
+
+    public DiskIterator() {
+      prepareRead();
+    }
+
+    @Override
+    public boolean hasNext() {
+      if (size == 0) {
+        closeInternal(false);
+      }
+      return size != 0;
+    }
+
+    @Override
+    public M next() {
+      return poll();
+    }
+
+    @Override
+    public void remove() {
+      // no-op
+    }
+
+  }
+
+  /**
+   * Creates a generic Path based on the configured path and the task attempt id
+   * to store disk sequence files. <br/>
+   * Structure is as follows: ${hama.tmp.dir}/diskqueue/job_id/task_attempt_id/
+   */
+  public static Path createDiskQueuePath(TaskAttemptID id, String configuredPath) {
+    return new Path(new Path(new Path(configuredPath, ""diskqueue""), id
+        .getJobID().toString()), id.getTaskID().toString());
+  }
+
+}
diff --git a/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java b/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
index da7339de5..cfa404d0f 100644
--- a/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
+++ b/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
@@ -19,12 +19,7 @@
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.Deque;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,8 +30,8 @@
 import org.apache.hama.bsp.BSPMessageBundle;
 import org.apache.hama.bsp.BSPPeer;
 import org.apache.hama.bsp.BSPPeerImpl;
+import org.apache.hama.bsp.TaskAttemptID;
 import org.apache.hama.bsp.message.compress.BSPCompressedBundle;
-import org.apache.hama.util.BSPNetUtils;
 import org.apache.hama.util.CompressionUtil;
 
 /**
@@ -49,22 +44,14 @@ public final class HadoopMessageManagerImpl<M extends Writable> extends
   private static final Log LOG = LogFactory
       .getLog(HadoopMessageManagerImpl.class);
 
-  private Server server = null;
-  private Configuration conf;
-
   private final HashMap<InetSocketAddress, HadoopMessageManager<M>> peers = new HashMap<InetSocketAddress, HadoopMessageManager<M>>();
-  private final HashMap<String, InetSocketAddress> peerSocketCache = new HashMap<String, InetSocketAddress>();
 
-  private final HashMap<InetSocketAddress, LinkedList<M>> outgoingQueues = new HashMap<InetSocketAddress, LinkedList<M>>();
-  private Deque<M> localQueue = new LinkedList<M>();
-  // this must be a synchronized implementation: this is accessed per RPC
-  private final ConcurrentLinkedQueue<M> localQueueForNextIteration = new ConcurrentLinkedQueue<M>();
-  private BSPPeer<?, ?, ?, ?, M> peer;
+  private Server server = null;
 
   @Override
-  public final void init(BSPPeer<?, ?, ?, ?, M> peer, Configuration conf, InetSocketAddress peerAddress) {
-    this.peer = peer;
-    this.conf = conf;
+  public final void init(TaskAttemptID attemptId, BSPPeer<?, ?, ?, ?, M> peer,
+      Configuration conf, InetSocketAddress peerAddress) {
+    super.init(attemptId, peer, conf, peerAddress);
     super.initCompression(conf);
     startRPCServer(conf, peerAddress);
   }
@@ -85,53 +72,12 @@ private final void startRPCServer(Configuration conf,
 
   @Override
   public final void close() {
+    super.close();
     if (server != null) {
       server.stop();
     }
   }
 
-  @Override
-  public final M getCurrentMessage() throws IOException {
-    return localQueue.poll();
-  }
-
-  @Override
-  public final void send(String peerName, M msg) throws IOException {
-    LOG.debug(""Send message ("" + msg.toString() + "") to "" + peerName);
-    InetSocketAddress targetPeerAddress = null;
-    // Get socket for target peer.
-    if (peerSocketCache.containsKey(peerName)) {
-      targetPeerAddress = peerSocketCache.get(peerName);
-    } else {
-      targetPeerAddress = BSPNetUtils.getAddress(peerName);
-      peerSocketCache.put(peerName, targetPeerAddress);
-    }
-    LinkedList<M> queue = outgoingQueues.get(targetPeerAddress);
-    if (queue == null) {
-      queue = new LinkedList<M>();
-    }
-    queue.add(msg);
-    peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_SENT, 1L);
-    outgoingQueues.put(targetPeerAddress, queue);
-  }
-
-  @Override
-  public final Iterator<Entry<InetSocketAddress, LinkedList<M>>> getMessageIterator() {
-    return this.outgoingQueues.entrySet().iterator();
-  }
-
-  @SuppressWarnings(""unchecked"")
-  protected final HadoopMessageManager<M> getBSPPeerConnection(
-      InetSocketAddress addr) throws IOException {
-    HadoopMessageManager<M> peer = peers.get(addr);
-    if (peer == null) {
-      peer = (HadoopMessageManager<M>) RPC.getProxy(HadoopMessageManager.class,
-          HadoopMessageManager.versionID, addr, this.conf);
-      this.peers.put(addr, peer);
-    }
-    return peer;
-  }
-
   @Override
   public final void transfer(InetSocketAddress addr, BSPMessageBundle<M> bundle)
       throws IOException {
@@ -155,18 +101,22 @@ public final void transfer(InetSocketAddress addr, BSPMessageBundle<M> bundle)
     }
   }
 
-  @Override
-  public final void clearOutgoingQueues() {
-    this.outgoingQueues.clear();
-    localQueue.addAll(localQueueForNextIteration);
-    localQueueForNextIteration.clear();
+  @SuppressWarnings(""unchecked"")
+  protected final HadoopMessageManager<M> getBSPPeerConnection(
+      InetSocketAddress addr) throws IOException {
+    HadoopMessageManager<M> peer = peers.get(addr);
+    if (peer == null) {
+      peer = (HadoopMessageManager<M>) RPC.getProxy(HadoopMessageManager.class,
+          HadoopMessageManager.versionID, addr, this.conf);
+      this.peers.put(addr, peer);
+    }
+    return peer;
   }
 
   @Override
   public final void put(M msg) {
     this.localQueueForNextIteration.add(msg);
-    peer.incrementCounter(
-        BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED, 1L);
+    peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED, 1L);
   }
 
   @Override
@@ -184,11 +134,6 @@ public final void put(BSPCompressedBundle compMsgBundle) {
     }
   }
 
-  @Override
-  public final int getNumCurrentMessages() {
-    return localQueue.size();
-  }
-
   @Override
   public final long getProtocolVersion(String arg0, long arg1)
       throws IOException {
diff --git a/core/src/main/java/org/apache/hama/bsp/message/MemoryQueue.java b/core/src/main/java/org/apache/hama/bsp/message/MemoryQueue.java
new file mode 100644
index 000000000..e38f79588
--- /dev/null
+++ b/core/src/main/java/org/apache/hama/bsp/message/MemoryQueue.java
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp.message;
+
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Writable;
+import org.apache.hama.bsp.TaskAttemptID;
+
+/**
+ * LinkedList backed queue structure for bookkeeping messages.
+ */
+public final class MemoryQueue<M extends Writable> implements MessageQueue<M> {
+
+  private final Deque<M> deque = new LinkedList<M>();
+  private Configuration conf;
+
+  @Override
+  public final void addAll(Collection<M> col) {
+    deque.addAll(col);
+  }
+
+  @Override
+  public void addAll(MessageQueue<M> otherqueue) {
+    M poll = null;
+    while ((poll = otherqueue.poll()) != null) {
+      deque.add(poll);
+    }
+  }
+
+  @Override
+  public final void add(M item) {
+    deque.add(item);
+  }
+
+  @Override
+  public final void clear() {
+    deque.clear();
+  }
+
+  @Override
+  public final M poll() {
+    return deque.poll();
+  }
+
+  @Override
+  public final int size() {
+    return deque.size();
+  }
+
+  @Override
+  public final Iterator<M> iterator() {
+    return deque.iterator();
+  }
+
+  @Override
+  public void setConf(Configuration conf) {
+    this.conf = conf;
+  }
+
+  @Override
+  public Configuration getConf() {
+    return conf;
+  }
+
+  // not doing much here
+  @Override
+  public void init(Configuration conf, TaskAttemptID id) {
+
+  }
+
+  @Override
+  public void close() {
+
+  }
+
+  @Override
+  public void prepareRead() {
+
+  }
+
+  @Override
+  public void prepareWrite() {
+    
+  }
+
+}
diff --git a/core/src/main/java/org/apache/hama/bsp/message/MessageManager.java b/core/src/main/java/org/apache/hama/bsp/message/MessageManager.java
index 45c1ff6d1..6662a5290 100644
--- a/core/src/main/java/org/apache/hama/bsp/message/MessageManager.java
+++ b/core/src/main/java/org/apache/hama/bsp/message/MessageManager.java
@@ -20,13 +20,13 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map.Entry;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Writable;
 import org.apache.hama.bsp.BSPMessageBundle;
 import org.apache.hama.bsp.BSPPeer;
+import org.apache.hama.bsp.TaskAttemptID;
 
 /**
  * This manager takes care of the messaging. It is responsible to launch a
@@ -34,15 +34,16 @@
  * 
  */
 public interface MessageManager<M extends Writable> {
+  
+  public static final String QUEUE_TYPE_CLASS = ""hama.messenger.queue.class"";
 
   /**
-   * Init can be used to start servers and initialize internal state.
+   * Init can be used to start servers and initialize internal state. If you are
+   * implementing a subclass, please call the super version of this method.
    * 
-   * @param conf
-   * @param peerAddress
    */
-  public void init(BSPPeer<?, ?, ?, ?, M> peer, Configuration conf,
-      InetSocketAddress peerAddress);
+  public void init(TaskAttemptID attemptId, BSPPeer<?, ?, ?, ?, M> peer,
+      Configuration conf, InetSocketAddress peerAddress);
 
   /**
    * Close is called after a task ran. Should be used to cleanup things e.G.
@@ -53,7 +54,6 @@ public void init(BSPPeer<?, ?, ?, ?, M> peer, Configuration conf,
   /**
    * Get the current message.
    * 
-   * @return
    * @throws IOException
    */
   public M getCurrentMessage() throws IOException;
@@ -61,25 +61,26 @@ public void init(BSPPeer<?, ?, ?, ?, M> peer, Configuration conf,
   /**
    * Send a message to the peer.
    * 
-   * @param peerName
-   * @param msg
    * @throws IOException
    */
   public void send(String peerName, M msg) throws IOException;
 
+  /**
+   * Should be called when all messages were send with send().
+   * 
+   * @throws IOException
+   */
+  public void finishSendPhase() throws IOException;
+
   /**
    * Returns an iterator of messages grouped by peer.
    * 
-   * @return
    */
-  public Iterator<Entry<InetSocketAddress, LinkedList<M>>> getMessageIterator();
+  public Iterator<Entry<InetSocketAddress, MessageQueue<M>>> getMessageIterator();
 
   /**
    * This is the real transferring to a host with a bundle.
    * 
-   * @param addr
-   * @param bundle
-   * @throws IOException
    */
   public void transfer(InetSocketAddress addr, BSPMessageBundle<M> bundle)
       throws IOException;
@@ -92,7 +93,6 @@ public void transfer(InetSocketAddress addr, BSPMessageBundle<M> bundle)
   /**
    * Gets the number of messages in the current queue.
    * 
-   * @return
    */
   public int getNumCurrentMessages();
 
diff --git a/core/src/main/java/org/apache/hama/bsp/message/MessageQueue.java b/core/src/main/java/org/apache/hama/bsp/message/MessageQueue.java
new file mode 100644
index 000000000..94375d362
--- /dev/null
+++ b/core/src/main/java/org/apache/hama/bsp/message/MessageQueue.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp.message;
+
+import java.util.Collection;
+
+import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hama.bsp.TaskAttemptID;
+
+/**
+ * Simple queue interface.
+ */
+public interface MessageQueue<M> extends Iterable<M>, Configurable {
+
+  /**
+   * Used to initialize the queue.
+   */
+  public void init(Configuration conf, TaskAttemptID id);
+
+  /**
+   * Finally close the queue. Commonly used to free resources.
+   */
+  public void close();
+
+  /**
+   * Called to prepare a queue for reading.
+   */
+  public void prepareRead();
+
+  /**
+   * Called to prepare a queue for writing.
+   */
+  public void prepareWrite();
+
+  /**
+   * Adds a whole Java Collection to the implementing queue.
+   */
+  public void addAll(Collection<M> col);
+
+  /**
+   * Adds the other queue to this queue.
+   */
+  public void addAll(MessageQueue<M> otherqueue);
+
+  /**
+   * Adds a single item to the implementing queue.
+   */
+  public void add(M item);
+
+  /**
+   * Clears all entries in the given queue.
+   */
+  public void clear();
+
+  /**
+   * Polls for the next item in the queue (FIFO).
+   * 
+   * @return a new item or null if none are present.
+   */
+  public M poll();
+
+  /**
+   * @return how many items are in the queue.
+   */
+  public int size();
+
+}
diff --git a/core/src/main/java/org/apache/hama/bsp/message/SynchronizedQueue.java b/core/src/main/java/org/apache/hama/bsp/message/SynchronizedQueue.java
new file mode 100644
index 000000000..978a954a7
--- /dev/null
+++ b/core/src/main/java/org/apache/hama/bsp/message/SynchronizedQueue.java
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp.message;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hama.bsp.TaskAttemptID;
+
+/**
+ * A global mutex based synchronized queue.
+ */
+public final class SynchronizedQueue<T> {
+
+  private final MessageQueue<T> queue;
+  private final Object mutex;
+
+  private SynchronizedQueue(MessageQueue<T> queue) {
+    this.queue = queue;
+    this.mutex = new Object();
+  }
+
+  private SynchronizedQueue(MessageQueue<T> queue, Object mutex) {
+    this.queue = queue;
+    this.mutex = mutex;
+  }
+
+  public Iterator<T> iterator() {
+    synchronized (mutex) {
+      return queue.iterator();
+    }
+  }
+
+  public void setConf(Configuration conf) {
+    synchronized (mutex) {
+      queue.setConf(conf);
+    }
+  }
+
+  public Configuration getConf() {
+    synchronized (mutex) {
+      return queue.getConf();
+    }
+  }
+
+  public void init(Configuration conf, TaskAttemptID id) {
+    synchronized (mutex) {
+      queue.init(conf, id);
+    }
+  }
+
+  public void close() {
+    synchronized (mutex) {
+    }
+    queue.close();
+  }
+
+  public void prepareRead() {
+    synchronized (mutex) {
+      queue.prepareRead();
+    }
+  }
+
+  public void addAll(Collection<T> col) {
+    synchronized (mutex) {
+      queue.addAll(col);
+    }
+  }
+
+  public void add(T item) {
+    synchronized (mutex) {
+      queue.add(item);
+    }
+  }
+
+  public void clear() {
+    synchronized (mutex) {
+      queue.clear();
+    }
+  }
+
+  public Object poll() {
+    synchronized (mutex) {
+      return queue.poll();
+    }
+  }
+
+  public int size() {
+    synchronized (mutex) {
+      return queue.size();
+    }
+  }
+
+  public MessageQueue<T> getMessageQueue() {
+    synchronized (mutex) {
+      return queue;
+    }
+  }
+
+  /*
+   * static constructor methods to be type safe
+   */
+
+  public static <T> SynchronizedQueue<T> synchronize(MessageQueue<T> queue) {
+    return new SynchronizedQueue<T>(queue);
+  }
+
+  public static <T> SynchronizedQueue<T> synchronize(MessageQueue<T> queue,
+      Object mutex) {
+    return new SynchronizedQueue<T>(queue, mutex);
+  }
+
+}
diff --git a/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java b/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
index e0c3746d5..06bd9e08b 100644
--- a/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
+++ b/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
@@ -34,6 +34,7 @@
 import org.apache.hama.Constants;
 import org.apache.hama.HamaCluster;
 import org.apache.hama.HamaConfiguration;
+import org.apache.hama.bsp.message.DiskQueue;
 import org.apache.hama.examples.ClassSerializePrinting;
 import org.apache.hama.zookeeper.QuorumPeer;
 import org.apache.zookeeper.CreateMode;
@@ -48,6 +49,7 @@ public class TestBSPMasterGroomServer extends HamaCluster {
 
   private static Log LOG = LogFactory.getLog(TestBSPMasterGroomServer.class);
   static String TMP_OUTPUT = ""/tmp/test-example/"";
+  public static final String TMP_OUTPUT_PATH = ""/tmp/messageQueue"";
   static Path OUTPUT_PATH = new Path(TMP_OUTPUT + ""serialout"");
 
   private HamaConfiguration configuration;
@@ -58,6 +60,7 @@ public TestBSPMasterGroomServer() {
     assertEquals(""Make sure master addr is set to localhost:"", ""localhost"",
         configuration.get(""bsp.master.address""));
     configuration.set(""bsp.local.dir"", ""/tmp/hama-test"");
+    conf.set(DiskQueue.DISK_QUEUE_PATH_KEY, TMP_OUTPUT_PATH);
     configuration.set(Constants.ZOOKEEPER_QUORUM, ""localhost"");
     configuration.setInt(Constants.ZOOKEEPER_CLIENT_PORT, 21810);
     configuration.set(""hama.sync.client.class"",
diff --git a/core/src/test/java/org/apache/hama/bsp/message/TestAvroMessageManager.java b/core/src/test/java/org/apache/hama/bsp/message/TestAvroMessageManager.java
index d2a4e3700..b5f28e979 100644
--- a/core/src/test/java/org/apache/hama/bsp/message/TestAvroMessageManager.java
+++ b/core/src/test/java/org/apache/hama/bsp/message/TestAvroMessageManager.java
@@ -30,6 +30,7 @@
 import org.apache.hama.bsp.BSPPeer;
 import org.apache.hama.bsp.BSPPeerImpl;
 import org.apache.hama.bsp.Counters;
+import org.apache.hama.bsp.TaskAttemptID;
 import org.apache.hama.bsp.message.compress.BSPMessageCompressorFactory;
 import org.apache.hama.bsp.message.compress.SnappyCompressor;
 import org.apache.hama.bsp.messages.BooleanMessage;
@@ -45,10 +46,13 @@ public class TestAvroMessageManager extends TestCase {
 
   private static final int SUM = DOUBLE_MSG_COUNT + BOOL_MSG_COUNT
       + INT_MSG_COUNT;
+  
+  public static final String TMP_OUTPUT_PATH = ""/tmp/messageQueue"";
 
   public void testAvroMessenger() throws Exception {
     BSPMessageBundle<Writable> randomBundle = getRandomBundle();
     Configuration conf = new Configuration();
+    conf.set(DiskQueue.DISK_QUEUE_PATH_KEY, TMP_OUTPUT_PATH);
     MessageManager<Writable> messageManager = MessageManagerFactory
         .getMessageManager(conf);
     conf.set(BSPMessageCompressorFactory.COMPRESSION_CODEC_CLASS,
@@ -61,8 +65,8 @@ public void testAvroMessenger() throws Exception {
 
     BSPPeer<?, ?, ?, ?, Writable> dummyPeer = new BSPPeerImpl<NullWritable, NullWritable, NullWritable, NullWritable, Writable>(
         conf, FileSystem.get(conf), new Counters());
-
-    messageManager.init(dummyPeer, conf, peer);
+    TaskAttemptID id = new TaskAttemptID(""1"", 1, 1, 1);
+    messageManager.init(id, dummyPeer, conf, peer);
 
     messageManager.transfer(peer, randomBundle);
 
diff --git a/core/src/test/java/org/apache/hama/bsp/message/TestDiskQueue.java b/core/src/test/java/org/apache/hama/bsp/message/TestDiskQueue.java
new file mode 100644
index 000000000..dcbbced20
--- /dev/null
+++ b/core/src/test/java/org/apache/hama/bsp/message/TestDiskQueue.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp.message;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.IntWritable;
+import org.apache.hama.bsp.TaskAttemptID;
+import org.apache.hama.bsp.TaskID;
+import org.junit.Test;
+
+public class TestDiskQueue extends TestCase {
+
+  static Configuration conf = new Configuration();
+  static {
+    conf.set(DiskQueue.DISK_QUEUE_PATH_KEY,
+        TestAvroMessageManager.TMP_OUTPUT_PATH);
+  }
+
+  @Test
+  public void testDiskQueue() throws Exception {
+    DiskQueue<IntWritable> queue = getQueue();
+    checkQueue(queue);
+    queue.close();
+  }
+
+  @Test
+  public void testMultipleIterations() throws Exception {
+    DiskQueue<IntWritable> queue = getQueue();
+    for (int superstep = 0; superstep < 15; superstep++) {
+      checkQueue(queue);
+    }
+    queue.close();
+  }
+
+  public DiskQueue<IntWritable> getQueue() {
+    TaskAttemptID id = new TaskAttemptID(new TaskID(""123"", 1, 2), 0);
+    DiskQueue<IntWritable> queue = new DiskQueue<IntWritable>();
+    // normally this is injected via reflection
+    queue.setConf(conf);
+    queue.init(conf, id);
+    return queue;
+  }
+
+  public void checkQueue(DiskQueue<IntWritable> queue) {
+    queue.prepareWrite();
+    for (int i = 0; i < 10; i++) {
+      queue.add(new IntWritable(i));
+    }
+
+    queue.addAll(Arrays.asList(new IntWritable(11), new IntWritable(12),
+        new IntWritable(13)));
+    assertEquals(13, queue.size());
+    queue.prepareRead();
+
+    for (int i = 0; i < 9; i++) {
+      assertEquals(i, queue.poll().get());
+    }
+
+    queue.clear();
+
+    assertEquals(0, queue.size());
+  }
+
+}
diff --git a/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java b/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java
index f41ab043a..e5cf87cf2 100644
--- a/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java
+++ b/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java
@@ -19,7 +19,6 @@
 
 import java.net.InetSocketAddress;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map.Entry;
 
 import junit.framework.TestCase;
@@ -32,12 +31,31 @@
 import org.apache.hama.bsp.BSPPeer;
 import org.apache.hama.bsp.BSPPeerImpl;
 import org.apache.hama.bsp.Counters;
+import org.apache.hama.bsp.TaskAttemptID;
 import org.apache.hama.util.BSPNetUtils;
 
 public class TestHadoopMessageManager extends TestCase {
 
-  public void testMessaging() throws Exception {
+  public static final String TMP_OUTPUT_PATH = ""/tmp/messageQueue"";
+  // increment is here to solve race conditions in parallel execution to choose
+  // other ports.
+  public static volatile int increment = 1;
+
+  public void testMemoryMessaging() throws Exception {
+    Configuration conf = new Configuration();
+    conf.set(MessageManager.QUEUE_TYPE_CLASS,
+        MemoryQueue.class.getCanonicalName());
+    conf.set(DiskQueue.DISK_QUEUE_PATH_KEY, TMP_OUTPUT_PATH);
+    messagingInternal(conf);
+  }
+
+  public void testDiskMessaging() throws Exception {
     Configuration conf = new Configuration();
+    conf.set(DiskQueue.DISK_QUEUE_PATH_KEY, TMP_OUTPUT_PATH);
+    messagingInternal(conf);
+  }
+
+  private void messagingInternal(Configuration conf) throws Exception {
     conf.set(MessageManagerFactory.MESSAGE_MANAGER_CLASS,
         ""org.apache.hama.bsp.message.HadoopMessageManagerImpl"");
     MessageManager<IntWritable> messageManager = MessageManagerFactory
@@ -46,18 +64,20 @@ public void testMessaging() throws Exception {
     assertTrue(messageManager instanceof HadoopMessageManagerImpl);
 
     InetSocketAddress peer = new InetSocketAddress(
-        BSPNetUtils.getCanonicalHostname(), BSPNetUtils.getFreePort());
+        BSPNetUtils.getCanonicalHostname(), BSPNetUtils.getFreePort()
+            + (increment++));
     BSPPeer<?, ?, ?, ?, IntWritable> dummyPeer = new BSPPeerImpl<NullWritable, NullWritable, NullWritable, NullWritable, IntWritable>(
         conf, FileSystem.get(conf), new Counters());
-    messageManager.init(dummyPeer, conf, peer);
+    TaskAttemptID id = new TaskAttemptID(""1"", 1, 1, 1);
+    messageManager.init(id, dummyPeer, conf, peer);
     String peerName = peer.getHostName() + "":"" + peer.getPort();
 
     messageManager.send(peerName, new IntWritable(1337));
 
-    Iterator<Entry<InetSocketAddress, LinkedList<IntWritable>>> messageIterator = messageManager
+    Iterator<Entry<InetSocketAddress, MessageQueue<IntWritable>>> messageIterator = messageManager
         .getMessageIterator();
 
-    Entry<InetSocketAddress, LinkedList<IntWritable>> entry = messageIterator
+    Entry<InetSocketAddress, MessageQueue<IntWritable>> entry = messageIterator
         .next();
 
     assertEquals(entry.getKey(), peer);
@@ -77,5 +97,6 @@ public void testMessaging() throws Exception {
     IntWritable currentMessage = messageManager.getCurrentMessage();
 
     assertEquals(currentMessage.get(), 1337);
+    messageManager.close();
   }
 }"
716aa6974c6c3a0cdfb65e6adbc0e5c59538a289,spring-framework,fixed scheduling tests--,c,https://github.com/spring-projects/spring-framework,"diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java b/org.springframework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
index 2f7270747e65..207a717a05e1 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
@@ -23,12 +23,13 @@
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Variation of {@link MethodInvokingRunnable} meant to be used for processing
+ * Variant of {@link MethodInvokingRunnable} meant to be used for processing
  * of no-arg scheduled methods. Propagates user exceptions to the caller,
  * assuming that an error strategy for Runnables is in place.
  *
  * @author Juergen Hoeller
  * @since 3.0.6
+ * @see org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor
  */
 public class ScheduledMethodRunnable implements Runnable {
 
@@ -59,6 +60,7 @@ public Method getMethod() {
 
 	public void run() {
 		try {
+			ReflectionUtils.makeAccessible(this.method);
 			this.method.invoke(this.target);
 		}
 		catch (InvocationTargetException ex) {
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml b/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
index 9f613201377f..2dc689973c90 100644
--- a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
+++ b/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml
@@ -11,12 +11,20 @@
 	<context:load-time-weaver aspectj-weaving=""on""/>
 	-->
 
-	<task:annotation-driven executor=""executor""/>
+	<task:annotation-driven executor=""executor"" scheduler=""scheduler""/>
+
+	<task:scheduled-tasks scheduler=""scheduler"">
+		<task:scheduled ref=""target"" method=""test"" fixed-rate=""1000""/>
+	</task:scheduled-tasks>
 
 	<bean id=""executor"" class=""org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"">
 		<property name=""threadNamePrefix"" value=""testExecutor""/>
 	</bean>
 
+	<bean id=""scheduler"" class=""org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler"">
+		<property name=""threadNamePrefix"" value=""testScheduler""/>
+	</bean>
+
 	<bean id=""target"" class=""org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessorTests$TestBean""/>
 
 </beans>
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
index 52112929038b..295c282ad0d6 100644
--- a/org.springframework.context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -16,19 +16,18 @@
 
 package org.springframework.scheduling.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;
 
+import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.scheduling.support.MethodInvokingRunnable;
+import org.springframework.scheduling.support.ScheduledMethodRunnable;
 
 /**
  * @author Mark Fisher
@@ -64,11 +63,11 @@ public void checkTarget() {
 		Map<Runnable, Long> tasks = (Map<Runnable, Long>) new DirectFieldAccessor(
 				this.registrar).getPropertyValue(""fixedRateTasks"");
 		Runnable runnable = tasks.keySet().iterator().next();
-		assertEquals(MethodInvokingRunnable.class, runnable.getClass());
-		Object targetObject = ((MethodInvokingRunnable) runnable).getTargetObject();
-		String targetMethod = ((MethodInvokingRunnable) runnable).getTargetMethod();
+		assertEquals(ScheduledMethodRunnable.class, runnable.getClass());
+		Object targetObject = ((ScheduledMethodRunnable) runnable).getTarget();
+		Method targetMethod = ((ScheduledMethodRunnable) runnable).getMethod();
 		assertEquals(this.testBean, targetObject);
-		assertEquals(""test"", targetMethod);
+		assertEquals(""test"", targetMethod.getName());
 	}
 
 	@Test"
74f4459da3ccc0ae80aae260c75301a3ad15913c,isa-tools$isacreator,"Removed the MGRast export functionality since it's just dead code. Added ISAconverter integration. Some small additions to add, but functionality is there. Improvements are just focused on UI. Closes #12
",p,https://github.com/isa-tools/isacreator,"diff --git a/pom.xml b/pom.xml
index c6e1734f..d2166ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,7 +317,7 @@
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
-            <version>2.4.0</version>
+            <version>2.3.0</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/org/isatools/isacreator/common/FileSelectionPanel.java b/src/main/java/org/isatools/isacreator/common/FileSelectionPanel.java
index 919410f8..7efd9b92 100644
--- a/src/main/java/org/isatools/isacreator/common/FileSelectionPanel.java
+++ b/src/main/java/org/isatools/isacreator/common/FileSelectionPanel.java
@@ -96,7 +96,7 @@ public FileSelectionPanel(String text, JFileChooser fileChooser, Font textFont,
         this.textColor = textColor;
 
         setLayout(new GridLayout(2, 1));
-        setSize(new Dimension(400, 60));
+        setSize(new Dimension(400, 70));
 
         ResourceInjector.get(""common-package.style"").inject(this);
 
diff --git a/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConversionTarget.java b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConversionTarget.java
new file mode 100644
index 00000000..3a3bd11b
--- /dev/null
+++ b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConversionTarget.java
@@ -0,0 +1,45 @@
+package org.isatools.isacreator.externalutils.convertvalidate;
+
+import org.isatools.isatab.gui_invokers.AllowedConversions;
+
+/**
+ * Created by the ISA team
+ *
+ * @author Eamonn Maguire (eamonnmag@gmail.com)
+ *         <p/>
+ *         Date: 08/09/2011
+ *         Time: 13:54
+ */
+public class ConversionTarget {
+
+    private AllowedConversions target;
+    private int numValidAssays;
+    private boolean selected;
+
+    public ConversionTarget(AllowedConversions target, int numValidAssays, boolean selected) {
+        this.target = target;
+        this.numValidAssays = numValidAssays;
+        this.selected = selected;
+    }
+
+    public AllowedConversions getTarget() {
+        return target;
+    }
+
+    public int getNumValidAssays() {
+        return numValidAssays;
+    }
+
+    public int incrementNumValidAssays() {
+        numValidAssays++;
+        return numValidAssays;
+    }
+
+    public boolean isSelected() {
+        return selected;
+    }
+
+    public void setSelected(boolean selected) {
+        this.selected = selected;
+    }
+}
diff --git a/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConversionTargetInformationPanel.java b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConversionTargetInformationPanel.java
new file mode 100644
index 00000000..552dfeaa
--- /dev/null
+++ b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConversionTargetInformationPanel.java
@@ -0,0 +1,100 @@
+package org.isatools.isacreator.externalutils.convertvalidate;
+
+import org.isatools.errorreporter.ui.borders.RoundedBorder;
+import org.isatools.errorreporter.ui.utils.UIHelper;
+import org.jdesktop.fuse.InjectedResource;
+import org.jdesktop.fuse.ResourceInjector;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class ConversionTargetInformationPanel extends JPanel {
+
+    private Color hoverColor = new Color(249, 249, 249);
+
+    @InjectedResource
+    private ImageIcon unselected, selected;
+
+    private JLabel selectionIndicator;
+    private ConversionTarget conversionTarget;
+
+
+    public ConversionTargetInformationPanel(ConversionTarget conversionTarget) {
+
+        ResourceInjector.get(""validator-package.style"").inject(this);
+
+        this.conversionTarget = conversionTarget;
+
+        createGUI();
+    }
+
+    public ConversionTarget getConversionTarget() {
+        return conversionTarget;
+    }
+
+    public void createGUI() {
+        setLayout(new BorderLayout());
+        setBorder(new RoundedBorder(UIHelper.LIGHT_GREEN_COLOR, 5));
+
+        add(createTopSection(), BorderLayout.NORTH);
+        add(createAssayInfoSection(), BorderLayout.CENTER);
+
+        addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseExited(MouseEvent mouseEvent) {
+                setBackground(conversionTarget.isSelected() ? hoverColor : UIHelper.BG_COLOR);
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent mouseEvent) {
+                setBackground(hoverColor);
+            }
+
+            @Override
+            public void mousePressed(MouseEvent mouseEvent) {
+
+                firePropertyChange(""conversionTargetSelected"", false, true);
+                conversionTarget.setSelected(!conversionTarget.isSelected());
+                updateSelection();
+            }
+        });
+
+    }
+
+    private Container createTopSection() {
+        Box topSection = Box.createHorizontalBox();
+
+        selectionIndicator = new JLabel();
+        updateSelection();
+
+        topSection.add(selectionIndicator);
+        topSection.add(Box.createHorizontalStrut(5));
+        topSection.add(UIHelper.createLabel(conversionTarget.getTarget().getType(), UIHelper.VER_11_BOLD, UIHelper.DARK_GREEN_COLOR, SwingConstants.LEFT));
+
+        return topSection;
+    }
+
+    public void clearSelection() {
+        conversionTarget.setSelected(false);
+        updateSelection();
+    }
+
+    private Container createAssayInfoSection() {
+        Box infoPane = Box.createVerticalBox();
+        infoPane.setPreferredSize(new Dimension(130, 35));
+        infoPane.add(Box.createVerticalStrut(5));
+        infoPane.add(UIHelper.createLabel(""<html>conversion possible on ""
+                + conversionTarget.getNumValidAssays() + "" assay type"" + (conversionTarget.getNumValidAssays() > 1 ? ""s"" : """") + ""</html>"",
+                UIHelper.VER_8_PLAIN, UIHelper.DARK_GREEN_COLOR, SwingConstants.LEFT));
+
+        infoPane.setBorder(new EmptyBorder(2, 1, 2, 1));
+        return infoPane;
+    }
+
+    public void updateSelection() {
+        selectionIndicator.setIcon(conversionTarget.isSelected() ? selected : unselected);
+    }
+}
diff --git a/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConvertUI.java b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConvertUI.java
new file mode 100644
index 00000000..9989cf1e
--- /dev/null
+++ b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ConvertUI.java
@@ -0,0 +1,171 @@
+package org.isatools.isacreator.externalutils.convertvalidate;
+
+import com.explodingpixels.macwidgets.IAppWidgetFactory;
+import org.isatools.errorreporter.ui.utils.UIHelper;
+import org.isatools.isacreator.common.FileSelectionPanel;
+import org.isatools.isatab.gui_invokers.AllowedConversions;
+import org.jdesktop.fuse.InjectedResource;
+import org.jdesktop.fuse.ResourceInjector;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Created by the ISA team
+ */
+public class ConvertUI extends JPanel {
+
+
+    static {
+        ResourceInjector.addModule(""org.jdesktop.fuse.swing.SwingModule"");
+
+        ResourceInjector.get(""validator-package.style"").load(
+                ConvertUI.class.getResource(""/dependency-injections/validator-package.properties""));
+
+        ResourceInjector.get(""common-package.style"").load(
+                ConvertUI.class.getResource(""/dependency-injections/common-package.properties""));
+
+    }
+
+    private Collection<ConversionTarget> conversionTargets;
+
+
+    private List<ConversionTargetInformationPanel> conversionTargetInformationPanels;
+    private JPanel conversionTargetContainer;
+    private FileSelectionPanel fileSelectionPanel;
+
+    @InjectedResource
+    private ImageIcon startConversion, startConversionOver;
+
+    public ConvertUI(Collection<ConversionTarget> conversionTargets) {
+
+        ResourceInjector.get(""validator-package.style"").inject(this);
+
+        this.conversionTargets = conversionTargets;
+    }
+
+    public void createGUI() {
+        setLayout(new BorderLayout());
+        setOpaque(false);
+
+        createSelectionPane();
+    }
+
+    private void createSelectionPane() {
+        conversionTargetContainer = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        conversionTargetContainer.setOpaque(false);
+
+        conversionTargetInformationPanels = new ArrayList<ConversionTargetInformationPanel>();
+
+
+        for (ConversionTarget conversionTarget : conversionTargets) {
+            ConversionTargetInformationPanel conversionTargetInformationPanel = new ConversionTargetInformationPanel(conversionTarget);
+
+            conversionTargetInformationPanel.addPropertyChangeListener(""conversionTargetSelected"", new PropertyChangeListener() {
+                public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+                    // clear selection on all panels...
+                    for (ConversionTargetInformationPanel panel : conversionTargetInformationPanels) {
+                        panel.clearSelection();
+                    }
+                }
+            });
+
+            conversionTargetInformationPanels.add(conversionTargetInformationPanel);
+            conversionTargetContainer.add(conversionTargetInformationPanel);
+        }
+
+        JScrollPane scroller = new JScrollPane(conversionTargetContainer,
+                JScrollPane.VERTICAL_SCROLLBAR_NEVER, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+
+        scroller.getViewport().setOpaque(false);
+        scroller.setOpaque(false);
+        scroller.setBorder(new EmptyBorder(1, 1, 1, 1));
+        scroller.setPreferredSize(new Dimension(400, 80));
+
+        IAppWidgetFactory.makeIAppScrollPane(scroller);
+
+        Box container = Box.createVerticalBox();
+        container.setOpaque(false);
+
+        container.add(UIHelper.wrapComponentInPanel(
+                UIHelper.createLabel(""<html><b>1. Choose your conversion target(s):</b></html>"",
+                        UIHelper.VER_11_PLAIN, UIHelper.DARK_GREEN_COLOR, SwingConstants.LEFT)));
+
+        container.add(Box.createVerticalStrut(5));
+
+        container.add(UIHelper.wrapComponentInPanel(
+                UIHelper.createLabel(""<html><i>weÕve filtered out conversion targets not applicable to your data. just click on a box to select the format.</i></html>"",
+                        UIHelper.VER_9_PLAIN, UIHelper.GREY_COLOR, SwingConstants.LEFT)));
+
+        container.add(Box.createVerticalStrut(15));
+        container.add(scroller);
+        container.add(Box.createVerticalStrut(15));
+
+        JFileChooser fileChooser = new JFileChooser();
+        fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+        fileChooser.setDialogTitle(""Choose conversion output directory"");
+        fileChooser.setControlButtonsAreShown(true);
+        fileChooser.setApproveButtonText(""Put it here"");
+
+        fileSelectionPanel = new FileSelectionPanel(""2. Choose the output directory"",
+                fileChooser, UIHelper.VER_11_BOLD, UIHelper.DARK_GREEN_COLOR);
+
+        container.add(fileSelectionPanel);
+
+        container.add(Box.createVerticalStrut(10));
+
+        container.add(createButtonPanel());
+
+        add(container, BorderLayout.NORTH);
+    }
+
+    private JPanel createButtonPanel() {
+        JPanel buttonContainer = new JPanel(new BorderLayout());
+
+        final JLabel convertButton = new JLabel(startConversion);
+        convertButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent mouseEvent) {
+                convertButton.setIcon(startConversionOver);
+            }
+
+            @Override
+            public void mouseExited(MouseEvent mouseEvent) {
+                convertButton.setIcon(startConversion);
+            }
+
+            @Override
+            public void mousePressed(MouseEvent mouseEvent) {
+                convertButton.setIcon(startConversion);
+                firePropertyChange(""startConversion"", false, true);
+            }
+        });
+
+        buttonContainer.add(convertButton, BorderLayout.CENTER);
+
+        return buttonContainer;
+    }
+
+    public AllowedConversions getConversionToPerform() {
+        for (ConversionTargetInformationPanel panel : conversionTargetInformationPanels) {
+            if (panel.getConversionTarget().isSelected()) {
+                return panel.getConversionTarget().getTarget();
+            }
+        }
+
+        return AllowedConversions.ALL;
+    }
+
+    public String getOutputLocation() {
+        return fileSelectionPanel.getSelectedFilePath();
+    }
+
+}
diff --git a/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/OperatingMode.java b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/OperatingMode.java
new file mode 100644
index 00000000..60873732
--- /dev/null
+++ b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/OperatingMode.java
@@ -0,0 +1,14 @@
+package org.isatools.isacreator.externalutils.convertvalidate;
+
+/**
+ * Created by the ISA team
+ *
+ * @author Eamonn Maguire (eamonnmag@gmail.com)
+ *         <p/>
+ *         Date: 08/09/2011
+ *         Time: 12:02
+ */
+public enum OperatingMode {
+
+    VALIDATE, CONVERT;
+}
diff --git a/src/main/java/org/isatools/isacreator/validate/ui/ValidateUI.java b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ValidateUI.java
similarity index 54%
rename from src/main/java/org/isatools/isacreator/validate/ui/ValidateUI.java
rename to src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ValidateUI.java
index 66f3a668..ec84013d 100644
--- a/src/main/java/org/isatools/isacreator/validate/ui/ValidateUI.java
+++ b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ValidateUI.java
@@ -1,8 +1,9 @@
-package org.isatools.isacreator.validate.ui;
+package org.isatools.isacreator.externalutils.convertvalidate;
 
 
 import com.sun.awt.AWTUtilities;
 import org.apache.log4j.Level;
+import org.apache.log4j.spi.LoggingEvent;
 import org.isatools.errorreporter.model.ErrorLevel;
 import org.isatools.errorreporter.model.ErrorMessage;
 import org.isatools.errorreporter.model.FileType;
@@ -14,12 +15,15 @@
 import org.isatools.isacreator.gui.ISAcreator;
 import org.isatools.isacreator.gui.menu.ImportFilesMenu;
 import org.isatools.isacreator.model.Assay;
-import org.isatools.isacreator.ontologiser.ui.OntologyHelpPane;
+import org.isatools.isacreator.model.Study;
 import org.isatools.isacreator.settings.ISAcreatorProperties;
 import org.isatools.isacreator.utils.datastructures.ISAPair;
+import org.isatools.isatab.gui_invokers.AllowedConversions;
+import org.isatools.isatab.gui_invokers.GUIISATABConverter;
 import org.isatools.isatab.gui_invokers.GUIISATABValidator;
 import org.isatools.isatab.gui_invokers.GUIInvokerResult;
 import org.isatools.isatab.isaconfigurator.ISAConfigurationSet;
+import org.isatools.tablib.utils.BIIObjectStore;
 import org.isatools.tablib.utils.logging.TabLoggingEventWrapper;
 import org.jdesktop.fuse.InjectedResource;
 import org.jdesktop.fuse.ResourceInjector;
@@ -29,45 +33,31 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.EtchedBorder;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.*;
 import java.util.List;
 
-/**
- * Created by the ISA team
- *
- * @author Eamonn Maguire (eamonnmag@gmail.com)
- *         <p/>
- *         Date: 17/08/2011
- *         Time: 13:38
- */
 public class ValidateUI extends JFrame {
 
-
     static {
         ResourceInjector.addModule(""org.jdesktop.fuse.swing.SwingModule"");
 
         ResourceInjector.get(""validator-package.style"").load(
-                OntologyHelpPane.class.getResource(""/dependency-injections/validator-package.properties""));
-
+                ValidateUI.class.getResource(""/dependency-injections/validator-package.properties""));
     }
 
     @InjectedResource
-    private Image validateIcon, validateIconInactive;
+    private Image validateIcon, validateIconInactive, convertIcon, convertIconInactive;
 
     @InjectedResource
-    private ImageIcon validationSuccess;
+    private ImageIcon validationSuccess, conversionSuccess;
 
     private ISAcreator isacreatorEnvironment;
 
     protected static ImageIcon validateISAAnimation = new ImageIcon(ImportFilesMenu.class.getResource(""/images/validator/validating.gif""));
+    protected static ImageIcon convertISAAnimation = new ImageIcon(ImportFilesMenu.class.getResource(""/images/validator/converting.gif""));
 
-    public static final int INCOMING = 1;
-    public static final int OUTGOING = -1;
-
-    public static final float ANIMATION_DURATION = 500f;
-    public static final int ANIMATION_SLEEP = 10;
     public static final float DESIRED_OPACITY = .93f;
 
     private Timer animationTimer;
@@ -78,9 +68,16 @@ public class ValidateUI extends JFrame {
     private long animationStart;
 
     private JPanel swappableContainer;
+    private OperatingMode mode;
 
     public ValidateUI(ISAcreator isacreatorEnvironment) {
 
+        this(isacreatorEnvironment, OperatingMode.VALIDATE);
+    }
+
+    public ValidateUI(ISAcreator isacreatorEnvironment, OperatingMode mode) {
+        this.mode = mode;
+
         ResourceInjector.get(""validator-package.style"").inject(this);
 
         this.isacreatorEnvironment = isacreatorEnvironment;
@@ -88,7 +85,7 @@ public ValidateUI(ISAcreator isacreatorEnvironment) {
 
     public void createGUI() {
 
-        setTitle(""Validate ISAtab"");
+        setTitle(mode == OperatingMode.VALIDATE ? ""Validate ISAtab"" : ""Convert ISAtab"");
         setUndecorated(true);
 
         setLayout(new BorderLayout());
@@ -96,7 +93,10 @@ public void createGUI() {
 
         AWTUtilities.setWindowOpacity(this, DESIRED_OPACITY);
 
-        HUDTitleBar titlePanel = new HUDTitleBar(validateIcon, validateIconInactive);
+        HUDTitleBar titlePanel = new HUDTitleBar(
+                mode == OperatingMode.VALIDATE ? validateIcon : convertIcon,
+                mode == OperatingMode.VALIDATE ? validateIconInactive : convertIconInactive);
+
         add(titlePanel, BorderLayout.NORTH);
         titlePanel.installListeners();
 
@@ -117,7 +117,6 @@ public void createGUI() {
         pack();
     }
 
-
     public void validateISAtab() {
 
         Thread performer = new Thread(new Runnable() {
@@ -127,13 +126,34 @@ public void run() {
                 ISAConfigurationSet.setConfigPath(ISAcreatorProperties.getProperty(ISAcreatorProperties.CURRENT_CONFIGURATION));
 
                 final GUIISATABValidator isatabValidator = new GUIISATABValidator();
+
                 GUIInvokerResult result = isatabValidator.validate(ISAcreatorProperties.getProperty(ISAcreatorProperties.CURRENT_ISATAB));
 
                 if (result == GUIInvokerResult.SUCCESS) {
                     Container successfulValidationContainer = UIHelper.padComponentVerticalBox(70, new JLabel(validationSuccess));
                     swapContainers(successfulValidationContainer);
-                } else {
+                    if (mode == OperatingMode.CONVERT) {
+
+                        final ConvertUI convertUI = new ConvertUI(constructConversionTargets());
+                        convertUI.setPreferredSize(new Dimension(750, 440));
+                        convertUI.createGUI();
+
+                        convertUI.addPropertyChangeListener(""startConversion"", new PropertyChangeListener() {
+                            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+
+                                swapContainers(UIHelper.padComponentVerticalBox(100, new JLabel(convertISAAnimation)));
 
+                                convertISAtab(isatabValidator.getStore(), convertUI.getConversionToPerform(),
+                                        ISAcreatorProperties.getProperty(ISAcreatorProperties.CURRENT_ISATAB),
+                                        convertUI.getOutputLocation());
+                            }
+                        });
+
+                        swapContainers(convertUI);
+
+                        swapContainers(convertUI);
+                    }
+                } else {
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
 
@@ -157,7 +177,6 @@ public void run() {
                                 }
                             }
 
-
                             for (String fileName : fileToErrors.keySet()) {
 
                                 ISAPair<Assay, FileType> assayAndType = ValidationUtils.resolveFileTypeFromFileName(fileName,
@@ -182,12 +201,95 @@ public void run() {
                         }
                     });
                 }
+
             }
         });
 
         performer.start();
     }
 
+    private void convertISAtab(BIIObjectStore store, AllowedConversions conversion,
+                               String isatabLocation, String outputLocation) {
+
+
+        GUIISATABConverter converter = new GUIISATABConverter();
+        GUIInvokerResult result = converter.convert(store, isatabLocation, outputLocation, conversion);
+
+        if (result == GUIInvokerResult.SUCCESS) {
+
+            Box successContainer = Box.createVerticalBox();
+
+            successContainer.add(Box.createVerticalStrut(50));
+            successContainer.add(UIHelper.wrapComponentInPanel(new JLabel(conversionSuccess)));
+
+            successContainer.add(UIHelper.wrapComponentInPanel(UIHelper.createLabel(""<html>"" +
+                    ""<b>Conversion was a success.</b>"" +
+                    ""<p>Files stored in "" + outputLocation + ""</p>"" +
+                    ""</html>"", UIHelper.VER_11_PLAIN, UIHelper.DARK_GREEN_COLOR)));
+
+            swapContainers(successContainer);
+
+        } else {
+            String topMostError = """";
+            swapContainers(UIHelper.padComponentVerticalBox(100, UIHelper.createLabel(""<html>Conversion failed. Here is why:</html>"",
+                    UIHelper.VER_11_PLAIN, UIHelper.DARK_GREEN_COLOR)));
+
+            // todo show error panel to say it didn't convert....
+
+            for (TabLoggingEventWrapper tlew : converter.getLog()) {
+                LoggingEvent le = tlew.getLogEvent();
+                System.out.println(le.getMessage());
+            }
+
+
+        }
+    }
+
+
+    private Collection<ConversionTarget> constructConversionTargets() {
+        Map<String, ConversionTarget> conversionTargets = new HashMap<String, ConversionTarget>();
+
+        Map<String, Study> studies = isacreatorEnvironment.getDataEntryEnvironment().getInvestigation().getStudies();
+
+        int totalAssays = 0;
+
+        for (Study study : studies.values()) {
+            boolean add = false;
+            AllowedConversions conversionType = null;
+            for (Assay assay : study.getAssays().values()) {
+                String technology = assay.getTechnologyType();
+
+                if (technology.contains(FileType.MICROARRAY.getType())) {
+                    add = true;
+                    conversionType = AllowedConversions.MAGETAB;
+                } else if (technology.contains(FileType.MASS_SPECTROMETRY.getType())) {
+                    add = true;
+                    conversionType = AllowedConversions.PRIDEML;
+                } else if (technology.contains(FileType.NMR.getType())) {
+                    add = true;
+                    conversionType = AllowedConversions.PRIDEML;
+                } else if (technology.contains(FileType.SEQUENCING.getType())) {
+                    add = true;
+                    conversionType = AllowedConversions.SRA;
+                }
+
+                if (add) {
+                    if (!conversionTargets.containsKey(technology)) {
+                        conversionTargets.put(technology, new ConversionTarget(conversionType, 1, false));
+                    } else {
+                        conversionTargets.get(technology).incrementNumValidAssays();
+                    }
+                    totalAssays++;
+                }
+
+            }
+        }
+
+        conversionTargets.put(""all"", new ConversionTarget(AllowedConversions.ALL, totalAssays, true));
+
+        return conversionTargets.values();
+    }
+
     private void swapContainers(Container newContainer) {
         if (newContainer != null) {
             swappableContainer.removeAll();
diff --git a/src/main/java/org/isatools/isacreator/validate/ui/ValidationUtils.java b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ValidationUtils.java
similarity index 97%
rename from src/main/java/org/isatools/isacreator/validate/ui/ValidationUtils.java
rename to src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ValidationUtils.java
index f1d11c35..ea3e1a48 100644
--- a/src/main/java/org/isatools/isacreator/validate/ui/ValidationUtils.java
+++ b/src/main/java/org/isatools/isacreator/externalutils/convertvalidate/ValidationUtils.java
@@ -1,4 +1,4 @@
-package org.isatools.isacreator.validate.ui;
+package org.isatools.isacreator.externalutils.convertvalidate;
 
 import org.apache.log4j.spi.LoggingEvent;
 import org.isatools.errorreporter.model.FileType;
diff --git a/src/main/java/org/isatools/isacreator/gui/ISAcreator.java b/src/main/java/org/isatools/isacreator/gui/ISAcreator.java
index 1c2023e4..f38cc658 100755
--- a/src/main/java/org/isatools/isacreator/gui/ISAcreator.java
+++ b/src/main/java/org/isatools/isacreator/gui/ISAcreator.java
@@ -67,11 +67,8 @@ ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
 import org.isatools.isacreator.spreadsheet.Spreadsheet;
 import org.isatools.isacreator.spreadsheet.TableReferenceObject;
 import org.isatools.isacreator.utils.IncorrectColumnPositioning;
+import org.isatools.isacreator.externalutils.convertvalidate.*;
 import org.isatools.isacreator.utils.PropertyFileIO;
-import org.isatools.isacreator.validate.ui.ValidateUI;
-import org.isatools.isatab.gui_invokers.GUIISATABValidator;
-import org.isatools.isatab.gui_invokers.GUIInvokerResult;
-import org.isatools.tablib.utils.logging.TabLoggingEventWrapper;
 import org.jdesktop.fuse.InjectedResource;
 import org.jdesktop.fuse.ResourceInjector;
 
@@ -112,9 +109,9 @@ public class ISAcreator extends AnimatableJFrame implements WindowFocusListener
     @InjectedResource
     private Image isacreatorIcon;
     @InjectedResource
-    private ImageIcon saveIcon, saveMenuIcon, saveLogoutIcon, saveExitIcon,
+    private ImageIcon saveIcon, saveMenuIcon, saveLogoutIcon, saveExitIcon, convertIcon, validateIcon,
             logoutIcon, menuIcon, exitIcon, exportArchiveIcon, addStudyIcon,
-            removeStudyIcon, fullScreenIcon, defaultScreenIcon, aboutIcon, helpIcon, mgRastIcon, qrCodeIcon,
+            removeStudyIcon, fullScreenIcon, defaultScreenIcon, aboutIcon, helpIcon,
             supportIcon, feedbackIcon, confirmLogout, confirmMenu, confirmExit;
 
     private AboutPanel aboutPanel;
@@ -404,6 +401,44 @@ public void run() {
 
         file.add(exportISArchive);
 
+        JMenuItem validate = new JMenuItem(""Validate ISAtab"", validateIcon);
+        validate.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent mouseEvent) {
+                SwingUtilities.invokeLater(new Runnable() {
+                    public void run() {
+                        ValidateUI validateUI = new ValidateUI(ISAcreator.this, OperatingMode.VALIDATE);
+                        validateUI.createGUI();
+                        validateUI.setLocationRelativeTo(ISAcreator.this);
+                        validateUI.setVisible(true);
+                        validateUI.validateISAtab();
+
+                    }
+                });
+
+            }
+        });
+
+        JMenuItem convert = new JMenuItem(""Convert ISAtab"", convertIcon);
+        convert.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent mouseEvent) {
+                SwingUtilities.invokeLater(new Runnable() {
+                    public void run() {
+                        ValidateUI validateUI = new ValidateUI(ISAcreator.this, OperatingMode.CONVERT);
+                        validateUI.createGUI();
+                        validateUI.setLocationRelativeTo(ISAcreator.this);
+                        validateUI.setVisible(true);
+                        validateUI.validateISAtab();
+
+                    }
+                });
+
+            }
+        });
+
+        file.add(new JSeparator());
+        file.add(validate);
+        file.add(convert);
+
         menuBar.add(file);
 
 
@@ -484,30 +519,12 @@ public void mousePressed(MouseEvent mouseEvent) {
         });
 
         JMenu qrCodeExport = new JMenu(""generate QR codes for Study samples"");
-        qrCodeExport.setIcon(qrCodeIcon);
         menusRequiringStudyIds.put(""qr"", qrCodeExport);
         sampleTracking.add(qrCodeExport);
 
-        JMenuItem validate = new JMenuItem(""Validate ISAtab"");
-        validate.addMouseListener(new MouseAdapter() {
-            public void mousePressed(MouseEvent mouseEvent) {
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        ValidateUI validateUI = new ValidateUI(ISAcreator.this);
-                        validateUI.createGUI();
-                        validateUI.setLocationRelativeTo(ISAcreator.this);
-                        validateUI.setVisible(true);
-                        validateUI.validateISAtab();
-
-                    }
-                });
-
-            }
-        });
 
         plugins.add(sampleTracking);
         plugins.add(tagInvestigation);
-        plugins.add(validate);
 
         menuBar.add(plugins);
 
diff --git a/src/main/java/org/isatools/isacreator/io/importisa/ISAtabImporter.java b/src/main/java/org/isatools/isacreator/io/importisa/ISAtabImporter.java
index 165888e4..42b2efbb 100644
--- a/src/main/java/org/isatools/isacreator/io/importisa/ISAtabImporter.java
+++ b/src/main/java/org/isatools/isacreator/io/importisa/ISAtabImporter.java
@@ -194,7 +194,7 @@ public boolean importFile(String parentDir) {
                         lastConfigurationUsed = lastConfigurationUsed.substring(lastConfigurationUsed.lastIndexOf(File.separator) + 1);
                     }
 
-                    if (!lastConfigurationUsed.equals("""")) {
+                    if (!investigation.getLastConfigurationUsed().equals("""")) {
                         if (!lastConfigurationUsed.equals(investigation.getLastConfigurationUsed())) {
                             messages.add(new ErrorMessage(ErrorLevel.WARNING, ""The last configuration used to load this ISAtab file was "" + investigation.getLastConfigurationUsed() + "". The currently loaded configuration is "" + lastConfigurationUsed + "". You can continue to load, but "" +
                                     ""the settings from "" + investigation.getLastConfigurationUsed() + "" may be important.""));
diff --git a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/DefiniteArticlesAndConjunctions.java b/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/DefiniteArticlesAndConjunctions.java
deleted file mode 100644
index 410b8e07..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/DefiniteArticlesAndConjunctions.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.conceptmapper;
-
-/**
- * DefiniteArticles
- *
- * @author eamonnmaguire
- * @date Sep 23, 2010
- */
-
-
-public enum DefiniteArticlesAndConjunctions {
-    A(""a""), AN(""an""), THE(""the""), AND(""and"");
-
-    private String representation;
-
-
-    DefiniteArticlesAndConjunctions(String representation) {
-        this.representation = representation;
-    }
-
-    @Override
-    public String toString() {
-        return representation;
-    }
-
-    public static String buildRegexForDetection() {
-        return GrammarUtil.buildRegexForDetection(values());
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/GrammarUtil.java b/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/GrammarUtil.java
deleted file mode 100644
index 72ba2e61..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/GrammarUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.conceptmapper;
-
-/**
- * GrammarUtil
- *
- * @author eamonnmaguire
- * @date Sep 23, 2010
- */
-
-
-public class GrammarUtil {
-
-    public static String buildRegexForDetection(Object[] values) {
-        StringBuilder regex = new StringBuilder();
-
-        int count = 0;
-
-        for (Object prep : values) {
-            regex.append(""(\\b"").append(prep).append(""\\b)"");
-            if (count < values.length - 1) {
-                regex.append(""|"");
-            }
-        }
-
-        return regex.toString();
-    }
-
-    public static String removeValuesFromString(String value, String elementsToRemove) {
-        return value.replaceAll(elementsToRemove, """");
-    }
-
-    public static String removeCharacterFromEndOfString(String value) {
-        if (value.length() > 0) {
-            return value.substring(0, value.length() - 1);
-        }
-
-        return value;
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/MGRastConceptIndexer.java b/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/MGRastConceptIndexer.java
deleted file mode 100644
index 54bad024..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/MGRastConceptIndexer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.conceptmapper;
-
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.read.biff.BiffException;
-import org.apache.commons.collections15.set.ListOrderedSet;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * MGRastConceptIndexer
- *
- * @author eamonnmaguire
- * @date Sep 22, 2010
- */
-
-
-public class MGRastConceptIndexer {
-
-    private Map<String, Set<String>> conceptsToMGRastTerm;
-
-    public void createIndex(File mappingFile) {
-
-        conceptsToMGRastTerm = new HashMap<String, Set<String>>();
-        Workbook w;
-
-        try {
-            if (!mappingFile.isHidden()) {
-                w = Workbook.getWorkbook(mappingFile);
-                // Get the first sheet
-                for (Sheet s : w.getSheets()) {
-                    if (s.getRows() > 0) {
-                        for (int row = 0; row < s.getRows(); row++) {
-                            String concept = s.getCell(1, row).getContents().toLowerCase();
-                            String mgrastKey = s.getCell(2, row).getContents();
-
-                            if (!conceptsToMGRastTerm.containsKey(concept)) {
-                                conceptsToMGRastTerm.put(concept, new HashSet<String>());
-                            }
-                            conceptsToMGRastTerm.get(concept).add(mgrastKey);
-
-                        }
-                    }
-                }
-            }
-
-        } catch (BiffException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Map<String, Set<String>> getConceptsToMGRastTerm() {
-        return conceptsToMGRastTerm;
-    }
-
-    public Set<String> getAllConcepts() {
-        Set<String> conceptSet = new ListOrderedSet<String>();
-
-        for (String key : conceptsToMGRastTerm.keySet()) {
-            for (String value : conceptsToMGRastTerm.get(key)) {
-                conceptSet.add(value);
-            }
-        }
-        return conceptSet;
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/MGRastConceptMapper.java b/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/MGRastConceptMapper.java
deleted file mode 100644
index 80ce6d37..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/MGRastConceptMapper.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.conceptmapper;
-
-
-import org.isatools.isacreator.mgrast.model.ConfidenceLevel;
-import org.isatools.isacreator.mgrast.model.FieldMapping;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * MGRastConceptMapper
- *
- * @author eamonnmaguire
- * @date Sep 22, 2010
- */
-
-
-public class MGRastConceptMapper {
-
-    private String mappingFileLocation = ""Data"" + File.separator + ""metadata_list.xls"";
-    public static final String TEST_FILE = ""Data"" + File.separator + ""air_test.txt"";
-
-    private Map<String, Set<String>> conceptsToMGRastTerm;
-
-    private Set<String> allMgRastConcepts;
-
-    private Pattern toFind;
-
-    public MGRastConceptMapper() {
-        createIndex();
-    }
-
-    private void createIndex() {
-        MGRastConceptIndexer indexCreator = new MGRastConceptIndexer();
-
-        File mgRastMappingFile = new File(mappingFileLocation);
-
-        if (mgRastMappingFile.exists()) {
-            // continue
-            indexCreator.createIndex(mgRastMappingFile);
-            conceptsToMGRastTerm = indexCreator.getConceptsToMGRastTerm();
-            allMgRastConcepts = indexCreator.getAllConcepts();
-        } else {
-            System.err.println(""No mapping file found at : "" + mgRastMappingFile.getAbsolutePath());
-        }
-    }
-
-    public FieldMapping getMGRastTermFromGSCTerm(String isaTerm, String checkListType) {
-
-        String lcISATerm = isaTerm.toLowerCase();
-
-        Set<String> tuplesForGSCTerm = null;
-        if (conceptsToMGRastTerm != null) {
-            for (String value : conceptsToMGRastTerm.keySet()) {
-                // Since the mgrast ter
-
-                // if the word length is too short we perform a direct match on the term. Since checking to see if
-                // ph is contained in something like phenotype will not give us the correct result...
-                if (value.length() > 4) {
-                    // Simplest case.
-                    if (lcISATerm.contains(value)) {
-                        String term = interrogatePossibilitiesForCorrectTerm(
-                                conceptsToMGRastTerm.get(value), checkListType);
-
-
-                        return new FieldMapping(isaTerm, term, term.equals("""") ? ConfidenceLevel.ZERO_PERCENT : ConfidenceLevel.SEVENTY_FIVE_PERCENT);
-                    }
-                    // replace or insert '_' | "" "" where applicable since some terms are represented
-                    // inconsistently. e.g.alkyl_diether could be matched by alkyl diether
-                    else if (replaceSpacesWithUnderscores(lcISATerm).contains(value) || replaceUnderscoresWithSpaces(lcISATerm).contains(value)) {
-
-                        String term = interrogatePossibilitiesForCorrectTerm(
-                                conceptsToMGRastTerm.get(value), checkListType);
-
-                        return new FieldMapping(isaTerm, term, term.equals("""") ? ConfidenceLevel.ZERO_PERCENT : ConfidenceLevel.SEVENTY_FIVE_PERCENT);
-                    }
-                    // else, when all else has failed, if the value has more than one word, we build k-tuples of the strings
-                    // to check for presence of values
-                    else {
-                        if (tuplesForGSCTerm == null) {
-                            String tmpISATerm = cleanupString(isaTerm.toLowerCase());
-                            tuplesForGSCTerm = buildKTuples(tmpISATerm);
-                        }
-
-                        for (String tuple : tuplesForGSCTerm) {
-                            if (value.contains(tuple)) {
-
-                                String term = interrogatePossibilitiesForCorrectTerm(
-                                        conceptsToMGRastTerm.get(value), checkListType);
-
-                                return new FieldMapping(isaTerm, term, term.equals("""") ? ConfidenceLevel.ZERO_PERCENT : ConfidenceLevel.FIFTY_PERCENT);
-                            }
-                        }
-                    }
-
-                } else {
-                    String tmpISATerm = cleanupString(isaTerm.toLowerCase());
-
-                    if (value.equalsIgnoreCase(tmpISATerm)) {
-
-                        String term = interrogatePossibilitiesForCorrectTerm(
-                                conceptsToMGRastTerm.get(value), checkListType);
-
-                        return new FieldMapping(isaTerm, term, term.equals("""") ? ConfidenceLevel.ZERO_PERCENT : ConfidenceLevel.SEVENTY_FIVE_PERCENT);
-                    }
-                }
-            }
-        }
-
-        return new FieldMapping(isaTerm, """", ConfidenceLevel.ZERO_PERCENT);
-
-    }
-
-    private String replaceSpacesWithUnderscores(String toModify) {
-        return toModify.replaceAll(""\\s+"", ""_"");
-    }
-
-    private String replaceUnderscoresWithSpaces(String toModify) {
-        return toModify.replaceAll(""_"", ""+"");
-    }
-
-    private String cleanupString(String toClean) {
-        return toClean.replaceAll(""(characteristics\\[)|(factor value\\[)|(parameter value\\[)|(comment\\[)|\\]"", """");
-    }
-
-    /**
-     * Method builds all the permutations of a number of words, removing prepositions and definite/indefinite articles
-     *
-     * @param toPermutate String to split and move words around in
-     * @return Set<String> representating all permutations.
-     */
-    private Set<String> buildKTuples(String toPermutate) {
-        // prepare the String by removing all definite/indefinite articles and removing prepositions
-
-        toPermutate = GrammarUtil.removeValuesFromString(toPermutate, DefiniteArticlesAndConjunctions.buildRegexForDetection());
-        toPermutate = GrammarUtil.removeValuesFromString(toPermutate, Prepositions.buildRegexForDetection());
-
-        String[] words = toPermutate.split(""\\s+|_"");
-
-        Set<String> result = new HashSet<String>();
-
-        for (int outerLoop = 0; outerLoop < words.length; outerLoop++) {
-            for (int innerLoop = 0; innerLoop < words.length; innerLoop++) {
-                // miss doubling the same word
-                if (outerLoop != innerLoop) {
-                    result.add(words[outerLoop] + "" "" + words[innerLoop]);
-                }
-            }
-        }
-
-        return result;
-    }
-
-
-    private String interrogatePossibilitiesForCorrectTerm(Set<String> possibleConcepts, String checkListType) {
-
-        if (possibleConcepts != null) {
-            if (possibleConcepts.size() == 1) {
-                return possibleConcepts.iterator().next();
-            } else {
-                for (String candidateConcept : possibleConcepts) {
-
-                    if (findChecklist(candidateConcept)) {
-                        return candidateConcept;
-                    }
-
-                }
-            }
-        }
-
-        return """";
-
-    }
-
-    private boolean findChecklist(String text) {
-        if (toFind == null) {
-            toFind = Pattern.compile(""(air)|(sample-origin)|(sample-isolation)|(host)|(human)|(microbial)|(miscellaneous)|(plant)|(sediment)|(water)|(soil)"");
-        }
-
-        Matcher m = toFind.matcher(text);
-        return m.find();
-    }
-
-    private Set<String> createTestDataFromFile() {
-        File testData = new File(TEST_FILE);
-
-        Set<String> testTerms = new HashSet<String>();
-
-        if (testData.exists()) {
-            try {
-                Scanner fileScanner = new Scanner(testData);
-
-                while (fileScanner.hasNextLine()) {
-                    String value = fileScanner.nextLine().trim().toLowerCase();
-                    testTerms.add(value);
-                }
-
-            } catch (FileNotFoundException e) {
-                System.err.println(""File not found"");
-            }
-
-
-        } else {
-            System.err.println(""Test data doesn't exist"");
-
-        }
-        return testTerms;
-    }
-
-
-    public static void main(String[] args) {
-        MGRastConceptMapper mapper = new MGRastConceptMapper();
-
-        Set<String> testData = mapper.createTestDataFromFile();
-
-        System.out.println(""Testing with "" + testData.size() + "" terms"");
-
-        StringBuffer buffer = new StringBuffer();
-
-        int failCount = 0;
-        for (String testItem : testData) {
-            FieldMapping mgRastTerm = mapper.getMGRastTermFromGSCTerm(testItem, ""air"");
-            if (mgRastTerm.getConfidenceLevel() == ConfidenceLevel.ZERO_PERCENT) {
-                failCount++;
-            }
-            buffer.append(testItem).append(""\t"").append(mgRastTerm).append(""\n"");
-        }
-
-        System.out.println(""Success matched = "" + (testData.size() - failCount) + ""/"" + testData.size());
-
-        System.out.println();
-
-        System.out.println(buffer.toString());
-
-    }
-
-    public Set<String> getAllMgRastConcepts() {
-        return allMgRastConcepts;
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/Prepositions.java b/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/Prepositions.java
deleted file mode 100644
index a8a71762..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/conceptmapper/Prepositions.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.conceptmapper;
-
-/**
- * Prepositions
- *
- * @author eamonnmaguire
- * @date Sep 23, 2010
- */
-public enum Prepositions {
-    BENEATH(""beneath""), AGAINST(""against""), BESIDE(""beside""), DURING(""during""), ABOUT(""about""),
-    ABOVE(""above""), ACROSS(""across""), AFTER(""after""), ALONG(""along""), AMONG(""among""), AROUND(""around""), AT(""at""), BEFORE(""before""),
-    BEHIND(""behind""), BELOW(""below""), BETWEEN(""betwen""), BEYOND(""beyond""), BUT(""but""), BY(""by""), DESPITE(""despite""), DOWN(""down""),
-    EXCEPT(""except""), FOR(""for""), FROM(""from""), IN(""in""), INSIDE(""inside""), INTO(""into""), LIKE(""like""), NEAR(""near""), OF(""of""),
-    OFF(""off""), ON(""on""), ONTO(""onto""), OUT(""out""), OUTSIDE(""outside""), OVER(""over""), PAST(""past""), SINCE(""since""), THROUGH(""through""),
-    THROUGHOUT(""throughout""), TILL(""till""), TO(""to""), TOWARD(""toward""), UNDER(""under""), UNDERNEATH(""underneath""), UNTIL(""until""), UP(""up""),
-    UPON(""upon""), WITH(""with""), WITHIN(""within""), WITHOUT(""without"");
-
-    private String representation;
-
-    Prepositions(String representation) {
-        this.representation = representation;
-    }
-
-    @Override
-    public String toString() {
-        return representation;
-    }
-
-    public static String buildRegexForDetection() {
-        return GrammarUtil.buildRegexForDetection(values());
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/io/FileExporter.java b/src/main/java/org/isatools/isacreator/mgrast/io/FileExporter.java
deleted file mode 100644
index 2a9f51a4..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/io/FileExporter.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.io;
-
-import org.apache.log4j.Logger;
-import org.isatools.isacreator.mgrast.model.*;
-import org.isatools.isacreator.mgrast.ui.ExtraMetaDataPane;
-import org.isatools.isacreator.mgrast.utils.APIHook;
-import org.isatools.isacreator.utils.PropertyFileIO;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * FileExporter
- *
- * @author eamonnmaguire
- * @date Oct 1, 2010
- */
-
-
-public class FileExporter {
-
-    private static final Logger log = Logger.getLogger(FileExporter.class.getName());
-    public static final String MAPPING_HISTORY_FILE = ""mgRastMappingHistory.properties"";
-
-    public FileExporter() {
-
-    }
-
-    public void outputFiles(File outputDirectory, Map<String, FieldMapping> fieldMappings, List<SampleExternalIds> sampleExtIds, ExtraMetaDataPane metaData, APIHook apiHook) {
-
-        // try to map out files
-        StringBuilder projectMetadata = new ProjectMetadataAdapter(metaData).getDataFromMetaDataPane();
-
-        Map<String, Map<String, List<String>>> sampleToData = apiHook.getDataForSamples(apiHook.getSampleNames());
-
-
-        // for each sample, we want to output 1 or more files (more in case of replicates...)
-        for (SampleExternalIds seId : sampleExtIds) {
-            Map<Integer, StringBuilder> samplesToOutput = new HashMap<Integer, StringBuilder>();
-
-            StringBuilder sampleDescription = new StringBuilder();
-            sampleDescription.append(""project-description_metagenome_name"").append(""\t"").append(seId.getSampleName()).append(""\n"");
-
-            sampleDescription.append(projectMetadata);
-
-            for (ExternalResources er : seId.getExternalIds().keySet()) {
-                sampleDescription.append(er.getMgRastTerm()).append(""\t"").append(seId.getExternalIds().get(er)).append(""\n"");
-            }
-
-            for (String dataColumn : sampleToData.get(seId.getSampleName()).keySet()) {
-                if (fieldMappings.containsKey(dataColumn)) {
-                    // get mg_rast term if one exists. if no mapping exists, don't output it.
-                    FieldMapping fm = fieldMappings.get(dataColumn);
-                    if (fm.getConfidenceLevel() != ConfidenceLevel.ZERO_PERCENT) {
-                        List<String> columnValues = sampleToData.get(seId.getSampleName()).get(dataColumn);
-
-                        for (int valueCount = 0; valueCount < columnValues.size(); valueCount++) {
-                            if (!samplesToOutput.containsKey(valueCount)) {
-                                samplesToOutput.put(valueCount, new StringBuilder());
-                            }
-
-                            // todo look here at what happens
-                            samplesToOutput.get(valueCount).append(fm.getMgRastTermMappedTo()).append(""\t"")
-                                    .append(sampleToData.get(seId.getSampleName()).get(dataColumn).get(valueCount)).append(""\n"");
-                        }
-                    }
-                }
-            }
-
-            for (int samples : samplesToOutput.keySet()) {
-                outputFileToDirectory(outputDirectory, seId.getSampleName(), sampleDescription.append(samplesToOutput.get(samples)), samples);
-            }
-        }
-    }
-
-    private void outputFileToDirectory(File outputDirectory, String sampleName, StringBuilder output, int count) {
-
-        File enclosingDir = new File(outputDirectory.getAbsolutePath() + File.separator + ""MGRastExport"");
-
-        if (!enclosingDir.exists()) {
-            enclosingDir.mkdir();
-        }
-
-        File newFile = new File(enclosingDir.getAbsolutePath() + File.separator + sampleName + (count == 0 ? """" : ""-"" + (count + 1)) + ""-mgrast.txt"");
-
-        try {
-            PrintStream ps = new PrintStream(newFile);
-
-            ps.print(output.toString());
-
-            ps.close();
-
-        } catch (FileNotFoundException e) {
-            System.err.println(e.getMessage());
-            log.error(e);
-        }
-    }
-
-    public Properties loadMappingHistory() {
-        Properties mappings = PropertyFileIO.loadSettings(MAPPING_HISTORY_FILE);
-        if (mappings == null) {
-            mappings = new Properties();
-        }
-
-        return mappings;
-    }
-
-    public void saveMappingHistory(Properties toSave) {
-        PropertyFileIO.saveProperties(toSave, MAPPING_HISTORY_FILE);
-    }
-
-
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/model/ConfidenceLevel.java b/src/main/java/org/isatools/isacreator/mgrast/model/ConfidenceLevel.java
deleted file mode 100644
index d5ab0b77..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/model/ConfidenceLevel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.model;
-
-/**
- * ConfidenceLevel
- * <p/>
- * Represents levels of confidence in some assumption.
- *
- * @author eamonnmaguire
- * @date Sep 29, 2010
- */
-public enum ConfidenceLevel {
-    ONE_HUNDRED_PERCENT, SEVENTY_FIVE_PERCENT, FIFTY_PERCENT, TWENTY_FIVE_PERCENT, ZERO_PERCENT
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/model/ExternalResources.java b/src/main/java/org/isatools/isacreator/mgrast/model/ExternalResources.java
deleted file mode 100644
index 42ca5966..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/model/ExternalResources.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.model;
-
-/**
- * ExternalResources
- *
- * @author eamonnmaguire
- * @date Sep 28, 2010
- */
-public enum ExternalResources {
-
-    GOLD(""GOLD Id"", ""external-Ids_gold_id"");
-    private String uiId;
-    private String mgRastTerm;
-
-    ExternalResources(String uiId, String mgRastTerm) {
-        this.uiId = uiId;
-        this.mgRastTerm = mgRastTerm;
-    }
-
-    public String getUiId() {
-        return uiId;
-    }
-
-    public String getMgRastTerm() {
-        return mgRastTerm;
-    }
-
-    public String toString() {
-        return getUiId();
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/model/FieldMapping.java b/src/main/java/org/isatools/isacreator/mgrast/model/FieldMapping.java
deleted file mode 100644
index c99b09c9..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/model/FieldMapping.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.model;
-
-/**
- * FieldMapping
- * <p/>
- * Represents a mapping between an ISAtab field and a concept in MG-Rast with a confidence level in the mapping.
- * <p/>
- * Confidence levels are calculated based on the way the mapping was performed. E.g. in the algorithm, if a direct mapping
- * was found, the level would be 100%, however, if there is any doubt in the final mapping, as a result of undefined checklist
- * type, e.g. not specifying that the checklist is defining air samples, the mapping confidence will immediately drop to 50%.
- * <p/>
- * If the user manually selects a mapping after the automatic mapping was performed, the confidence level will be set at 100%
- * since we assume the selection is correct...perhaps wrongly?
- *
- * @author eamonnmaguire
- * @date Sep 29, 2010
- */
-
-
-public class FieldMapping {
-
-    private String isatabFieldName;
-    private String mgRastTermMappedTo;
-    private ConfidenceLevel confidenceLevel;
-
-    public FieldMapping(String isatabFieldName, String mgRastTermMappedTo, ConfidenceLevel confidenceLevel) {
-        this.isatabFieldName = isatabFieldName;
-        this.mgRastTermMappedTo = mgRastTermMappedTo;
-        this.confidenceLevel = confidenceLevel;
-    }
-
-    public ConfidenceLevel getConfidenceLevel() {
-        return confidenceLevel;
-    }
-
-    public String getIsatabFieldName() {
-        return isatabFieldName;
-    }
-
-    public String getMgRastTermMappedTo() {
-        return mgRastTermMappedTo;
-    }
-
-    public String toString() {
-        return isatabFieldName;
-    }
-
-    public void setConfidenceLevel(ConfidenceLevel confidenceLevel) {
-        this.confidenceLevel = confidenceLevel;
-    }
-
-    public void setMgRastTermMappedTo(String mgRastTermMappedTo) {
-        this.mgRastTermMappedTo = mgRastTermMappedTo;
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/model/ProjectMetadataAdapter.java b/src/main/java/org/isatools/isacreator/mgrast/model/ProjectMetadataAdapter.java
deleted file mode 100644
index e58c5abe..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/model/ProjectMetadataAdapter.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.model;
-
-import org.isatools.isacreator.mgrast.ui.ExtraMetaDataPane;
-import org.isatools.isacreator.model.Contact;
-
-/**
- * ProjectMetadataAdapter
- * Attaches on to an ExtraMetaDataPane UI component to extract it's information and prepare it for output.
- *
- * @author eamonnmaguire
- * @date Oct 1, 2010
- */
-
-
-public class ProjectMetadataAdapter {
-    private static final String ADMIN_CONTACT_PREFIX = ""administrative-contact_PI_"";
-    private static final String TECHNICAL_CONTACT_PREFIX = ""technical-contact_"";
-
-
-    private ExtraMetaDataPane metaDataPane;
-
-    public ProjectMetadataAdapter(ExtraMetaDataPane metaDataPane) {
-
-        this.metaDataPane = metaDataPane;
-    }
-
-    public StringBuilder getDataFromMetaDataPane() {
-        StringBuilder output = new StringBuilder();
-
-        output.append(""project-description_internal_project_ID"").append(""\t"").append(metaDataPane.getInternalProjectId()).append(""\n"");
-        output.append(""project-description_project_name"").append(""\t"").append(metaDataPane.getProjectName()).append(""\n"");
-        output.append(""project-description_project_description"").append(""\t\"""").append(metaDataPane.getProjectDescription()).append(""\"""").append(""\n"");
-        output.append(""external-ids_pubmed_id"").append(""\t"").append(metaDataPane.getPubmedId()).append(""\n"");
-        output.append(""external-ids_project_id"").append(""\t"").append(metaDataPane.getNCBIProjectId()).append(""\n"");
-        output.append(""external-ids_greengenes_study_id"").append(""\t"").append(metaDataPane.getGreenegenesStudyId()).append(""\n"");
-
-        buildContactSection(output, metaDataPane.getAdminContact(), ADMIN_CONTACT_PREFIX);
-        buildContactSection(output, metaDataPane.getTechnicalContact(), TECHNICAL_CONTACT_PREFIX);
-
-        return output;
-    }
-
-    private void buildContactSection(StringBuilder output, Contact contact, String sectionPrefix) {
-        output.append(sectionPrefix).append(""firstname"").append(""\t"").append(contact.getFirstName()).append(""\n"");
-        output.append(sectionPrefix).append(""lastname"").append(""\t"").append(contact.getLastName()).append(""\n"");
-        output.append(sectionPrefix).append(""email"").append(""\t"").append(contact.getEmail()).append(""\n"");
-        output.append(sectionPrefix).append(""organization"").append(""\t"").append(contact.getAffiliation()).append(""\n"");
-        output.append(sectionPrefix).append(""organization_address"").append(""\t"").append(contact.getAddress()).append(""\n"");
-        output.append(sectionPrefix).append(""url"").append(""\t"").append("""").append(""\n"");
-
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/model/SampleExternalIds.java b/src/main/java/org/isatools/isacreator/mgrast/model/SampleExternalIds.java
deleted file mode 100644
index 8d54cbb1..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/model/SampleExternalIds.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * SampleExternalIds
- *
- * @author Eamonn Maguire
- * @date Sep 28, 2010
- */
-
-
-public class SampleExternalIds {
-
-    private String sampleName;
-
-    private Map<ExternalResources, String> externalIds;
-
-    public SampleExternalIds(String sampleName) {
-        this.sampleName = sampleName;
-        externalIds = new HashMap<ExternalResources, String>();
-    }
-
-    public String getSampleName() {
-        return sampleName;
-    }
-
-    public Map<ExternalResources, String> getExternalIds() {
-        return externalIds;
-    }
-
-
-    /**
-     * Returns a value for an ExternalResources type given an External resource. R
-     *
-     * @param resource - @see ExternalResources
-     * @return null if no value available, a String otherwise.
-     */
-    public String getValueByExternalResource(ExternalResources resource) {
-        if (externalIds.containsKey(resource)) {
-            return externalIds.get(resource);
-        }
-
-        return """";
-    }
-
-    @Override
-    public String toString() {
-        return sampleName;
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/ExternalIdListCellRenderer.java b/src/main/java/org/isatools/isacreator/mgrast/ui/ExternalIdListCellRenderer.java
deleted file mode 100644
index 4c644899..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/ExternalIdListCellRenderer.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import org.isatools.isacreator.common.UIHelper;
-import org.isatools.isacreator.mgrast.model.ExternalResources;
-import org.isatools.isacreator.mgrast.model.SampleExternalIds;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-
-/**
- * ExternalIdListCellRenderer
- *
- * @author eamonnmaguire
- * @date Sep 28, 2010
- */
-
-
-public class ExternalIdListCellRenderer extends JComponent
-        implements ListCellRenderer {
-
-    @InjectedResource
-    private ImageIcon idEntered, noIdEntered;
-
-    private DefaultListCellRenderer listCellRenderer;
-
-    public ExternalIdListCellRenderer() {
-        setLayout(new BorderLayout());
-        setBackground(Color.WHITE);
-
-        ResourceInjector.get(""exporter-package.style"").inject(this);
-
-        add(new IDEnteredListCellmage(), BorderLayout.WEST);
-
-        listCellRenderer = new DefaultListCellRenderer();
-        add(listCellRenderer, BorderLayout.CENTER);
-
-        setBorder(new EmptyBorder(2, 2, 2, 2));
-    }
-
-
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean cellGotFocus) {
-        listCellRenderer.getListCellRendererComponent(list, value, index,
-                selected, cellGotFocus);
-        listCellRenderer.setBorder(null);
-
-        //image.checkIsIdEntered(selected);
-        Component[] components = getComponents();
-
-        SampleExternalIds sampleObj = (SampleExternalIds) value;
-
-        for (Component c : components) {
-            ((JComponent) c).setToolTipText(value.toString());
-            if (c instanceof IDEnteredListCellmage) {
-                ((IDEnteredListCellmage) c).checkIsIdEntered(sampleObj);
-            } else {
-                if (selected) {
-                    c.setForeground(UIHelper.GREY_COLOR);
-                    c.setBackground(UIHelper.BG_COLOR);
-                    c.setFont(UIHelper.VER_11_BOLD);
-                } else {
-                    c.setForeground(UIHelper.LIGHT_GREEN_COLOR);
-                    c.setBackground(UIHelper.BG_COLOR);
-                    c.setFont(UIHelper.VER_11_BOLD);
-                }
-            }
-        }
-
-
-        return this;
-    }
-
-    class IDEnteredListCellmage extends JPanel {
-        // this will contain the general panel layout for the list item and modifier elements to allow for changing of images
-        // when rendering an item as being selected and so forth.
-        private JLabel itemSelectedIndicator;
-
-        IDEnteredListCellmage() {
-            setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-            itemSelectedIndicator = new JLabel(noIdEntered);
-
-            add(itemSelectedIndicator);
-            add(Box.createHorizontalStrut(2));
-        }
-
-        public void checkIsIdEntered(SampleExternalIds sampleId) {
-
-            boolean valueEntered = false;
-            for (ExternalResources er : sampleId.getExternalIds().keySet()) {
-                if (!sampleId.getExternalIds().get(er).trim().equals("""")) {
-                    valueEntered = true;
-                    break;
-                }
-            }
-
-            if (valueEntered) {
-                itemSelectedIndicator.setIcon(idEntered);
-            } else {
-                itemSelectedIndicator.setIcon(noIdEntered);
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/ExtraMetaDataPane.java b/src/main/java/org/isatools/isacreator/mgrast/ui/ExtraMetaDataPane.java
deleted file mode 100644
index 3657438b..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/ExtraMetaDataPane.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import com.explodingpixels.macwidgets.IAppWidgetFactory;
-import org.isatools.isacreator.common.CustomTextField;
-import org.isatools.isacreator.common.UIHelper;
-import org.isatools.isacreator.model.Contact;
-
-import javax.swing.*;
-import javax.swing.border.LineBorder;
-import java.awt.*;
-import java.util.List;
-
-/**
- * ExtraMetaDataPane contains the entry fields for extra metadata items such as external project ids
- * and so forth.
- *
- * @author Eamonn Maguire
- * @date Sep 24, 2010
- */
-
-
-public class ExtraMetaDataPane extends JPanel {
-
-    // fields required for:
-    //	- project name - internal project id - technical contact - administrative contact - ncbi project id
-
-    private CustomTextField projectName;
-    private JTextArea projectDescription;
-
-    private CustomTextField pubmedId;
-    private CustomTextField ncbiProjectId;
-    private CustomTextField internalProjectId;
-    private CustomTextField greengenesStudyId;
-
-    private JComboBox technicalContact;
-    private JComboBox administrativeContact;
-    private List<Contact> contacts;
-
-    // COMBO box for technical contact
-    // COMBO box for administrative contact
-
-    public ExtraMetaDataPane() {
-
-        createGUI();
-    }
-
-    private void createGUI() {
-        setLayout(new BorderLayout());
-        setBackground(UIHelper.BG_COLOR);
-        createDataEntryFields();
-        layoutItemsOnScreen();
-    }
-
-    private void createDataEntryFields() {
-        // should be set to the study id.
-        projectName = new CustomTextField(""project name"", true, new Dimension(160, 18));
-        pubmedId = new CustomTextField(""pubmed id"", false, new Dimension(110, 18));
-        ncbiProjectId = new CustomTextField(""ncbi project id"", false, new Dimension(130, 18));
-        internalProjectId = new CustomTextField(""internal project id"", false, new Dimension(110, 18));
-        greengenesStudyId = new CustomTextField(""greengenes study id"", false, new Dimension(130, 18));
-
-        createComboBoxes();
-
-    }
-
-    private Container createTextAreaEntry() {
-
-        // should be set to the study description.
-        projectDescription = new JTextArea();
-        UIHelper.renderComponent(projectDescription, UIHelper.VER_10_BOLD, UIHelper.GREY_COLOR, UIHelper.BG_COLOR);
-        projectDescription.setLineWrap(true);
-        projectDescription.setWrapStyleWord(true);
-
-        JScrollPane projectDescScroller = new JScrollPane(projectDescription,
-                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-
-        projectDescScroller.setBorder(new LineBorder(UIHelper.GREY_COLOR, 1));
-        projectDescScroller.getViewport().setBackground(UIHelper.BG_COLOR);
-        projectDescScroller.setPreferredSize(new Dimension(140, 40));
-
-        IAppWidgetFactory.makeIAppScrollPane(projectDescScroller);
-
-        // add text editor button here? I think I will :)
-
-        return projectDescScroller;
-    }
-
-    private void createComboBoxes() {
-
-        String[] contactsAsArray = new String[]{""nothing""};
-
-        technicalContact = new JComboBox(contactsAsArray);
-        technicalContact.setPreferredSize(new Dimension(140, 20));
-        UIHelper.renderComponent(technicalContact, UIHelper.VER_10_BOLD, UIHelper.GREY_COLOR, UIHelper.BG_COLOR);
-        UIHelper.setJComboBoxAsHeavyweight(technicalContact);
-
-        administrativeContact = new JComboBox(contactsAsArray);
-        administrativeContact.setPreferredSize(new Dimension(140, 20));
-        UIHelper.renderComponent(administrativeContact, UIHelper.VER_10_BOLD, UIHelper.GREY_COLOR, UIHelper.BG_COLOR);
-        UIHelper.setJComboBoxAsHeavyweight(administrativeContact);
-    }
-
-    private void layoutItemsOnScreen() {
-
-        Box container = Box.createHorizontalBox();
-
-        Box g1 = Box.createVerticalBox();
-        g1.add(projectName);
-        g1.add(prepareComponentForInsertion(""project description"", createTextAreaEntry(), 6));
-
-        // add project description here
-
-        container.add(g1);
-
-        Box g2 = Box.createVerticalBox();
-        g2.add(internalProjectId);
-        g2.add(pubmedId);
-        container.add(g2);
-
-        Box g3 = Box.createVerticalBox();
-        g3.add(ncbiProjectId);
-        g3.add(greengenesStudyId);
-
-        container.add(g3);
-
-        Box g4 = Box.createVerticalBox();
-        g4.add(prepareComponentForInsertion(""admin contact"", administrativeContact, 0));
-        g4.add(prepareComponentForInsertion(""technical contact"", technicalContact, 0));
-
-        container.add(g4);
-
-        add(container, BorderLayout.WEST);
-    }
-
-    private Container prepareComponentForInsertion(String componentLabel, Component c, int leftPadding) {
-        Box container = Box.createVerticalBox();
-
-        Box labelContainer = Box.createHorizontalBox();
-
-        JLabel field = UIHelper.createLabel(componentLabel, UIHelper.VER_10_BOLD, UIHelper.GREY_COLOR, SwingConstants.LEFT);
-        labelContainer.add(Box.createHorizontalStrut(leftPadding));
-        labelContainer.add(UIHelper.wrapComponentInPanel(field));
-
-        container.add(labelContainer);
-
-        Box componentContainer = Box.createHorizontalBox();
-
-        componentContainer.add(Box.createHorizontalStrut(leftPadding));
-        componentContainer.add(c);
-        componentContainer.add(Box.createHorizontalStrut(18));
-
-        container.add(componentContainer);
-
-        return container;
-    }
-
-    public void setContacts(List<Contact> contacts) {
-        this.contacts = contacts;
-
-        technicalContact.removeAllItems();
-        administrativeContact.removeAllItems();
-
-        for (Contact c : contacts) {
-            technicalContact.addItem(c);
-            administrativeContact.addItem(c);
-        }
-    }
-
-    public boolean areAllFieldsValid() {
-        return projectName.isValidInput();
-    }
-
-    public void setPubmedId(String projectIdentifier) {
-        pubmedId.setText(projectIdentifier);
-    }
-
-    public String getPubmedId() {
-        return pubmedId.getText();
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName.setText(projectName);
-    }
-
-    public String getProjectName() {
-        return projectName.getText();
-    }
-
-    public void setProjectDescription(String projectDesc) {
-        projectDescription.setText(projectDesc);
-    }
-
-    public String getProjectDescription() {
-        return projectDescription.getText();
-    }
-
-    public void setInternalProjectId(String internalProjectIdentifier) {
-        internalProjectId.setText(internalProjectIdentifier);
-    }
-
-    public String getInternalProjectId() {
-        return internalProjectId.getText();
-    }
-
-    public void setNCBIProjectId(String ncbiProjectIdentifier) {
-        ncbiProjectId.setText(ncbiProjectIdentifier);
-    }
-
-    public String getNCBIProjectId() {
-        return ncbiProjectId.getText();
-    }
-
-    public void setGreenegenesStudyId(String greenegenesStudyIdentifier) {
-        greengenesStudyId.setText(greenegenesStudyIdentifier);
-    }
-
-    public String getGreenegenesStudyId() {
-        return greengenesStudyId.getText();
-    }
-
-    public Contact getAdminContact() {
-        return (Contact) administrativeContact.getSelectedItem();
-    }
-
-    public Contact getTechnicalContact() {
-        return (Contact) technicalContact.getSelectedItem();
-    }
-
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/HelpPane.java b/src/main/java/org/isatools/isacreator/mgrast/ui/HelpPane.java
deleted file mode 100644
index a93a4f80..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/HelpPane.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import org.isatools.isacreator.common.UIHelper;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * HelpPane
- *
- * @author eamonnmaguire
- * @date Sep 24, 2010
- */
-
-
-public class HelpPane extends JPanel {
-
-    @InjectedResource
-    private ImageIcon helpImage;
-
-    public HelpPane() {
-        ResourceInjector.get(""exporters-package.style"").inject(this);
-        setLayout(new BorderLayout());
-        setBackground(UIHelper.BG_COLOR);
-    }
-
-    public void createGUI() {
-        JLabel helpContainer = new JLabel(helpImage);
-        add(UIHelper.wrapComponentInPanel(helpContainer));
-    }
-
-
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/MGRastConceptListCellRenderer.java b/src/main/java/org/isatools/isacreator/mgrast/ui/MGRastConceptListCellRenderer.java
deleted file mode 100644
index 8ed29232..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/MGRastConceptListCellRenderer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import org.isatools.isacreator.common.UIHelper;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-
-/**
- * MGRastConceptListCellRenderer
- *
- * @author eamonnmaguire
- * @date Sep 28, 2010
- */
-
-
-public class MGRastConceptListCellRenderer extends JComponent
-        implements ListCellRenderer {
-
-
-    @InjectedResource
-    private ImageIcon mappedTo, notMappedTo;
-    // renderer will show which MGrast concept is mapped to the selected
-    // ISAtab file term.
-    private DefaultListCellRenderer listCellRenderer;
-
-
-    public MGRastConceptListCellRenderer() {
-        setLayout(new BorderLayout());
-        setBackground(Color.WHITE);
-
-        ResourceInjector.get(""exporters-package.style"").inject(this);
-
-        add(new CellImage(), BorderLayout.WEST);
-
-        listCellRenderer = new DefaultListCellRenderer();
-
-
-        add(listCellRenderer, BorderLayout.CENTER);
-
-        setBorder(new EmptyBorder(2, 2, 2, 2));
-    }
-
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean cellGotFocus) {
-        listCellRenderer.getListCellRendererComponent(list, value, index,
-                selected, cellGotFocus);
-        listCellRenderer.setBorder(null);
-
-        //image.checkIsIdEntered(selected);
-        Component[] components = getComponents();
-
-        for (Component c : components) {
-            ((JComponent) c).setToolTipText(value.toString());
-            if (c instanceof CellImage) {
-                ((CellImage) c).setSelected(selected);
-            } else {
-                if (selected) {
-                    c.setForeground(UIHelper.GREY_COLOR);
-                    c.setBackground(UIHelper.BG_COLOR);
-                    c.setFont(UIHelper.VER_11_BOLD);
-
-                } else {
-                    c.setForeground(UIHelper.LIGHT_GREEN_COLOR);
-                    c.setBackground(UIHelper.BG_COLOR);
-                    c.setFont(UIHelper.VER_11_BOLD);
-                }
-            }
-        }
-
-
-        return this;
-    }
-
-    class CellImage extends JPanel {
-        // this will contain the general panel layout for the list item and modifier elements to allow for changing of images
-        // when rendering an item as being selected and so forth.
-        private JLabel itemSelectedIndicator;
-
-        CellImage() {
-            setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-            itemSelectedIndicator = new JLabel(notMappedTo);
-
-            add(itemSelectedIndicator);
-            add(Box.createHorizontalStrut(2));
-        }
-
-        public void setSelected(boolean selected) {
-
-            if (selected) {
-                itemSelectedIndicator.setIcon(mappedTo);
-            } else {
-                itemSelectedIndicator.setIcon(notMappedTo);
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/MGRastUI.java b/src/main/java/org/isatools/isacreator/mgrast/ui/MGRastUI.java
deleted file mode 100644
index a4b4022f..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/MGRastUI.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import org.isatools.isacreator.archiveoutput.ArchiveOutputWindow;
-import org.isatools.isacreator.common.SelectOutputDirectoryDialog;
-import org.isatools.isacreator.common.UIHelper;
-import org.isatools.isacreator.common.dialog.ConfirmationDialog;
-import org.isatools.isacreator.common.dialog.WarningDialog;
-import org.isatools.isacreator.gui.ISAcreator;
-import org.isatools.isacreator.mgrast.conceptmapper.MGRastConceptMapper;
-import org.isatools.isacreator.mgrast.io.FileExporter;
-import org.isatools.isacreator.mgrast.model.ConfidenceLevel;
-import org.isatools.isacreator.mgrast.model.FieldMapping;
-import org.isatools.isacreator.mgrast.model.SampleExternalIds;
-import org.isatools.isacreator.mgrast.utils.APIHook;
-import org.isatools.isacreator.model.Publication;
-import org.isatools.isacreator.model.Study;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import javax.swing.border.EtchedBorder;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.*;
-import java.util.List;
-
-/**
- * MGRastUI
- *
- * @author eamonnmaguire
- * @date Sep 24, 2010
- */
-
-
-public class MGRastUI extends JDialog {
-
-    static {
-        ResourceInjector.addModule(""org.jdesktop.fuse.swing.SwingModule"");
-
-        ResourceInjector.get(""exporters-package.style"").load(
-                ArchiveOutputWindow.class.getResource(""/dependency-injections/exporters-package.properties""));
-        ResourceInjector.get(""common-package.style"").load(
-                ArchiveOutputWindow.class.getResource(""/dependency-injections/common-package.properties""));
-        ResourceInjector.get(""longtexteditor-package.style"").load(
-                ArchiveOutputWindow.class.getResource(""/dependency-injections/longtexteditor-package.properties""));
-
-    }
-
-
-    private ConfirmationDialog confirmChoice;
-
-    public static final int MAPPING_INFO = 0;
-    public static final int SAMPLE_INFO = 1;
-    public static final int HELP = 2;
-
-    @InjectedResource
-    private ImageIcon mgRastHeader, mgRastExportSampleSection, weKnowIcon, weKnowIconOver, weDoNotKnowIcon,
-            weDoNotKnowIconOver, helpIcon, helpIconOver, closeWindowIcon, closeWindowIconOver, exportIcon,
-            exportIconOver, buttonPanelSeparator, loadingSamples, mappingConcepts, noProjectNameWarning, exportHeader;
-
-    private JPanel swappableContainer;
-
-    private JLabel mappingInfoButton, sampleInfoButton, helpButton;
-
-    private int selectedSection = HELP;
-
-    private HelpPane helpPane;
-    private ExtraMetaDataPane projectMetadata;
-    private SampleInfoPane sampleInfoPane;
-    private TermMappingUI termMappingPane;
-    private ISAcreator isacreatorEnvironment;
-    private APIHook mgRastAPIHook;
-
-    private FileExporter fileUtils;
-    private Properties mappingHistory;
-
-    private Map<String, FieldMapping> fieldMappings;
-    private List<SampleExternalIds> externalIds;
-
-    public MGRastUI(ISAcreator isacreatorEnvironment) {
-        this.isacreatorEnvironment = isacreatorEnvironment;
-        ResourceInjector.get(""exporters-package.style"").inject(this);
-        projectMetadata = new ExtraMetaDataPane();
-        fileUtils = new FileExporter();
-    }
-
-    public void createGUI() {
-        setBackground(UIHelper.BG_COLOR);
-        setUndecorated(true);
-        setLayout(new BorderLayout());
-        setPreferredSize(new Dimension(650, 560));
-        ((JComponent) getContentPane()).setBorder(new EtchedBorder(UIHelper.GREY_COLOR, UIHelper.GREY_COLOR));
-
-
-        add(createTopPanel(), BorderLayout.NORTH);
-
-        swappableContainer = new JPanel();
-        swappableContainer.setPreferredSize(new Dimension(650, 340));
-        helpPane = new HelpPane();
-        helpPane.createGUI();
-
-        swappableContainer.add(helpPane);
-
-        add(swappableContainer, BorderLayout.CENTER);
-        add(createSouthPanel(), BorderLayout.SOUTH);
-
-        pack();
-    }
-
-    private Container createSouthPanel() {
-        Box southPanel = Box.createHorizontalBox();
-        southPanel.setBackground(UIHelper.BG_COLOR);
-
-        final JLabel closeButton = new JLabel(closeWindowIcon);
-        closeButton.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                closeButton.setIcon(closeWindowIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                closeButton.setIcon(closeWindowIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                confirmChoice = new ConfirmationDialog();
-
-                confirmChoice.addPropertyChangeListener(ConfirmationDialog.NO, new PropertyChangeListener() {
-                    public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                        confirmChoice.hideDialog();
-                        confirmChoice.dispose();
-                    }
-                });
-
-                confirmChoice.addPropertyChangeListener(ConfirmationDialog.YES, new PropertyChangeListener() {
-                    public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                        confirmChoice.hideDialog();
-                        confirmChoice.dispose();
-                        closeWindow();
-                    }
-                });
-
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        confirmChoice.createGUI();
-                        confirmChoice.showDialog(isacreatorEnvironment);
-                    }
-                });
-
-
-            }
-        });
-
-        final JLabel export = new JLabel(exportIcon);
-        export.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                export.setIcon(exportIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                export.setIcon(exportIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                final SelectOutputDirectoryDialog outputDir = new SelectOutputDirectoryDialog(exportHeader);
-
-
-                outputDir.addPropertyChangeListener(SelectOutputDirectoryDialog.CANCEL, new PropertyChangeListener() {
-                    public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                        outputDir.hideDialog();
-                        outputDir.dispose();
-                    }
-                });
-
-                outputDir.addPropertyChangeListener(SelectOutputDirectoryDialog.CONTINUE, new PropertyChangeListener() {
-                    public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                        outputDir.hideDialog();
-                        outputDir.dispose();
-
-                        // precautionary measure in case the user has not selected sample ids tab.
-                        if (externalIds == null) {
-                            constructSampleIds();
-                        }
-
-                        System.out.println(""dir selected = "" + propertyChangeEvent.getNewValue().toString());
-
-                        fileUtils.outputFiles(new File(propertyChangeEvent.getNewValue().toString()),
-                                fieldMappings, externalIds, projectMetadata, mgRastAPIHook);
-
-                        // todo should we store confidence levels as well?
-                        for (String isaField : fieldMappings.keySet()) {
-                            FieldMapping fm = fieldMappings.get(isaField);
-                            if (fm.getConfidenceLevel() != ConfidenceLevel.ZERO_PERCENT) {
-                                mappingHistory.setProperty(isaField, fm.getMgRastTermMappedTo());
-                            }
-                        }
-
-                        fileUtils.saveMappingHistory(mappingHistory);
-
-                        // if successful, close window!
-                        closeWindow();
-                    }
-                });
-
-                if (projectMetadata.areAllFieldsValid()) {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            outputDir.createGUI();
-                            outputDir.showDialog(MGRastUI.this);
-                        }
-                    });
-
-                } else {
-                    final WarningDialog warningDialog = new WarningDialog(noProjectNameWarning);
-
-
-                    warningDialog.addPropertyChangeListener(WarningDialog.OK, new PropertyChangeListener() {
-                        public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                            warningDialog.hideDialog();
-                            warningDialog.dispose();
-                        }
-                    });
-
-
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            warningDialog.createGUI();
-                            warningDialog.showDialog(isacreatorEnvironment);
-                        }
-                    });
-
-                }
-            }
-        });
-
-        southPanel.add(closeButton);
-        southPanel.add(new JLabel(buttonPanelSeparator));
-        southPanel.add(export);
-
-        return southPanel;
-    }
-
-    public void loadAndMapData(String studyId) {
-        mgRastAPIHook = new APIHook(isacreatorEnvironment, studyId);
-        setProjectMetadataFromStudyInformation(isacreatorEnvironment.getDataEntryEnvironment()
-                .getInvestigation().getStudies().get(studyId));
-    }
-
-    private void setProjectMetadataFromStudyInformation(Study study) {
-        projectMetadata.setContacts(study.getContacts());
-
-        String pubmedIds = """";
-        if (study.getPublications().size() > 0) {
-            int count = 0;
-            for (Publication pub : study.getPublications()) {
-                if (pub.getPubmedId() != null) {
-                    if (!pub.getPubmedId().isEmpty()) {
-                        pubmedIds += pub.getPubmedId();
-                        if (count != study.getPublications().size() - 1) {
-                            pubmedIds += "", "";
-                        }
-                    }
-                }
-                count++;
-            }
-        }
-
-        projectMetadata.setPubmedId(pubmedIds);
-        projectMetadata.setProjectName(study.getStudyTitle());
-        projectMetadata.setProjectDescription(study.getStudyDesc());
-        projectMetadata.setInternalProjectId(study.getStudyId());
-    }
-
-    private void closeWindow() {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                isacreatorEnvironment.hideSheet();
-            }
-        });
-    }
-
-    private Container createTopPanel() {
-
-        Box topContainer = Box.createVerticalBox();
-
-        JLabel mgRastExporterHeader = new JLabel(mgRastHeader);
-        mgRastExporterHeader.setHorizontalAlignment(SwingConstants.LEFT);
-
-        topContainer.add(UIHelper.wrapComponentInPanel(mgRastExporterHeader));
-
-
-        topContainer.add(projectMetadata);
-
-        Box topPanel = Box.createHorizontalBox();
-
-        JLabel mgRastLogo = new JLabel(mgRastExportSampleSection);
-        mgRastLogo.setHorizontalAlignment(SwingConstants.LEFT);
-
-        mappingInfoButton = new JLabel(weKnowIcon);
-        mappingInfoButton.setHorizontalAlignment(SwingConstants.LEFT);
-
-        mappingInfoButton.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                mappingInfoButton.setIcon(weKnowIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-
-                mappingInfoButton.setIcon(selectedSection == MAPPING_INFO ? weKnowIconOver : weKnowIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                resetButtons();
-                mappingInfoButton.setIcon(weKnowIconOver);
-                selectedSection = MAPPING_INFO;
-
-
-                if (termMappingPane == null) {
-
-                    Thread performer = new Thread(new Runnable() {
-                        public void run() {
-                            try {
-
-                                Set<String> isatabFields = mgRastAPIHook.getISAtabFields();
-
-                                fieldMappings = new HashMap<String, FieldMapping>();
-
-                                MGRastConceptMapper mapper = new MGRastConceptMapper();
-
-                                // check properties file to see if mapping exists here.
-                                mappingHistory = fileUtils.loadMappingHistory();
-
-                                for (String isaField : isatabFields) {
-                                    FieldMapping fm;
-
-                                    boolean mappingHistoryTermAvailable = mappingHistory.containsKey(isaField);
-
-                                    if (!mappingHistoryTermAvailable) {
-                                        fm = mapper.getMGRastTermFromGSCTerm(isaField, """");
-                                    } else {
-                                        fm = new FieldMapping(isaField, mappingHistory.getProperty(isaField), ConfidenceLevel.ONE_HUNDRED_PERCENT);
-                                    }
-                                    fieldMappings.put(isaField, fm);
-                                }
-
-                                termMappingPane = new TermMappingUI(fieldMappings, mapper.getAllMgRastConcepts());
-                                SwingUtilities.invokeLater(new Runnable() {
-                                    public void run() {
-                                        termMappingPane.createGUI();
-                                        swapContainers(termMappingPane);
-                                    }
-                                });
-                            } catch (Exception e) {
-                                System.err.println(""Problem occured whilst loading samples: "" + e.getMessage());
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-
-
-                    swapContainers(UIHelper.wrapComponentInPanel(new JLabel(mappingConcepts)));
-
-                    performer.start();
-
-
-                } else {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            swapContainers(termMappingPane);
-                        }
-                    });
-                }
-            }
-        });
-
-        sampleInfoButton = new JLabel(weDoNotKnowIcon);
-        sampleInfoButton.setHorizontalAlignment(SwingConstants.LEFT);
-
-        sampleInfoButton.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                sampleInfoButton.setIcon(weDoNotKnowIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-
-                sampleInfoButton.setIcon(selectedSection == SAMPLE_INFO ? weDoNotKnowIconOver : weDoNotKnowIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                resetButtons();
-                sampleInfoButton.setIcon(weDoNotKnowIconOver);
-                selectedSection = SAMPLE_INFO;
-
-                if (sampleInfoPane == null) {
-
-                    Thread performer = new Thread(new Runnable() {
-                        public void run() {
-                            try {
-
-                                constructSampleIds();
-
-                                sampleInfoPane = new SampleInfoPane(externalIds);
-                                SwingUtilities.invokeLater(new Runnable() {
-                                    public void run() {
-                                        sampleInfoPane.createGUI();
-                                        swapContainers(sampleInfoPane);
-                                    }
-                                });
-                            } catch (Exception e) {
-                                System.err.println(""Problem occured whilst loading samples: "" + e.getMessage());
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-
-
-                    swapContainers(UIHelper.wrapComponentInPanel(new JLabel(loadingSamples)));
-
-                    performer.start();
-
-
-                } else {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            swapContainers(sampleInfoPane);
-                        }
-                    });
-                }
-            }
-        });
-
-        helpButton = new JLabel(helpIconOver);
-        helpButton.setHorizontalAlignment(SwingConstants.LEFT);
-
-        helpButton.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                helpButton.setIcon(helpIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                helpButton.setIcon(selectedSection == HELP ? helpIconOver : helpIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                resetButtons();
-                selectedSection = HELP;
-                helpButton.setIcon(helpIconOver);
-
-                if (helpPane == null) {
-                    helpPane = new HelpPane();
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            helpPane.createGUI();
-                        }
-                    });
-                }
-
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        swapContainers(helpPane);
-                    }
-                });
-            }
-        });
-
-        topPanel.add(mgRastLogo);
-        topPanel.add(mappingInfoButton);
-        topPanel.add(sampleInfoButton);
-        topPanel.add(helpButton);
-
-        topContainer.add(topPanel);
-
-        return topContainer;
-    }
-
-    private void constructSampleIds() {
-        Set<String> sampleNames = mgRastAPIHook.getSampleNames();
-
-        externalIds = new ArrayList<SampleExternalIds>();
-
-        for (String sampleName : sampleNames) {
-            externalIds.add(new SampleExternalIds(sampleName));
-        }
-    }
-
-    private void resetButtons() {
-        mappingInfoButton.setIcon(weKnowIcon);
-        sampleInfoButton.setIcon(weDoNotKnowIcon);
-        helpButton.setIcon(helpIcon);
-    }
-
-    private void swapContainers(Container newContainer) {
-        if (newContainer != null) {
-            swappableContainer.removeAll();
-            swappableContainer.add(newContainer);
-            swappableContainer.repaint();
-            swappableContainer.validate();
-        }
-    }
-
-    public static void main(String[] args) {
-        final MGRastUI mgRastUI = new MGRastUI(null);
-        EventQueue.invokeLater(new Runnable() {
-            public void run() {
-                mgRastUI.createGUI();
-            }
-        });
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/MappingConfidenceListCellRenderer.java b/src/main/java/org/isatools/isacreator/mgrast/ui/MappingConfidenceListCellRenderer.java
deleted file mode 100644
index ec8d65e7..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/MappingConfidenceListCellRenderer.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import org.isatools.isacreator.common.UIHelper;
-import org.isatools.isacreator.mgrast.model.ConfidenceLevel;
-import org.isatools.isacreator.mgrast.model.FieldMapping;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-
-/**
- * MappingConfidenceListCellRenderer
- *
- * @author eamonnmaguire
- * @date Sep 28, 2010
- */
-
-
-public class MappingConfidenceListCellRenderer extends JComponent
-        implements ListCellRenderer {
-
-    @InjectedResource
-    private ImageIcon oneHundredPercent, seventyFivePercent,
-            fiftyPercent, twentyFivePercent, zeroPercent;
-
-    private DefaultListCellRenderer listCellRenderer;
-
-    public MappingConfidenceListCellRenderer() {
-        setLayout(new BorderLayout());
-        setBackground(Color.WHITE);
-
-        ResourceInjector.get(""exporters-package.style"").inject(this);
-
-        add(new ConfidenceLevelCellImage(), BorderLayout.WEST);
-
-        listCellRenderer = new DefaultListCellRenderer();
-
-        add(listCellRenderer, BorderLayout.CENTER);
-
-        setBorder(new EmptyBorder(2, 2, 2, 2));
-    }
-
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean cellGotFocus) {
-        listCellRenderer.getListCellRendererComponent(list, value, index,
-                selected, cellGotFocus);
-        listCellRenderer.setBorder(null);
-
-        //image.checkIsIdEntered(selected);
-        Component[] components = getComponents();
-
-        for (Component c : components) {
-            ((JComponent) c).setToolTipText(value.toString());
-            if (c instanceof ConfidenceLevelCellImage) {
-                if (value instanceof FieldMapping) {
-                    ((ConfidenceLevelCellImage) c).setConfidenceLevel((FieldMapping) value);
-                }
-            } else {
-                if (selected) {
-                    c.setForeground(UIHelper.GREY_COLOR);
-                    c.setBackground(UIHelper.BG_COLOR);
-                    c.setFont(UIHelper.VER_11_BOLD);
-
-                } else {
-                    c.setForeground(UIHelper.LIGHT_GREEN_COLOR);
-                    c.setBackground(UIHelper.BG_COLOR);
-                    c.setFont(UIHelper.VER_11_BOLD);
-                }
-            }
-        }
-
-
-        return this;
-    }
-
-    class ConfidenceLevelCellImage extends JPanel {
-        // this will contain the general panel layout for the list item and modifier elements to allow for changing of images
-        // when rendering an item as being selected and so forth.
-        private JLabel itemSelectedIndicator;
-
-        ConfidenceLevelCellImage() {
-            setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-            itemSelectedIndicator = new JLabel(zeroPercent);
-
-            add(itemSelectedIndicator);
-            add(Box.createHorizontalStrut(2));
-        }
-
-        public void setConfidenceLevel(FieldMapping fieldMapping) {
-
-            ConfidenceLevel level = fieldMapping.getConfidenceLevel();
-
-            if (level == ConfidenceLevel.ONE_HUNDRED_PERCENT) {
-                itemSelectedIndicator.setIcon(oneHundredPercent);
-            } else if (level == ConfidenceLevel.SEVENTY_FIVE_PERCENT) {
-                itemSelectedIndicator.setIcon(seventyFivePercent);
-            } else if (level == ConfidenceLevel.FIFTY_PERCENT) {
-                itemSelectedIndicator.setIcon(fiftyPercent);
-            } else if (level == ConfidenceLevel.TWENTY_FIVE_PERCENT) {
-                itemSelectedIndicator.setIcon(twentyFivePercent);
-            } else {
-                itemSelectedIndicator.setIcon(zeroPercent);
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/SampleInfoPane.java b/src/main/java/org/isatools/isacreator/mgrast/ui/SampleInfoPane.java
deleted file mode 100644
index 39ffbcd6..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/SampleInfoPane.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import com.explodingpixels.macwidgets.IAppWidgetFactory;
-import org.isatools.isacreator.autofilteringlist.ExtendedJList;
-import org.isatools.isacreator.common.ClearFieldUtility;
-import org.isatools.isacreator.common.CustomTextField;
-import org.isatools.isacreator.common.UIHelper;
-import org.isatools.isacreator.effects.borders.RoundedBorder;
-import org.isatools.isacreator.mgrast.model.ExternalResources;
-import org.isatools.isacreator.mgrast.model.SampleExternalIds;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-
-/**
- * SampleInfoPane
- *
- * @author eamonnmaguire
- * @date Sep 24, 2010
- */
-
-
-public class SampleInfoPane extends JPanel {
-
-    @InjectedResource
-    private ImageIcon externalReferencesHeader, externalReferenceInfo, key;
-
-    private ExtendedJList sampleList;
-    private List<SampleExternalIds> samples;
-
-    private JLabel sampleReferenceInformation;
-
-    private SampleExternalIds currentSample;
-
-    private CustomTextField goldIdField;
-
-    public SampleInfoPane(List<SampleExternalIds> samples) {
-        this.samples = samples;
-        ResourceInjector.get(""exporters-package.style"").inject(this);
-    }
-
-    public void createGUI() {
-        setLayout(new BorderLayout());
-        setBackground(UIHelper.BG_COLOR);
-        createAndAddSampleList();
-        updateSampleReferenceInfo();
-        createAndAddIDPane();
-        updateIdFields();
-    }
-
-
-    private void createAndAddSampleList() {
-
-        JPanel container = new JPanel(new BorderLayout());
-        container.setPreferredSize(new Dimension(315, 300));
-        container.setBackground(UIHelper.BG_COLOR);
-
-        sampleList = new ExtendedJList(new ExternalIdListCellRenderer(), true);
-
-        updateListContents();
-
-
-        if (sampleList.getItems().size() > 0) {
-            try {
-                sampleList.setSelectedIndex(0);
-                currentSample = samples.get(sampleList.getSelectedIndex());
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        sampleList.addPropertyChangeListener(""itemSelected"", new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                currentSample = (SampleExternalIds) propertyChangeEvent.getNewValue();
-                updateIdFields();
-                goldIdField.getTextField().setEnabled(true);
-            }
-        });
-
-        sampleList.addPropertyChangeListener(""zeroTerms"", new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                currentSample = null;
-                goldIdField.setText(""no sample selected"");
-                goldIdField.getTextField().setEnabled(false);
-            }
-        });
-
-        JScrollPane historyScroll = new JScrollPane(sampleList,
-                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-
-        historyScroll.setBorder(new EmptyBorder(1, 1, 1, 1));
-
-        IAppWidgetFactory.makeIAppScrollPane(historyScroll);
-
-
-        UIHelper.renderComponent(sampleList.getFilterField(), UIHelper.VER_11_BOLD, UIHelper.GREY_COLOR, false);
-
-        Box fieldContainer = Box.createHorizontalBox();
-        fieldContainer.add(sampleList.getFilterField());
-        fieldContainer.add(new ClearFieldUtility(sampleList.getFilterField()));
-
-        container.add(fieldContainer, BorderLayout.NORTH);
-        container.add(historyScroll, BorderLayout.CENTER);
-
-        Box infoPanel = Box.createVerticalBox();
-        infoPanel.setBackground(UIHelper.BG_COLOR);
-
-        JLabel infoKey = new JLabel(key);
-        infoKey.setHorizontalAlignment(SwingConstants.LEFT);
-
-        sampleReferenceInformation = UIHelper.createLabel("""", UIHelper.VER_10_PLAIN, UIHelper.GREY_COLOR, SwingConstants.LEFT);
-
-        infoPanel.add(infoKey);
-        infoPanel.add(Box.createVerticalStrut(5));
-        infoPanel.add(sampleReferenceInformation);
-
-        container.add(infoPanel, BorderLayout.SOUTH);
-        container.setBorder(new TitledBorder(new RoundedBorder(UIHelper.GREY_COLOR, 3), ""Samples"",
-                TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, UIHelper.VER_11_BOLD,
-                UIHelper.GREY_COLOR));
-
-        add(container, BorderLayout.WEST);
-    }
-
-    private void updateIdFields() {
-        if (currentSample != null) {
-            goldIdField.setText(currentSample.getValueByExternalResource(ExternalResources.GOLD));
-        }
-    }
-
-    private void createAndAddIDPane() {
-        JPanel container = new JPanel(new BorderLayout());
-        container.setBackground(UIHelper.BG_COLOR);
-        container.setPreferredSize(new Dimension(325, 300));
-
-        Box idsContainer = Box.createVerticalBox();
-
-        JLabel headerImage = new JLabel(externalReferencesHeader);
-        headerImage.setHorizontalAlignment(SwingConstants.RIGHT);
-
-        idsContainer.add(UIHelper.wrapComponentInPanel(headerImage));
-        idsContainer.add(Box.createVerticalStrut(10));
-
-        JLabel infoImage = new JLabel(externalReferenceInfo);
-        infoImage.setHorizontalAlignment(SwingConstants.LEFT);
-
-        idsContainer.add(UIHelper.wrapComponentInPanel(infoImage));
-        idsContainer.add(Box.createVerticalStrut(5));
-
-        goldIdField = new CustomTextField(ExternalResources.GOLD.getUiId(), false,
-                UIHelper.VER_11_BOLD, UIHelper.GREY_COLOR, new Dimension(150, 20), false);
-
-        goldIdField.getTextField().getDocument().addDocumentListener(new DocumentListener() {
-
-            public void insertUpdate(DocumentEvent event) {
-
-                setValidityIndicator();
-            }
-
-            public void removeUpdate(DocumentEvent event) {
-                setValidityIndicator();
-            }
-
-            public void changedUpdate(DocumentEvent event) {
-                setValidityIndicator();
-            }
-
-            private void setValidityIndicator() {
-                if (currentSample != null) {
-                    currentSample.getExternalIds().put(ExternalResources.GOLD, goldIdField.getText());
-                    updateSampleReferenceInfo();
-                    sampleList.validate();
-                    sampleList.repaint();
-                }
-            }
-        });
-
-        idsContainer.add(goldIdField);
-        container.add(idsContainer, BorderLayout.NORTH);
-        add(container, BorderLayout.EAST);
-    }
-
-    private void updateListContents() {
-        sampleList.getItems().clear();
-        for (SampleExternalIds seId : samples) {
-            sampleList.addItem(seId);
-        }
-    }
-
-    private void updateSampleReferenceInfo() {
-
-        int annotatedCount = 0;
-        for (SampleExternalIds seId : samples) {
-            for (ExternalResources er : seId.getExternalIds().keySet()) {
-                if (!seId.getExternalIds().get(er).trim().equals("""")) {
-                    annotatedCount++;
-                }
-            }
-        }
-
-
-        StringBuffer information = new StringBuffer();
-        information.append(""<html><b>"").append(samples.size())
-                .append(""</b> samples of which <b>"").append(annotatedCount).append(""</b> have ids assigned</html>"");
-
-        sampleReferenceInformation.setText(information.toString());
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/ui/TermMappingUI.java b/src/main/java/org/isatools/isacreator/mgrast/ui/TermMappingUI.java
deleted file mode 100644
index 4d398561..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/ui/TermMappingUI.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.ui;
-
-import com.explodingpixels.macwidgets.IAppWidgetFactory;
-import org.isatools.isacreator.autofilteringlist.ExtendedJList;
-import org.isatools.isacreator.common.ClearFieldUtility;
-import org.isatools.isacreator.common.UIHelper;
-import org.isatools.isacreator.effects.borders.RoundedBorder;
-import org.isatools.isacreator.mgrast.model.ConfidenceLevel;
-import org.isatools.isacreator.mgrast.model.FieldMapping;
-import org.jdesktop.fuse.InjectedResource;
-import org.jdesktop.fuse.ResourceInjector;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * TermMappingUI
- *
- * @author eamonnmaguire
- * @date Sep 24, 2010
- */
-
-
-public class TermMappingUI extends JPanel {
-
-    @InjectedResource
-    private ImageIcon confidenceKey, attentionIcon, confirmIcon, confirmIconOver, rejectIcon, rejectIconOver, mappedToIcon;
-
-    private ExtendedJList isatabFieldsList;
-    private ExtendedJList mgrastFieldsList;
-
-    private FieldMapping currentlySelectedField;
-
-    private JPanel questionPanel;
-
-    private Set<String> mgRastConcepts;
-    private Map<String, FieldMapping> fieldMappings;
-
-
-    public TermMappingUI(Map<String, FieldMapping> fieldMappings, Set<String> mgRastConcepts) {
-        ResourceInjector.get(""exporters-package.style"").inject(this);
-        this.fieldMappings = fieldMappings;
-        this.mgRastConcepts = mgRastConcepts;
-    }
-
-    public void createGUI() {
-        setLayout(new BorderLayout());
-        setBackground(UIHelper.BG_COLOR);
-        createISAtabFieldListPane();
-        createMGRastConceptsListPane();
-
-        updateMGRastListContents();
-        updateISAListContents();
-    }
-
-    private void createISAtabFieldListPane() {
-        isatabFieldsList = new ExtendedJList(new MappingConfidenceListCellRenderer(), true);
-
-        // todo add property change listener to detect itemselected and zeroItem events.
-        isatabFieldsList.addPropertyChangeListener(""itemSelected"", new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                currentlySelectedField = (FieldMapping) propertyChangeEvent.getNewValue();
-                if (mgrastFieldsList != null) {
-
-                    if (currentlySelectedField.getMgRastTermMappedTo() == null) {
-                        currentlySelectedField.setMgRastTermMappedTo("""");
-                    }
-
-                    if (currentlySelectedField.getMgRastTermMappedTo().equals("""")) {
-                        mgrastFieldsList.clearSelection();
-                        checkAndDisplayAppropriateQuestion(currentlySelectedField.getMgRastTermMappedTo());
-                    } else {
-                        mgrastFieldsList.setSelectedValue(currentlySelectedField.getMgRastTermMappedTo(), true);
-                    }
-                }
-            }
-        });
-
-        JPanel container = createListPanel(isatabFieldsList);
-        container.setBorder(new TitledBorder(new RoundedBorder(UIHelper.GREY_COLOR, 3), ""ISAtab fields"",
-                TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, UIHelper.VER_11_BOLD,
-                UIHelper.GREY_COLOR));
-
-        JLabel infoKey = new JLabel(confidenceKey);
-        infoKey.setHorizontalAlignment(SwingConstants.LEFT);
-
-        container.add(UIHelper.wrapComponentInPanel(infoKey), BorderLayout.SOUTH);
-        add(container, BorderLayout.WEST);
-    }
-
-    private void createMGRastConceptsListPane() {
-        mgrastFieldsList = new ExtendedJList(new MGRastConceptListCellRenderer(), false);
-
-        questionPanel = new JPanel();
-        questionPanel.setPreferredSize(new Dimension(315, 60));
-        questionPanel.setLayout(new BoxLayout(questionPanel, BoxLayout.LINE_AXIS));
-
-        mgrastFieldsList.addPropertyChangeListener(""itemSelected"", new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
-                checkAndDisplayAppropriateQuestion(propertyChangeEvent.getNewValue().toString());
-            }
-        });
-
-        mgrastFieldsList.setAutoscrolls(true);
-
-        JPanel container = new JPanel(new BorderLayout());
-        container.setBackground(UIHelper.BG_COLOR);
-
-        JPanel listContainer = createListPanel(mgrastFieldsList);
-        listContainer.setBorder(new TitledBorder(new RoundedBorder(UIHelper.GREY_COLOR, 3), ""MG-Rast concepts"",
-                TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, UIHelper.VER_11_BOLD,
-                UIHelper.GREY_COLOR));
-        updateMGRastListContents();
-
-        container.add(listContainer);
-
-        container.add(questionPanel, BorderLayout.SOUTH);
-
-        add(container, BorderLayout.EAST);
-    }
-
-    private JPanel createListPanel(ExtendedJList list) {
-
-
-        JPanel listContainer = new JPanel(new BorderLayout());
-        listContainer.setPreferredSize(new Dimension(315, 270));
-        listContainer.setBackground(UIHelper.BG_COLOR);
-
-        JScrollPane mgRastConceptScroller = new JScrollPane(list,
-                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        mgRastConceptScroller.setBorder(new EmptyBorder(1, 1, 1, 1));
-
-        IAppWidgetFactory.makeIAppScrollPane(mgRastConceptScroller);
-
-        UIHelper.renderComponent(list.getFilterField(), UIHelper.VER_11_BOLD, UIHelper.GREY_COLOR, false);
-
-        Box fieldContainer = Box.createHorizontalBox();
-        fieldContainer.add(list.getFilterField());
-        fieldContainer.add(new ClearFieldUtility(list.getFilterField()));
-
-        listContainer.add(fieldContainer, BorderLayout.NORTH);
-        listContainer.add(mgRastConceptScroller, BorderLayout.CENTER);
-
-        return listContainer;
-    }
-
-    private void updateISAListContents() {
-        isatabFieldsList.getItems().clear();
-
-        for (String isaField : fieldMappings.keySet()) {
-            isatabFieldsList.addItem(fieldMappings.get(isaField));
-        }
-
-        if (isatabFieldsList.getItems().size() > 0) {
-            isatabFieldsList.setSelectedIndex(0);
-            if (mgrastFieldsList != null) {
-                mgrastFieldsList.setSelectedValue(currentlySelectedField.getMgRastTermMappedTo(), true);
-                checkAndDisplayAppropriateQuestion(currentlySelectedField.getMgRastTermMappedTo());
-            }
-        }
-    }
-
-    /**
-     * show confirm box if confidence level is below 100% or change info if the item selected is different
-     * to that already stored.
-     *
-     * @param newValue - mgRast value entered.
-     */
-    private void checkAndDisplayAppropriateQuestion(String newValue) {
-
-        if (newValue.equals(currentlySelectedField.getMgRastTermMappedTo()) && !newValue.equals("""")) {
-            if (currentlySelectedField.getConfidenceLevel() != ConfidenceLevel.ONE_HUNDRED_PERCENT) {
-                changeQuestionPanelContents(createConfirmMappingPanel());
-            } else {
-                changeQuestionPanelContents(createMappedToInfo());
-            }
-        } else if (newValue == null || newValue.equals("""")) {
-            changeQuestionPanelContents(createMappedToInfo());
-        } else {
-            changeQuestionPanelContents(createChangeMappingPanel());
-        }
-    }
-
-    private Container createConfirmMappingPanel() {
-        Box confirmMappingPane = Box.createVerticalBox();
-        confirmMappingPane.setBackground(UIHelper.BG_COLOR);
-
-        JLabel question = UIHelper.createLabel(""confirm this mapping?"", UIHelper.VER_10_BOLD, UIHelper.GREY_COLOR);
-        question.setIcon(attentionIcon);
-
-        confirmMappingPane.add(UIHelper.wrapComponentInPanel(question));
-
-        confirmMappingPane.add(createMappedToInfo());
-
-        Box mappingInfo = Box.createHorizontalBox();
-
-        final JLabel confirmMapping = new JLabel(confirmIcon);
-        confirmMapping.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                confirmMapping.setIcon(confirmIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                confirmMapping.setIcon(confirmIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                confirmMapping.setIcon(confirmIcon);
-                currentlySelectedField.setMgRastTermMappedTo(mgrastFieldsList.getSelectedTerm());
-                currentlySelectedField.setConfidenceLevel(ConfidenceLevel.ONE_HUNDRED_PERCENT);
-
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        changeQuestionPanelContents(createMappedToInfo());
-                        isatabFieldsList.validate();
-                        isatabFieldsList.repaint();
-                    }
-                });
-            }
-        });
-
-        final JLabel rejectMapping = new JLabel(rejectIcon);
-        rejectMapping.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                rejectMapping.setIcon(rejectIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                rejectMapping.setIcon(rejectIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                rejectMapping.setIcon(rejectIcon);
-                currentlySelectedField.setMgRastTermMappedTo("""");
-                currentlySelectedField.setConfidenceLevel(ConfidenceLevel.ZERO_PERCENT);
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        changeQuestionPanelContents(createMappedToInfo());
-                        isatabFieldsList.validate();
-                        isatabFieldsList.repaint();
-                    }
-                });
-
-
-            }
-        });
-
-        mappingInfo.add(Box.createHorizontalStrut(5));
-        mappingInfo.add(confirmMapping);
-        mappingInfo.add(rejectMapping);
-
-        confirmMappingPane.add(mappingInfo);
-
-        return confirmMappingPane;
-    }
-
-    private Container createMappedToInfo() {
-        Box mappingInfo = Box.createHorizontalBox();
-        mappingInfo.setBackground(UIHelper.BG_COLOR);
-
-        JLabel isaField = UIHelper.createLabel(currentlySelectedField.getIsatabFieldName(), UIHelper.VER_9_BOLD, UIHelper.LIGHT_GREEN_COLOR);
-        isaField.setPreferredSize(new Dimension(120, 20));
-
-        mappingInfo.add(isaField);
-        mappingInfo.add(new JLabel(mappedToIcon));
-
-        JLabel mgRastTerm = UIHelper.createLabel(mgrastFieldsList.getSelectedTerm(), UIHelper.VER_9_BOLD, UIHelper.GREY_COLOR);
-        mgRastTerm.setPreferredSize(new Dimension(120, 20));
-        mappingInfo.add(mgRastTerm);
-
-        return mappingInfo;
-    }
-
-    private Container createChangeMappingPanel() {
-        Box confirmMappingPane = Box.createVerticalBox();
-        confirmMappingPane.setBackground(UIHelper.BG_COLOR);
-
-        JLabel question = UIHelper.createLabel(""change to this mapping?"", UIHelper.VER_10_BOLD, UIHelper.GREY_COLOR);
-        question.setIcon(attentionIcon);
-
-        confirmMappingPane.add(UIHelper.wrapComponentInPanel(question));
-
-        confirmMappingPane.add(createMappedToInfo());
-
-        Box mappingInfo = Box.createHorizontalBox();
-
-        final JLabel confirmMapping = new JLabel(confirmIcon);
-        confirmMapping.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                confirmMapping.setIcon(confirmIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                confirmMapping.setIcon(confirmIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                confirmMapping.setIcon(confirmIcon);
-                currentlySelectedField.setMgRastTermMappedTo(mgrastFieldsList.getSelectedTerm());
-                currentlySelectedField.setConfidenceLevel(ConfidenceLevel.ONE_HUNDRED_PERCENT);
-
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        changeQuestionPanelContents(createMappedToInfo());
-                        isatabFieldsList.validate();
-                        isatabFieldsList.repaint();
-                    }
-                });
-            }
-        });
-
-        final JLabel rejectMapping = new JLabel(rejectIcon);
-        rejectMapping.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseEntered(MouseEvent mouseEvent) {
-                rejectMapping.setIcon(rejectIconOver);
-            }
-
-            @Override
-            public void mouseExited(MouseEvent mouseEvent) {
-                rejectMapping.setIcon(rejectIcon);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                rejectMapping.setIcon(rejectIcon);
-                mgrastFieldsList.setSelectedValue(currentlySelectedField.getMgRastTermMappedTo(), true);
-
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        checkAndDisplayAppropriateQuestion(currentlySelectedField.getMgRastTermMappedTo());
-                        isatabFieldsList.validate();
-                        isatabFieldsList.repaint();
-                    }
-                });
-            }
-        });
-
-        mappingInfo.add(Box.createHorizontalStrut(5));
-        mappingInfo.add(confirmMapping);
-        mappingInfo.add(rejectMapping);
-
-        confirmMappingPane.add(mappingInfo);
-
-        return confirmMappingPane;
-    }
-
-    private void updateMGRastListContents() {
-        mgrastFieldsList.getItems().clear();
-
-        for (String mgRastConcept : mgRastConcepts) {
-            mgrastFieldsList.addItem(mgRastConcept);
-        }
-    }
-
-    private void changeQuestionPanelContents(final Container newContainer) {
-        if (newContainer != null) {
-            questionPanel.removeAll();
-            questionPanel.add(newContainer);
-            questionPanel.repaint();
-            questionPanel.validate();
-        }
-    }
-
-
-    // two extended JLists - one containing the headers from ISAcreator - the merging of the study sample table and the
-    // assay table of interest. the other containing the mgrast terms.
-}
diff --git a/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java b/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java
deleted file mode 100644
index 1c105743..00000000
--- a/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/**
- ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
-
- License:
- ISAcreator is licensed under the Common Public Attribution License version 1.0 (CPAL)
-
- EXHIBIT A. CPAL version 1.0
- ÒThe contents of this file are subject to the CPAL version 1.0 (the ÒLicenseÓ);
- you may not use this file except in compliance with the License. You may obtain a
- copy of the License at http://isa-tools.org/licenses/ISAcreator-license.html.
- The License is based on the Mozilla Public License version 1.1 but Sections
- 14 and 15 have been added to cover use of software over a computer network and
- provide for limited attribution for the Original Developer. In addition, Exhibit
- A has been modified to be consistent with Exhibit B.
-
- Software distributed under the License is distributed on an ÒAS ISÓ basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- the specific language governing rights and limitations under the License.
-
- The Original Code is ISAcreator.
- The Original Developer is the Initial Developer. The Initial Developer of the
- Original Code is the ISA Team (Eamonn Maguire, eamonnmag@gmail.com;
- Philippe Rocca-Serra, proccaserra@gmail.com; Susanna-Assunta Sansone, sa.sanson@gmail.com;
- http://www.isa-tools.org). All portions of the code written by the ISA Team are
- Copyright (c) 2007-2011 ISA Team. All Rights Reserved.
-
- EXHIBIT B. Attribution Information
- Attribution Copyright Notice: Copyright (c) 2008-2011 ISA Team
- Attribution Phrase: Developed by the ISA Team
- Attribution URL: http://www.isa-tools.org
- Graphic Image provided in the Covered Code as file: http://isa-tools.org/licenses/icons/poweredByISAtools.png
- Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
-
- Sponsors:
- The ISA Team and the ISA software suite have been funded by the EU Carcinogenomics project (http://www.carcinogenomics.eu), the UK BBSRC (http://www.bbsrc.ac.uk), the UK NERC-NEBC (http://nebc.nerc.ac.uk) and in part by the EU NuGO consortium (http://www.nugo.org/everyone).
- */
-
-package org.isatools.isacreator.mgrast.utils;
-
-import org.apache.commons.collections15.set.ListOrderedSet;
-import org.isatools.isacreator.apiutils.SpreadsheetUtils;
-import org.isatools.isacreator.gui.ISAcreator;
-import org.isatools.isacreator.model.Assay;
-import org.isatools.isacreator.model.Investigation;
-import org.isatools.isacreator.model.Study;
-import org.isatools.isacreator.spreadsheet.Spreadsheet;
-
-import java.util.*;
-
-/**
- * APIHook
- *
- * @author eamonnmaguire
- * @date Sep 30, 2010
- */
-
-
-public class APIHook {
-    private ISAcreator isacreatorEnvironment;
-    private String studyId;
-
-    // Map contains mapping from either
-    private Map<Object, Map<String, Integer>> isatabFields;
-    private Map<Object, Integer> studyOrAssayToSampleNameColumn;
-    private Set<String> sampleNames;
-
-    public APIHook(ISAcreator isacreatorEnvironment, String studyId) {
-
-        this.isacreatorEnvironment = isacreatorEnvironment;
-        this.studyId = studyId;
-    }
-
-    /**
-     * Method goes through the ISAtab model and pulls out the fields describing the sample (from study sample files) and
-     * and fields describing
-     */
-    private Map<Object, Map<String, Integer>> loadFields() {
-        isatabFields = new HashMap<Object, Map<String, Integer>>();
-
-        Set<String> unwantedColumns = generateUnwantedColumnsSet(""Unit"", ""Protocol REF"", ""File"");
-
-        Study study = getInvestigation().getStudies().get(studyId);
-
-        if (study != null) {
-            isatabFields.put(study,
-                    SpreadsheetUtils.getColumnNames(study.getStudySample().getSpreadsheetUI().getTable(), unwantedColumns));
-
-            for (Assay a : study.getAssays().values()) {
-                if (a.getTechnologyType().contains(""sequencing"")) {
-                    isatabFields.put(a,
-                            SpreadsheetUtils.getColumnNames(a.getSpreadsheetUI().getTable(), unwantedColumns));
-                }
-            }
-        }
-        return isatabFields;
-    }
-
-    /**
-     * Method pulls out all the information of interest for output. It returns each sample along with the data corresponding to
-     * that sample.
-     *
-     * @param sampleNames - Sample names we are looking for.
-     * @return Map<String, Map<String,String>> - SampleName ->Columns|Values
-     */
-    public Map<String, Map<String, List<String>>> getDataForSamples(Set<String> sampleNames) {
-        // map of column name to value
-        Map<String, Map<String, List<String>>> sampleData = new HashMap<String, Map<String, List<String>>>();
-
-        // precautionary measure in case the user hasn't looked at the sample id assignments!
-        if (studyOrAssayToSampleNameColumn == null) {
-            getSampleNames();
-        }
-
-        for (Object assayOrStudy : isatabFields.keySet()) {
-            // check for rows of interest.
-
-            // get table
-            Spreadsheet spreadsheet;
-
-            if (assayOrStudy instanceof Study) {
-                spreadsheet = ((Study) assayOrStudy).getStudySample().getSpreadsheetUI().getTable();
-            } else {
-                spreadsheet = ((Assay) assayOrStudy).getSpreadsheetUI().getTable();
-            }
-
-            for (int rowNo = 0; rowNo < spreadsheet.getTable().getRowCount(); rowNo++) {
-                // test to ensure that the row contains the sample we want
-                String candidateSample = spreadsheet.getTable().getValueAt(rowNo, studyOrAssayToSampleNameColumn.get(assayOrStudy)).toString();
-
-                if (sampleNames.contains(candidateSample)) {
-                    // then proceed with adding details to the record
-                    if (!sampleData.containsKey(candidateSample)) {
-                        sampleData.put(candidateSample, new HashMap<String, List<String>>());
-                    }
-
-                    for (String field : isatabFields.get(assayOrStudy).keySet()) {
-
-                        int column = isatabFields.get(assayOrStudy)
-                                .get(field);
-
-                        String value = spreadsheet.getTable().getValueAt(rowNo, column).toString();
-
-                        // check if the field has a unit, if there is a unit, it will be added to the
-                        String unit = spreadsheet.getAssignedUnitForColumn(column, rowNo);
-
-                        // try and pick out a unit from the header value
-
-                        if (unit.equals("""")) {
-                            unit = extractUnitFromFieldName(field);
-                            if (!unit.equals("""")) {
-                                value += "" "" + unit;
-                            }
-                        } else {
-                            value += "" "" + unit;
-                        }
-
-                        if (!sampleData.get(candidateSample).containsKey(field)) {
-                            sampleData.get(candidateSample).put(field, new ArrayList<String>());
-                        }
-                        // todo investigate why this is not adding multiple values for one sample (replicates)!
-                        sampleData.get(candidateSample).get(field).add(value);
-                    }
-                }
-            }
-        }
-
-        return sampleData;
-    }
-
-    /**
-     * If, for example we have mg/L as a string in the Characteristics[Chla mg/L] field,
-     * we want to extract this as the unit automatically
-     *
-     * @param fieldName - field to check
-     * @return Unit if one is available
-     */
-    private String extractUnitFromFieldName(String fieldName) {
-        String unit = """";
-        System.out.println(""attempting to extract unit from "" + fieldName);
-        if (fieldName.contains(""Characteristic"") || fieldName.contains(""Factor"") || fieldName.contains(""Parameter"")
-                || fieldName.contains(""Comment"")) {
-            String tmpField = cleanupString(fieldName);
-            String[] fragments = tmpField.split("" "");
-            if (fragments.length > 1) {
-                String lastFragment = fragments[fragments.length - 1].trim();
-                if (lastFragment.length() <= 4 || lastFragment.contains(""\\"") || lastFragment.contains(""/"")) {
-                    return lastFragment;
-                }
-            }
-        }
-
-        return unit;
-    }
-
-    private String cleanupString(String toClean) {
-        return toClean.replaceAll(""(Characteristics\\[)|(Factor Value\\[)|(Parameter Value\\[)|(Comment\\[)|\\]"", """");
-    }
-
-
-    public Set<String> getISAtabFields() {
-        if (isatabFields == null) {
-            loadFields();
-        }
-
-        Set<String> fields = new ListOrderedSet<String>();
-
-        for (Object studyOrAssay : isatabFields.keySet()) {
-            Map<String, Integer> columns = isatabFields.get(studyOrAssay);
-            fields.addAll(columns.keySet());
-        }
-
-        return fields;
-    }
-
-    public Set<String> getSampleNames() {
-        // if the set has already been created, the just use this :)
-
-        if (sampleNames != null) {
-            return sampleNames;
-        }
-
-        // else retrieve the sample names since it's being performed for the first time.
-        if (isatabFields == null) {
-            loadFields();
-        }
-
-        studyOrAssayToSampleNameColumn = new HashMap<Object, Integer>();
-
-        for (Object studyOrAssay : isatabFields.keySet()) {
-
-            Map<String, Integer> columns = isatabFields.get(studyOrAssay);
-
-            for (String column : columns.keySet()) {
-                if (column.equalsIgnoreCase(""sample name"")) {
-                    studyOrAssayToSampleNameColumn.put(studyOrAssay, columns.get(column));
-                    break;
-                }
-            }
-
-        }
-
-        return extractSampleIds(studyOrAssayToSampleNameColumn);
-    }
-
-    private Set<String> extractSampleIds(Map<Object, Integer> studyOrAssayToSampleNameColumn) {
-        sampleNames = new ListOrderedSet<String>();
-
-        // add all sample names from all assays of interest (i.e. those employing sequencing)...
-        for (Object assay : studyOrAssayToSampleNameColumn.keySet()) {
-
-            if (assay instanceof Assay) {
-//
-//				JTable dataSource = ((Assay) assay).getSpreadsheetUI().getTable().getTable();
-//
-//				for (int rowNo = 0; rowNo < dataSource.getRowCount(); rowNo++) {
-//					String value = dataSource.getValueAt(rowNo, studyOrAssayToSampleNameColumn.get(assay)).toString();
-//					if (value != null && !value.trim().equals("""")) {
-//						sampleNames.add(value);
-//					}
-//				}
-
-                sampleNames.addAll(SpreadsheetUtils.getDataInColumn(((Assay) assay).getSpreadsheetUI().getTable(),
-                        studyOrAssayToSampleNameColumn.get(assay)));
-            }
-        }
-
-        return sampleNames;
-    }
-
-    private Set<String> generateUnwantedColumnsSet(String... unwantedColumns) {
-        Set<String> result = new HashSet<String>();
-
-        result.addAll(Arrays.asList(unwantedColumns));
-
-        return result;
-    }
-
-    private Investigation getInvestigation() {
-        return isacreatorEnvironment.getDataEntryEnvironment().getInvestigation();
-    }
-}
diff --git a/src/main/java/org/isatools/isacreator/qrcode/ui/QRCodeGeneratorUI.java b/src/main/java/org/isatools/isacreator/qrcode/ui/QRCodeGeneratorUI.java
index c5dead7a..74cf22d6 100644
--- a/src/main/java/org/isatools/isacreator/qrcode/ui/QRCodeGeneratorUI.java
+++ b/src/main/java/org/isatools/isacreator/qrcode/ui/QRCodeGeneratorUI.java
@@ -79,8 +79,6 @@ public class QRCodeGeneratorUI extends JDialog {
                 QRCodeGeneratorUI.class.getResource(""/dependency-injections/formatmappingutility-package.properties""));
         ResourceInjector.get(""common-package.style"").load(
                 QRCodeViewerPane.class.getResource(""/dependency-injections/common-package.properties""));
-        ResourceInjector.get(""exporters-package.style"").load(
-                QRCodeViewerPane.class.getResource(""/dependency-injections/exporters-package.properties""));
 
     }
 
diff --git a/src/main/resources/dependency-injections/exporters-package.properties b/src/main/resources/dependency-injections/exporters-package.properties
deleted file mode 100644
index 16369fc9..00000000
--- a/src/main/resources/dependency-injections/exporters-package.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-MGRastUI.mgRastHeader=/images/exporters/mgrastexport/mgrast_export_header.png
-MGRastUI.mgRastExportSampleSection=/images/exporters/mgrastexport/mgrast_1.png
-MGRastUI.weKnowIcon=/images/exporters/mgrastexport/weknow.png
-MGRastUI.weKnowIconOver=/images/exporters/mgrastexport/weknow_over.png
-MGRastUI.weDoNotKnowIcon=/images/exporters/mgrastexport/dontknow.png
-MGRastUI.weDoNotKnowIconOver=/images/exporters/mgrastexport/dontknow_over.png
-MGRastUI.helpIcon=/images/exporters/mgrastexport/help.png
-MGRastUI.helpIconOver=/images/exporters/mgrastexport/help_over.png
-MGRastUI.closeWindowIcon=/images/exporters/mgrastexport/close_window.png
-MGRastUI.closeWindowIconOver=/images/exporters/mgrastexport/close_window_over.png
-MGRastUI.exportIcon=/images/exporters/mgrastexport/export.png
-MGRastUI.exportIconOver=/images/exporters/mgrastexport/export_over.png
-MGRastUI.buttonPanelSeparator=/images/exporters/mgrastexport/bottom_panel_sep.png
-MGRastUI.loadingSamples=/images/exporters/mgrastexport/loading_samples.png
-MGRastUI.mappingConcepts=/images/exporters/mgrastexport/mapping_concepts.png
-MGRastUI.noProjectNameWarning=/images/exporters/mgrastexport/warning/no_pid-name_warning.png
-MGRastUI.exportHeader=/images/exporters/mgrastexport/export/chooseOutputDirectory.png
-
-HelpPane.helpImage=/images/exporters/mgrastexport/help_image.png
-
-SampleInfoPane.externalReferencesHeader=/images/exporters/mgrastexport/external_references_image.png
-SampleInfoPane.externalReferenceInfo=/images/exporters/mgrastexport/id_info.png
-SampleInfoPane.key=/images/exporters/mgrastexport/key.png
-
-ExternalIdListCellRenderer.idEntered=/images/exporters/mgrastexport/id_entered.png
-ExternalIdListCellRenderer.noIdEntered=/images/exporters/mgrastexport/no_id_entered.png
-
-MGRastConceptListCellRenderer.mappedTo=/images/exporters/mgrastexport/mapped_to.png
-MGRastConceptListCellRenderer.notMappedTo=/images/exporters/mgrastexport/not_mapped_to.png
-
-MappingConfidenceListCellRenderer.oneHundredPercent=/images/exporters/mgrastexport/confidence_levels/100percent.png
-MappingConfidenceListCellRenderer.seventyFivePercent=/images/exporters/mgrastexport/confidence_levels/75percent.png
-MappingConfidenceListCellRenderer.fiftyPercent=/images/exporters/mgrastexport/confidence_levels/50percent.png
-MappingConfidenceListCellRenderer.twentyFivePercent=/images/exporters/mgrastexport/confidence_levels/25percent.png
-MappingConfidenceListCellRenderer.zeroPercent=/images/exporters/mgrastexport/confidence_levels/no_mapping.png
-
-TermMappingUI.confidenceKey=/images/exporters/mgrastexport/confidence_levels.png
-TermMappingUI.attentionIcon=/images/exporters/mgrastexport/attention.png
-TermMappingUI.confirmIcon=/images/exporters/mgrastexport/confirm_change.png
-TermMappingUI.confirmIconOver=/images/exporters/mgrastexport/confirm_change_over.png
-TermMappingUI.rejectIcon=/images/exporters/mgrastexport/reject_change.png
-TermMappingUI.rejectIconOver=/images/exporters/mgrastexport/reject_change_over.png
-TermMappingUI.mappedToIcon=/images/exporters/mgrastexport/is_mapped_to.png
-
-
diff --git a/src/main/resources/dependency-injections/gui-package.properties b/src/main/resources/dependency-injections/gui-package.properties
index 17ccc936..2af1e7b1 100644
--- a/src/main/resources/dependency-injections/gui-package.properties
+++ b/src/main/resources/dependency-injections/gui-package.properties
@@ -12,6 +12,8 @@ ISAcreator.logoutIcon=/images/gui/logout_menuitem.png
 ISAcreator.menuIcon=/images/gui/menu.png
 ISAcreator.exitIcon=/images/gui/exit.png
 ISAcreator.exportArchiveIcon=/images/gui/exportArchive_Menu.png
+ISAcreator.convertIcon=/images/gui/menu_icon_convert.png
+ISAcreator.validateIcon=/images/gui/menu_icon_validate.png
 # Study menu items
 ISAcreator.addStudyIcon=/images/gui/overtree-menu/add_study.png
 ISAcreator.removeStudyIcon=/images/gui/overtree-menu/remove_study.png
@@ -24,7 +26,6 @@ ISAcreator.helpIcon=/images/gui/help.png
 ISAcreator.supportIcon=/images/gui/support.png
 ISAcreator.feedbackIcon=/images/gui/feedback.png
 # plugin menu items
-ISAcreator.mgRastIcon=/images/gui/mgrast_export.png
 ISAcreator.qrCodeIcon=/images/gui/qr_code_generator.png
 
 # Other App images
diff --git a/src/main/resources/dependency-injections/validator-package.properties b/src/main/resources/dependency-injections/validator-package.properties
index 5629570b..672b082d 100644
--- a/src/main/resources/dependency-injections/validator-package.properties
+++ b/src/main/resources/dependency-injections/validator-package.properties
@@ -1,3 +1,13 @@
 ValidateUI.validateIcon=/images/validator/validator-logo.png
 ValidateUI.validateIconInactive=/images/validator/validator-logo-inactive.png
 ValidateUI.validationSuccess=/images/validator/validation_successful.png
+
+ValidateUI.convertIcon=/images/validator/convert-logo.png
+ValidateUI.convertIconInactive=/images/validator/convert-logo-inactive.png
+ValidateUI.conversionSuccess=/images/validator/conversion-success.png
+
+ConvertUI.startConversion=/images/validator/start-conversion.png
+ConvertUI.startConversionOver=/images/validator/start-conversion_over.png
+
+ConversionTargetInformationPanel.selected=/images/validator/selected.png
+ConversionTargetInformationPanel.unselected=/images/validator/unselected.png
diff --git a/src/main/resources/images/exporters/mgrastexport/attention.png b/src/main/resources/images/exporters/mgrastexport/attention.png
deleted file mode 100644
index 3db37d97..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/attention.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/bottom_panel_sep.png b/src/main/resources/images/exporters/mgrastexport/bottom_panel_sep.png
deleted file mode 100644
index 713e9b7f..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/bottom_panel_sep.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/close_window.png b/src/main/resources/images/exporters/mgrastexport/close_window.png
deleted file mode 100644
index 556e937c..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/close_window.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/close_window_over.png b/src/main/resources/images/exporters/mgrastexport/close_window_over.png
deleted file mode 100644
index f8292875..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/close_window_over.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confidence_levels.png b/src/main/resources/images/exporters/mgrastexport/confidence_levels.png
deleted file mode 100644
index b0c2001f..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confidence_levels.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confidence_levels/100percent.png b/src/main/resources/images/exporters/mgrastexport/confidence_levels/100percent.png
deleted file mode 100644
index 8878455e..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confidence_levels/100percent.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confidence_levels/25percent.png b/src/main/resources/images/exporters/mgrastexport/confidence_levels/25percent.png
deleted file mode 100644
index a2e31c76..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confidence_levels/25percent.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confidence_levels/50percent.png b/src/main/resources/images/exporters/mgrastexport/confidence_levels/50percent.png
deleted file mode 100644
index 93d91953..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confidence_levels/50percent.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confidence_levels/75percent.png b/src/main/resources/images/exporters/mgrastexport/confidence_levels/75percent.png
deleted file mode 100644
index 6be8180f..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confidence_levels/75percent.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confidence_levels/no_mapping.png b/src/main/resources/images/exporters/mgrastexport/confidence_levels/no_mapping.png
deleted file mode 100644
index c6c5a413..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confidence_levels/no_mapping.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confirm_change.png b/src/main/resources/images/exporters/mgrastexport/confirm_change.png
deleted file mode 100644
index 2ea62261..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confirm_change.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/confirm_change_over.png b/src/main/resources/images/exporters/mgrastexport/confirm_change_over.png
deleted file mode 100644
index ac1ef241..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/confirm_change_over.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/dontknow.png b/src/main/resources/images/exporters/mgrastexport/dontknow.png
deleted file mode 100644
index 52ed3c91..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/dontknow.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/dontknow_over.png b/src/main/resources/images/exporters/mgrastexport/dontknow_over.png
deleted file mode 100644
index e27e0ae6..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/dontknow_over.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/export.png b/src/main/resources/images/exporters/mgrastexport/export.png
deleted file mode 100644
index 705c19d4..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/export.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/export/chooseOutputDirectory.png b/src/main/resources/images/exporters/mgrastexport/export/chooseOutputDirectory.png
deleted file mode 100644
index e78704af..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/export/chooseOutputDirectory.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/export_over.png b/src/main/resources/images/exporters/mgrastexport/export_over.png
deleted file mode 100644
index a24c2e11..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/export_over.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/external_references_image.png b/src/main/resources/images/exporters/mgrastexport/external_references_image.png
deleted file mode 100644
index 9afc3f25..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/external_references_image.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/help.png b/src/main/resources/images/exporters/mgrastexport/help.png
deleted file mode 100644
index f6e696c6..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/help.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/help_image.png b/src/main/resources/images/exporters/mgrastexport/help_image.png
deleted file mode 100644
index 4fa76fa8..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/help_image.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/help_over.png b/src/main/resources/images/exporters/mgrastexport/help_over.png
deleted file mode 100644
index 5281e332..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/help_over.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/id_entered.png b/src/main/resources/images/exporters/mgrastexport/id_entered.png
deleted file mode 100644
index 7b872711..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/id_entered.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/id_info.png b/src/main/resources/images/exporters/mgrastexport/id_info.png
deleted file mode 100644
index c76684d6..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/id_info.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/is_mapped_to.png b/src/main/resources/images/exporters/mgrastexport/is_mapped_to.png
deleted file mode 100644
index 00d85826..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/is_mapped_to.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/key.png b/src/main/resources/images/exporters/mgrastexport/key.png
deleted file mode 100644
index e8030a72..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/key.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/loading_samples.png b/src/main/resources/images/exporters/mgrastexport/loading_samples.png
deleted file mode 100644
index 1e01497c..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/loading_samples.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/mapped_to.png b/src/main/resources/images/exporters/mgrastexport/mapped_to.png
deleted file mode 100644
index 0980b36b..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/mapped_to.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/mapping_concepts.png b/src/main/resources/images/exporters/mgrastexport/mapping_concepts.png
deleted file mode 100644
index ef1438be..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/mapping_concepts.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/mgrast_1.png b/src/main/resources/images/exporters/mgrastexport/mgrast_1.png
deleted file mode 100644
index b34742dd..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/mgrast_1.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/mgrast_export_header.png b/src/main/resources/images/exporters/mgrastexport/mgrast_export_header.png
deleted file mode 100644
index f3988f9c..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/mgrast_export_header.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/no_id_entered.png b/src/main/resources/images/exporters/mgrastexport/no_id_entered.png
deleted file mode 100644
index 8ef35b7f..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/no_id_entered.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/not_mapped_to.png b/src/main/resources/images/exporters/mgrastexport/not_mapped_to.png
deleted file mode 100644
index 66b6ce0e..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/not_mapped_to.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/reject_change.png b/src/main/resources/images/exporters/mgrastexport/reject_change.png
deleted file mode 100644
index 8575a3dd..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/reject_change.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/reject_change_over.png b/src/main/resources/images/exporters/mgrastexport/reject_change_over.png
deleted file mode 100644
index 35c9275b..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/reject_change_over.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/warning/no_pid-name_warning.png b/src/main/resources/images/exporters/mgrastexport/warning/no_pid-name_warning.png
deleted file mode 100644
index 9f8f791f..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/warning/no_pid-name_warning.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/weknow.png b/src/main/resources/images/exporters/mgrastexport/weknow.png
deleted file mode 100644
index 6f5b268c..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/weknow.png and /dev/null differ
diff --git a/src/main/resources/images/exporters/mgrastexport/weknow_over.png b/src/main/resources/images/exporters/mgrastexport/weknow_over.png
deleted file mode 100644
index 37886839..00000000
Binary files a/src/main/resources/images/exporters/mgrastexport/weknow_over.png and /dev/null differ
diff --git a/src/main/resources/images/gui/menu_icon_convert.png b/src/main/resources/images/gui/menu_icon_convert.png
new file mode 100644
index 00000000..edb71565
Binary files /dev/null and b/src/main/resources/images/gui/menu_icon_convert.png differ
diff --git a/src/main/resources/images/gui/menu_icon_validate.png b/src/main/resources/images/gui/menu_icon_validate.png
new file mode 100644
index 00000000..008200a1
Binary files /dev/null and b/src/main/resources/images/gui/menu_icon_validate.png differ
diff --git a/src/main/resources/images/validator/conversion-success.png b/src/main/resources/images/validator/conversion-success.png
new file mode 100644
index 00000000..f8e9feec
Binary files /dev/null and b/src/main/resources/images/validator/conversion-success.png differ
diff --git a/src/main/resources/images/validator/convert-logo-inactive.png b/src/main/resources/images/validator/convert-logo-inactive.png
new file mode 100644
index 00000000..0199eb2c
Binary files /dev/null and b/src/main/resources/images/validator/convert-logo-inactive.png differ
diff --git a/src/main/resources/images/validator/convert-logo.png b/src/main/resources/images/validator/convert-logo.png
new file mode 100644
index 00000000..0b1f160b
Binary files /dev/null and b/src/main/resources/images/validator/convert-logo.png differ
diff --git a/src/main/resources/images/validator/converting.gif b/src/main/resources/images/validator/converting.gif
new file mode 100644
index 00000000..01836882
Binary files /dev/null and b/src/main/resources/images/validator/converting.gif differ
diff --git a/src/main/resources/images/validator/selected.png b/src/main/resources/images/validator/selected.png
new file mode 100644
index 00000000..4f6247b1
Binary files /dev/null and b/src/main/resources/images/validator/selected.png differ
diff --git a/src/main/resources/images/validator/start-conversion.png b/src/main/resources/images/validator/start-conversion.png
new file mode 100644
index 00000000..cd774833
Binary files /dev/null and b/src/main/resources/images/validator/start-conversion.png differ
diff --git a/src/main/resources/images/validator/start-conversion_over.png b/src/main/resources/images/validator/start-conversion_over.png
new file mode 100644
index 00000000..9a774d68
Binary files /dev/null and b/src/main/resources/images/validator/start-conversion_over.png differ
diff --git a/src/main/resources/images/validator/unselected.png b/src/main/resources/images/validator/unselected.png
new file mode 100644
index 00000000..8724084b
Binary files /dev/null and b/src/main/resources/images/validator/unselected.png differ"
cc2f077d437139e79052fbafa37a2065f5a1bd1d,hadoop,HADOOP-6452 Hadoop JSP pages don't work under a- security manager--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@893490 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/src/java/org/apache/hadoop/security/authorize/ConfiguredPolicy.java b/src/java/org/apache/hadoop/security/authorize/ConfiguredPolicy.java
index 6b90829aa854b..da06b08ec3d38 100644
--- a/src/java/org/apache/hadoop/security/authorize/ConfiguredPolicy.java
+++ b/src/java/org/apache/hadoop/security/authorize/ConfiguredPolicy.java
@@ -22,6 +22,8 @@
 import java.security.Policy;
 import java.security.Principal;
 import java.security.ProtectionDomain;
+import java.security.CodeSource;
+import java.security.Permissions;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -77,6 +79,19 @@ public boolean implies(ProtectionDomain domain, Permission permission) {
     return super.implies(domain, permission);
   }
 
+  /**
+   * {@inheritDoc}
+   * @return a writable permission collection
+   */
+  @Override
+  public PermissionCollection getPermissions(CodeSource codesource) {
+    return new Permissions();
+  }
+
+  /**
+   * {@inheritDoc}
+   * @return a writable permission collection
+   */
   @Override
   public PermissionCollection getPermissions(ProtectionDomain domain) {
     PermissionCollection permissionCollection = super.getPermissions(domain);
@@ -153,4 +168,14 @@ private void addPermission(Map<Principal, Set<Permission>> permissions,
       LOG.debug(""Policy - Adding  "" + permission + "" to "" + principal);
     }
   }
+
+  /**
+   * For debugging: identify ourselves and the policyproviders 
+   *
+   * @return a string representation of the object.
+   */
+  @Override
+  public String toString() {
+    return ""Hadoop ConfiguredPolicy "" + super.toString() + "" Policy provider ""+ policyProvider;
+  }
 }
diff --git a/src/test/core/org/apache/hadoop/security/authorize/TestConfiguredPolicy.java b/src/test/core/org/apache/hadoop/security/authorize/TestConfiguredPolicy.java
index 203946cabd8f3..898631eb77aab 100644
--- a/src/test/core/org/apache/hadoop/security/authorize/TestConfiguredPolicy.java
+++ b/src/test/core/org/apache/hadoop/security/authorize/TestConfiguredPolicy.java
@@ -17,7 +17,13 @@
  */
 package org.apache.hadoop.security.authorize;
 
-import java.security.Permission;
+import java.security.CodeSource;
+import java.security.CodeSigner;
+import java.security.PermissionCollection;
+import java.security.ProtectionDomain;
+import java.net.URL;
+import java.net.NetPermission;
+import java.net.MalformedURLException;
 
 import javax.security.auth.Subject;
 
@@ -36,7 +42,7 @@ public class TestConfiguredPolicy extends TestCase {
   
   private static final String KEY_1 = ""test.policy.1"";
   private static final String KEY_2 = ""test.policy.2"";
-  
+
   public static class Protocol1 {
     int i;
   }
@@ -55,11 +61,7 @@ public Service[] getServices() {
   }
   
   public void testConfiguredPolicy() throws Exception {
-    Configuration conf = new Configuration();
-    conf.set(KEY_1, AccessControlList.WILDCARD_ACL_VALUE);
-    conf.set(KEY_2, USER1 + "" "" + GROUPS1[0]);
-    
-    ConfiguredPolicy policy = new ConfiguredPolicy(conf, new TestPolicyProvider());
+    ConfiguredPolicy policy = createConfiguredPolicy();
     SecurityUtil.setPolicy(policy);
     
     Subject user1 = 
@@ -79,4 +81,60 @@ public void testConfiguredPolicy() throws Exception {
     }
     assertTrue(failed);
   }
+
+  /**
+   * Create a configured policy with some keys
+   * @return a new configured policy
+   */
+  private ConfiguredPolicy createConfiguredPolicy() {
+    Configuration conf = new Configuration();
+    conf.set(KEY_1, AccessControlList.WILDCARD_ACL_VALUE);
+    conf.set(KEY_2, USER1 + "" "" + GROUPS1[0]);
+
+    return new ConfiguredPolicy(conf, new TestPolicyProvider());
+  }
+
+  /**
+   * Create a test code source against a test URL
+   * @return a new code source
+   * @throws MalformedURLException
+   */
+  private CodeSource createCodeSource() throws MalformedURLException {
+    return new CodeSource(new URL(""http://hadoop.apache.org""),
+        (CodeSigner[]) null);
+  }
+
+  /**
+   * Assert that a permission collection can have new permissions added
+   * @param permissions the collection to check
+   */
+  private void assertWritable(PermissionCollection permissions) {
+    assertFalse(permissions.isReadOnly());
+    NetPermission netPermission = new NetPermission(""something"");
+    permissions.add(netPermission);
+  }
+
+  /**
+   * test that the {@link PermissionCollection} returned by
+   * {@link ConfiguredPolicy#getPermissions(CodeSource)} is writeable
+   * @throws Throwable on any failure
+   */
+  public void testPolicyWritable() throws Throwable {
+    ConfiguredPolicy policy = createConfiguredPolicy();
+    CodeSource source = createCodeSource();
+    PermissionCollection permissions = policy.getPermissions(source);
+    assertWritable(permissions);
+  }
+
+  /**
+   * test that the {@link PermissionCollection} returned by
+   * {@link ConfiguredPolicy#getPermissions(CodeSource)} is writeable
+   * @throws Throwable on any failure
+   */
+  public void testProtectionDomainPolicyWritable() throws Throwable {
+    ConfiguredPolicy policy = createConfiguredPolicy();
+    CodeSource source = createCodeSource();
+    PermissionCollection permissions = policy.getPermissions(new ProtectionDomain(source, null));
+    assertWritable(permissions);
+  }
 }"
615f760590ecff8d51832aa4988de410b9de4fb5,drools,JBRULES-2339: JBRULES-2440: fixing ruleflow group- management--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@32725 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-core/src/main/java/org/drools/common/DefaultAgenda.java b/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
index b6b14756a40..5d9c2502dee 100644
--- a/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
+++ b/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
@@ -904,8 +904,9 @@ public synchronized void fireActivation(final Activation activation) throws Cons
             }
             activation.setActivated( false );
 
+            InternalRuleFlowGroup ruleFlowGroup = null;
             if ( activation.getActivationNode() != null ) {
-                final InternalRuleFlowGroup ruleFlowGroup = (InternalRuleFlowGroup) activation.getActivationNode().getParentContainer();
+                ruleFlowGroup = (InternalRuleFlowGroup) activation.getActivationNode().getParentContainer();
                 // it is possible that the ruleflow group is no longer active if it was
                 // cleared during execution of this activation
                 ruleFlowGroup.removeActivation( activation );
@@ -930,6 +931,10 @@ public synchronized void fireActivation(final Activation activation) throws Cons
                     throw new RuntimeException( e );
                 }
             }
+            
+            if( ruleFlowGroup != null ) {
+                ruleFlowGroup.deactivateIfEmpty();
+            }
 
             // if the tuple contains expired events 
             for ( LeftTuple tuple = (LeftTuple) activation.getTuple(); tuple != null; tuple = tuple.getParent() ) {
diff --git a/drools-core/src/main/java/org/drools/common/InternalRuleFlowGroup.java b/drools-core/src/main/java/org/drools/common/InternalRuleFlowGroup.java
index eb56d023dd5..8ed644cd22d 100644
--- a/drools-core/src/main/java/org/drools/common/InternalRuleFlowGroup.java
+++ b/drools-core/src/main/java/org/drools/common/InternalRuleFlowGroup.java
@@ -17,6 +17,12 @@ public interface InternalRuleFlowGroup extends RuleFlowGroup {
     
     void clear();
 
+    /**
+     * Checks if this ruleflow group is active and should automatically deactivate.
+     * If the queue is empty, it deactivates the group.
+     */
+    public void deactivateIfEmpty();
+
     /**
      * Activates or deactivates this <code>RuleFlowGroup</code>.
      * When activating, all activations of this <code>RuleFlowGroup</code> are added
diff --git a/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java b/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
index a744ae0cdfb..40337c80397 100644
--- a/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
+++ b/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
@@ -53,7 +53,7 @@ public class RuleFlowGroupImpl
     private InternalWorkingMemory       workingMemory;
     private String                      name;
     private boolean                     active           = false;
-    private boolean                     autoDeactivate   = true;    
+    private boolean                     autoDeactivate   = true;
     private LinkedList                  list;
     private List<RuleFlowGroupListener> listeners;
     private Map<Long, String>           nodeInstances    = new HashMap<Long, String>();
@@ -72,13 +72,15 @@ public RuleFlowGroupImpl(final String name) {
         this.name = name;
         this.list = new LinkedList();
     }
-    
-    public RuleFlowGroupImpl(final String name, final boolean active, final boolean autoDeactivate) {
+
+    public RuleFlowGroupImpl(final String name,
+                             final boolean active,
+                             final boolean autoDeactivate) {
         this.name = name;
         this.active = active;
         this.autoDeactivate = autoDeactivate;
         this.list = new LinkedList();
-    }    
+    }
 
     public void readExternal(ObjectInput in) throws IOException,
                                             ClassNotFoundException {
@@ -187,7 +189,7 @@ public int size() {
     public void addActivation(final Activation activation) {
         assert activation.getActivationNode() == null;
         final ActivationNode node = new ActivationNode( activation,
-                                                              this );
+                                                        this );
         activation.setActivationNode( node );
         this.list.add( node );
 
@@ -200,12 +202,17 @@ public void removeActivation(final Activation activation) {
         final ActivationNode node = activation.getActivationNode();
         this.list.remove( node );
         activation.setActivationNode( null );
-        if ( this.active && this.autoDeactivate ) {
-            if ( this.list.isEmpty() ) {
-                // deactivate callback
-                WorkingMemoryAction action = new DeactivateCallback( this );
-                this.workingMemory.queueWorkingMemoryAction( action );
-            }
+    }
+
+    /**
+     * Checks if this ruleflow group is active and should automatically deactivate.
+     * If the queue is empty, it deactivates the group.
+     */
+    public void deactivateIfEmpty() {
+        if ( this.active && this.autoDeactivate && this.list.isEmpty() ) {
+            // deactivate callback
+            WorkingMemoryAction action = new DeactivateCallback( this );
+            this.workingMemory.queueWorkingMemoryAction( action );
         }
     }
 
@@ -217,8 +224,8 @@ public void addRuleFlowGroupListener(RuleFlowGroupListener listener) {
     }
 
     public void removeRuleFlowGroupListener(RuleFlowGroupListener listener) {
-        if (listeners != null) {
-            listeners.remove(listener);
+        if ( listeners != null ) {
+            listeners.remove( listener );
         }
     }
 
@@ -258,10 +265,12 @@ public int hashCode() {
         return this.name.hashCode();
     }
 
-    public static class DeactivateCallback implements WorkingMemoryAction {
-    	
-        private static final long serialVersionUID = 400L;
-        
+    public static class DeactivateCallback
+        implements
+        WorkingMemoryAction {
+
+        private static final long     serialVersionUID = 400L;
+
         private InternalRuleFlowGroup ruleFlowGroup;
 
         public DeactivateCallback(InternalRuleFlowGroup ruleFlowGroup) {
@@ -269,12 +278,12 @@ public DeactivateCallback(InternalRuleFlowGroup ruleFlowGroup) {
         }
 
         public DeactivateCallback(MarshallerReaderContext context) throws IOException {
-        	this.ruleFlowGroup = (InternalRuleFlowGroup) context.wm.getAgenda().getRuleFlowGroup(context.readUTF());
+            this.ruleFlowGroup = (InternalRuleFlowGroup) context.wm.getAgenda().getRuleFlowGroup( context.readUTF() );
         }
 
         public void write(MarshallerWriteContext context) throws IOException {
-        	context.writeInt( WorkingMemoryAction.DeactivateCallback );
-        	context.writeUTF(ruleFlowGroup.getName());
+            context.writeInt( WorkingMemoryAction.DeactivateCallback );
+            context.writeUTF( ruleFlowGroup.getName() );
         }
 
         public void readExternal(ObjectInput in) throws IOException,
@@ -283,28 +292,32 @@ public void readExternal(ObjectInput in) throws IOException,
         }
 
         public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeObject(ruleFlowGroup);
+            out.writeObject( ruleFlowGroup );
         }
 
         public void execute(InternalWorkingMemory workingMemory) {
             // check whether ruleflow group is still empty first
-            if (this.ruleFlowGroup.isEmpty()) {
+            if ( this.ruleFlowGroup.isEmpty() ) {
                 // deactivate ruleflow group
-                this.ruleFlowGroup.setActive(false);
+                this.ruleFlowGroup.setActive( false );
             }
         }
     }
-    
-    public void addNodeInstance(Long processInstanceId, String nodeInstanceId) {
-    	nodeInstances.put(processInstanceId, nodeInstanceId);
+
+    public void addNodeInstance(Long processInstanceId,
+                                String nodeInstanceId) {
+        nodeInstances.put( processInstanceId,
+                           nodeInstanceId );
     }
 
-    public void removeNodeInstance(Long processInstanceId, String nodeInstanceId) {
-    	nodeInstances.put(processInstanceId, nodeInstanceId);
+    public void removeNodeInstance(Long processInstanceId,
+                                   String nodeInstanceId) {
+        nodeInstances.put( processInstanceId,
+                           nodeInstanceId );
     }
-    
+
     public Map<Long, String> getNodeInstances() {
-    	return nodeInstances;
+        return nodeInstances;
     }
-    
+
 }
diff --git a/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java b/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
index 07b454c3f87..78ed21b2651 100644
--- a/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
+++ b/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
@@ -298,7 +298,7 @@ public void modifyLeftTuple(LeftTuple leftTuple,
         }
 
         AgendaItem item = (AgendaItem) leftTuple.getActivation();
-        if ( item.isActivated() ) {
+        if ( item != null && item.isActivated() ) {
             // already activated, do nothing
             return;
         }
@@ -314,12 +314,18 @@ public void modifyLeftTuple(LeftTuple leftTuple,
         final Timer timer = this.rule.getTimer();
 
         if ( timer != null ) {
+            if ( item == null ) {
+                item = agenda.createScheduledAgendaItem( leftTuple,
+                                                         context,
+                                                         this.rule,
+                                                         this.subrule );
+            }
             agenda.scheduleItem( (ScheduledAgendaItem) item,
                                  workingMemory );
             item.setActivated( true );
-//            workingMemory.removeLogicalDependencies( item,
-//                                                     context,
-//                                                     this.rule );
+            //            workingMemory.removeLogicalDependencies( item,
+            //                                                     context,
+            //                                                     this.rule );
 
             ((EventSupport) workingMemory).getAgendaEventSupport().fireActivationCreated( item,
                                                                                           workingMemory );
@@ -334,18 +340,32 @@ public void modifyLeftTuple(LeftTuple leftTuple,
                 }
             }
 
-            item.setSalience( rule.getSalience().getValue( leftTuple,
-                                                           workingMemory ) ); // need to re-evaluate salience, as used fields may have changed
-            item.setPropagationContext( context ); // update the Propagation Context
+            if ( item == null ) {
+                // -----------------
+                // Lazy instantiation and addition to the Agenda of AgendGroup
+                // implementations
+                // ----------------
+                item = agenda.createAgendaItem( leftTuple,
+                                                rule.getSalience().getValue( leftTuple,
+                                                                             workingMemory ),
+                                                context,
+                                                this.rule,
+                                                this.subrule );
+                item.setSequenence( this.sequence );
+            } else {
+                item.setSalience( rule.getSalience().getValue( leftTuple,
+                                                               workingMemory ) ); // need to re-evaluate salience, as used fields may have changed
+                item.setPropagationContext( context ); // update the Propagation Context
+            }
 
             boolean added = agenda.addActivation( item );
 
             item.setActivated( added );
 
             if ( added ) {
-//                workingMemory.removeLogicalDependencies( item,
-//                                                         context,
-//                                                         this.rule );
+                //                workingMemory.removeLogicalDependencies( item,
+                //                                                         context,
+                //                                                         this.rule );
                 ((EventSupport) workingMemory).getAgendaEventSupport().fireActivationCreated( item,
                                                                                               workingMemory );
             }
@@ -395,7 +415,7 @@ protected void doRemove(final RuleRemovalContext context,
                                  builder,
                                  this,
                                  workingMemories );
-        for( InternalWorkingMemory workingMemory : workingMemories ) {
+        for ( InternalWorkingMemory workingMemory : workingMemories ) {
             workingMemory.executeQueuedActions();
         }
         context.setCleanupAdapter( adapter );
@@ -470,19 +490,21 @@ public short getType() {
         return NodeTypeEnums.RuleTerminalNode;
     }
 
-    public static class RTNCleanupAdapter implements CleanupAdapter {
+    public static class RTNCleanupAdapter
+        implements
+        CleanupAdapter {
         private RuleTerminalNode node;
-        
+
         public RTNCleanupAdapter(RuleTerminalNode node) {
             this.node = node;
         }
 
         public void cleanUp(final LeftTuple leftTuple,
                             final InternalWorkingMemory workingMemory) {
-            if( leftTuple.getLeftTupleSink() != node ) {
+            if ( leftTuple.getLeftTupleSink() != node ) {
                 return;
             }
-            
+
             final Activation activation = leftTuple.getActivation();
 
             if ( activation.isActivated() ) {"
dea843b4bfd870a1b06b6d59a056043eb98b4239,Vala,"zlib: Many enhancements for memory/stream based operations

Fixes bug 577804.
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/zlib.vapi b/vapi/zlib.vapi
index 62d5a03a80..b615f6f3dc 100644
--- a/vapi/zlib.vapi
+++ b/vapi/zlib.vapi
@@ -1,6 +1,6 @@
-/* glib-2.0.vala
+/* zlib.vala
  *
- * Copyright (C) 2006-2008  Raffaele Sandrini, Jürg Billeter
+ * Copyright (C) 2006-2009  Raffaele Sandrini, Jürg Billeter, Evan Nemerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,171 @@
  * Author:
  *	Raffaele Sandrini <raffaele@sandrini.ch>
  * 	Jürg Billeter <j@bitron.ch>
+ * 	Evan Nemerson <evan@polussystems.com>
  */
 
 using GLib;
 
 [CCode (lower_case_cprefix = """", cheader_filename = ""zlib.h"")]
 namespace ZLib {
+	[CCode (cprefix = ""ZLIB_VER_"")]
+	namespace VERSION {
+		[CCode (cname = ""ZLIB_VERSION"")]
+		public const string STRING;
+		[CCode (cname = ""ZLIB_VERNUM"")]
+		public const int NUMBER;
+		public const int MAJOR;
+		public const int MINOR;
+		public const int REVISION;
+	}
+
+	[CCode (cprefix = ""Z_"")]
+	namespace Flush {
+		[CCode (cname = ""Z_NO_FLUSH"")]
+		public const int NONE;
+		[CCode (cname = ""Z_SYNC_FLUSH"")]
+		public const int SYNC;
+		[CCode (cname = ""Z_FULL_FLUSH"")]
+		public const int FULL;
+		public const int FINISH;
+		public const int BLOCK;
+	}
+
+	[CCode (cprefix = ""Z_"")]
+	namespace Status {
+		public const int OK;
+		public const int STREAM_END;
+		public const int NEED_DICT;
+		public const int ERRNO;
+		public const int STREAM_ERROR;
+		public const int DATA_ERROR;
+		public const int MEM_ERROR;
+		public const int BUF_ERROR;
+		public const int VERSION_ERROR;
+	}
+
+	namespace Compression {
+		[CCode (cname = ""Z_NO_COMPRESSION"")]
+		public const int NONE;
+		[CCode (cname = ""Z_BEST_SPEED"")]
+		public const int BEST_SPEED;
+		[CCode (cname = ""Z_BEST_COMPRESSION"")]
+		public const int BEST_COMPRESSION;
+		[CCode (cname = ""Z_DEFAULT_COMPRESSION"")]
+		public const int DEFAULT;
+	}
+
+	[CCode (cprefix = ""Z_"")]
+	namespace Strategy {
+		public const int FILTERED;
+		public const int HUFFMAN_ONLY;
+		public const int RLE;
+		public const int FIXED;
+		[CCode (cname = ""Z_DEFAULT_STRATEGY"")]
+		public const int DEFAULT;
+	}
+
+	[CCode (cprefix = ""Z_"")]
+	namespace Data {
+		public const int BINARY;
+		public const int TEXT;
+		public const int ASCII;
+		public const int UNKNOWN;
+	}
+
+	[CCode (cprefix = ""Z_"")]
+	namespace Algorithm {
+		public const int DEFLATED;
+	}
+
+	[CCode (cname = ""z_stream"", destroy_function = ""deflateEnd"")]
+	public struct Stream {
+		[CCode (array_length_cname = ""avail_in"", array_length_type = ""guint"")]
+		public uchar[] next_in;
+		public ulong total_in;
+
+		[CCode (array_length_cname = ""avail_out"", array_length_type = ""guint"")]
+		public uchar[] next_out;
+		public ulong total_out;
+
+		public string? msg;
+
+		public int data_type;
+		public ulong adler;
+	}
+
+	[CCode (cname = ""z_stream"", destroy_function = ""deflateEnd"")]
+	public struct DeflateStream : Stream {
+		[CCode (cname = ""deflateInit"")]
+		public DeflateStream (int level = Compression.DEFAULT);
+		[CCode (cname = ""deflateInit2"")]
+		public DeflateStream.full (int level, int method, int windowBits, int memLevel, int strategy);
+
+		[CCode (cname = ""deflate"")]
+		public int deflate (int flush);
+		[CCode (cname = ""deflateSetDictionary"")]
+		public int set_dictionary ([CCode (array_length_type = ""guint"")] uchar[] dictionary);
+		[CCode (cname = ""deflateCopy"", instance_pos = 0)]
+		public int copy (DeflateStream dest);
+		[CCode (cname = ""deflateReset"")]
+		public int reset ();
+		[CCode (cname = ""deflateParams"")]
+		public int params (int level, int strategy);
+		[CCode (cname = ""deflateTune"")]
+		public int tune (int good_length, int max_lazy, int nice_length, int max_chain);
+		[CCode (cname = ""deflateBound"")]
+		public ulong bound (ulong sourceLen);
+		[CCode (cname = ""deflatePrime"")]
+		public int prime (int bits, int value);
+		[CCode (cname = ""deflateSetHeader"")]
+		public int set_header (GZHeader head);
+	}
+
+	[CCode (cname = ""z_stream"", destroy_function = ""inflateEnd"")]
+	public struct InflateStream : Stream {
+		[CCode (cname = ""inflateInit"")]
+		public InflateStream ();
+		[CCode (cname = ""inflateInit2"")]
+		public InflateStream.full (int windowBits);
+
+		[CCode (cname = ""inflate"")]
+		public int inflate (int flush);
+		[CCode (cname = ""inflateSetDictionary"")]
+		public int set_dictionary ([CCode (array_length_type = ""guint"")] uchar[] dictionary);
+		[CCode (cnmae = ""inflateSync"")]
+		public int sync ();
+		public int reset ();
+		public int prime (int bits, int value);
+		public int get_header (out GZHeader head);
+	}
+
+	namespace Utility {
+		[CCode (cname = ""compress2"")]
+		public static int compress ([CCode (array_length_type = ""gulong"")] uchar[] dest, [CCode (array_length_type = ""gulong"")] uchar[] source, int level = Compression.DEFAULT);
+		[CCode (cname = ""compressBound"")]
+		public static int compress_bound (ulong sourceLen);
+
+		public static int uncompress ([CCode (array_length_type = ""gulong"")] uchar[] dest, [CCode (array_length_type = ""gulong"")] uchar[] source);
+	}
+
+	[CCode (cname = ""gz_header"")]
+	public struct GZHeader {
+		public int text;
+		public ulong time;
+		public int xflags;
+		public int os;
+		[CCode (array_length_name = ""extra_len"", array_length_type = ""guint"")]
+		public uchar[] extra;
+		public uint extra_max;
+		public string? name;
+		public uint name_max;
+		public string comment;
+		[CCode (cname = ""comm_max"")]
+		public uint comment_max;
+		public int hcrc;
+		public int done;
+	}
+
 	[CCode (cname = ""gzFile"", cprefix = ""gz"", free_function = ""gzclose"")]
 	public class GZFileStream {
 		public static GZFileStream open (string path, string mode);"
6b8099e8537df5f2beff8971fbe4d61a05b38c54,Valadoc,"Importer: Resolve c::*_finish methods
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/html/htmlrenderer.vala b/src/libvaladoc/html/htmlrenderer.vala
index 833fd5199d..d9f5a21cbf 100644
--- a/src/libvaladoc/html/htmlrenderer.vala
+++ b/src/libvaladoc/html/htmlrenderer.vala
@@ -69,12 +69,12 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
 	}
 
 	private void write_resolved_symbol_link (Api.Node symbol, string? given_label) {
+		var label = (given_label == null || given_label == """") ? symbol.get_full_name () : given_label;
 		if (symbol == _container || symbol == _owner) {
 			writer.start_tag (""span"", {""css"", cssresolver.resolve (symbol)})
-				.text (symbol.name)
+				.text (label)
 				.end_tag (""span"");
 		} else {
-			var label = (given_label == null || given_label == """") ? symbol.get_full_name () : given_label;
 			var url = get_url (symbol);
 			if (url == null) {
 				write_unresolved_symbol_link (label);
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 84bbbeff57..89ab8c30ee 100644
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -30,6 +30,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 
 	private enum SymbolContext {
 		NORMAL,
+		FINISH,
 		TYPE
 	}
 
@@ -58,6 +59,22 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 			_symbol = api_root.search_symbol_cstr (container, symbol_name);
 			_context = SymbolContext.NORMAL;
 
+			if (_symbol == null && _symbol_name.has_suffix (""_finish"")) {
+				string tmp = _symbol_name.substring (0, _symbol_name.length - 7);
+
+				_symbol = api_root.search_symbol_cstr (container, tmp + ""_async"") as Api.Method;
+				if (_symbol != null && ((Api.Method) _symbol).is_yields) {
+					_context = SymbolContext.FINISH;
+				} else {
+					_symbol = api_root.search_symbol_cstr (container, tmp) as Api.Method;
+					if (_symbol != null && ((Api.Method) _symbol).is_yields) {
+						_context = SymbolContext.FINISH;
+					} else {
+						_symbol = null;
+					}
+				}
+			}
+
 			if (_symbol == null) {
 				_symbol = api_root.search_symbol_type_cstr (symbol_name);
 				if (_symbol != null) {
@@ -67,6 +84,10 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 
 			if (_symbol != null) {
 				symbol_name = _symbol.name;
+
+				if (_context == SymbolContext.FINISH) {
+					symbol_name = symbol_name + "".end"";
+				}
 			}
 		} else {
 			_symbol = api_root.search_symbol_str (container, symbol_name);
@@ -88,6 +109,10 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 
 		// TODO: move typeof () to gtkdoc-importer
 		switch (_context) {
+		case SymbolContext.FINISH:
+			// covered by symbol_name
+			return link;
+
 		case SymbolContext.TYPE:
 			Content.Run content = new Content.Run (Run.Style.MONOSPACED);"
e517f55833c7ec02676bd850e9cd8f302a8a713f,ReactiveX-RxJava,Add finally0 to Observable.java .--,p,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
index 5d11c7b9ed..72c400dbf7 100644
--- a/rxjava-core/src/main/java/rx/Observable.java
+++ b/rxjava-core/src/main/java/rx/Observable.java
@@ -1182,6 +1182,18 @@ public static <T> Observable<T> concat(Observable<T>... source) {
         return _create(OperationConcat.concat(source));
     }
 
+    /**
+     * Emits the same objects as the given Observable, calling the given action
+     * when it calls <code>onComplete</code> or <code>onError</code>.
+     * @param source an observable
+     * @param action an action to be called when the source completes or errors.
+     * @return an Observable that emits the same objects, then calls the action.
+     * @see <a href=""http://msdn.microsoft.com/en-us/library/hh212133(v=vs.103).aspx"">MSDN: Observable.Finally Method</a>
+     */
+    public static <T> Observable<T> finally0(Observable source, Action0 action) {
+        return _create(OperationFinally.finally0(source, action));
+    }
+
     /**
      * Groups the elements of an observable and selects the resulting elements by using a specified function.
      * 
diff --git a/rxjava-core/src/main/java/rx/operators/OperationFinally.java b/rxjava-core/src/main/java/rx/operators/OperationFinally.java
index 0eddc57d2f..4474e11936 100644
--- a/rxjava-core/src/main/java/rx/operators/OperationFinally.java
+++ b/rxjava-core/src/main/java/rx/operators/OperationFinally.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2013 Netflix, Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an ""AS IS"" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,15 +23,12 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
 import rx.util.AtomicObservableSubscription;
-import rx.util.AtomicObserver;
 import rx.util.functions.Action0;
 import rx.util.functions.Func1;
 
@@ -42,16 +39,16 @@ public final class OperationFinally {
      * exception).  The returned observable is exactly as threadsafe as the
      * source observable; in particular, any situation allowing the source to
      * call onComplete or onError multiple times allows the returned observable
-     * to call the action multiple times.
+     * to call the final action multiple times.
      * <p/>
      * Note that ""finally"" is a Java reserved word and cannot be an identifier,
      * so we use ""finally0"".
-     * 
+     *
      * @param sequence An observable sequence of elements
      * @param action An action to be taken when the sequence is complete or throws an exception
      * @return An observable sequence with the same elements as the input.
      *         After the last element is consumed (just before {@link Observer#onComplete} is called),
-     *         or when an exception is thrown (just before {@link Observer#onError}), the action will be taken.
+     *         or when an exception is thrown (just before {@link Observer#onError}), the action will be called.
      * @see http://msdn.microsoft.com/en-us/library/hh212133(v=vs.103).aspx
      */
     public static <T> Func1<Observer<T>, Subscription> finally0(final Observable<T> sequence, final Action0 action) {
@@ -121,25 +118,24 @@ private static class TestAction implements Action0 {
                 called++;
             }
         }
-        
+
         @Test
         public void testFinally() {
             final String[] n = {""1"", ""2"", ""3""};
             final Observable<String> nums = Observable.toObservable(n);
             TestAction action = new TestAction();
             action.called = 0;
-            @SuppressWarnings(""unchecked"")
             Observable<String> fin = Observable.create(finally0(nums, action));
             @SuppressWarnings(""unchecked"")
             Observer<String> aObserver = mock(Observer.class);
             fin.subscribe(aObserver);
-            Assert.assertEquals(1, action.called);
+            assertEquals(1, action.called);
 
             action.called = 0;
             Observable<String> error = Observable.<String>error(new RuntimeException(""expected""));
             fin = Observable.create(finally0(error, action));
             fin.subscribe(aObserver);
-            Assert.assertEquals(1, action.called);
+            assertEquals(1, action.called);
         }
     }
-}
\ No newline at end of file
+}"
ccd24b5c3ce471428531e12737591b94c91db8bf,ReactiveX-RxJava,Add doOnSubscribe for Single--,a,https://github.com/ReactiveX/RxJava,"diff --git a/src/main/java/rx/Single.java b/src/main/java/rx/Single.java
index 20b983c063..a8a10bafb9 100644
--- a/src/main/java/rx/Single.java
+++ b/src/main/java/rx/Single.java
@@ -2250,6 +2250,28 @@ public void onNext(T t) {
         return lift(new OperatorDoOnEach<T>(observer));
     }
 
+    /**
+     * Modifies the source {@code Single} so that it invokes the given action when it is subscribed from
+     * its subscribers. Each subscription will result in an invocation of the given action except when the
+     * source {@code Single} is reference counted, in which case the source {@code Single} will invoke
+     * the given action for the first subscription.
+     * <p>
+     * <img width=""640"" height=""390"" src=""https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.png"" alt="""">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param subscribe
+     *            the action that gets called when an observer subscribes to this {@code Single}
+     * @return the source {@code Single} modified so as to call this Action when appropriate
+     * @see <a href=""http://reactivex.io/documentation/operators/do.html"">ReactiveX operators documentation: Do</a>
+     */
+    @Experimental
+    public final Single<T> doOnSubscribe(final Action0 subscribe) {
+        return lift(new OperatorDoOnSubscribe<T>(subscribe));
+    }
+
     /**
      * Returns an Single that emits the items emitted by the source Single shifted forward in time by a
      * specified delay. Error notifications from the source Single are not delayed.
diff --git a/src/test/java/rx/SingleTest.java b/src/test/java/rx/SingleTest.java
index 3ce86e9772..17794e4dbb 100644
--- a/src/test/java/rx/SingleTest.java
+++ b/src/test/java/rx/SingleTest.java
@@ -878,6 +878,43 @@ public void doOnSuccessShouldNotSwallowExceptionThrownByAction() {
         verify(action).call(eq(""value""));
     }
 
+    @Test
+    public void doOnSubscribeShouldInvokeAction() {
+        Action0 action = mock(Action0.class);
+        Single<Integer> single = Single.just(1).doOnSubscribe(action);
+
+        verifyZeroInteractions(action);
+
+        single.subscribe();
+        single.subscribe();
+
+        verify(action, times(2)).call();
+    }
+
+    @Test
+    public void doOnSubscribeShouldInvokeActionBeforeSubscriberSubscribes() {
+        final List<String> callSequence = new ArrayList<String>(2);
+
+        Single<Integer> single = Single.create(new OnSubscribe<Integer>() {
+            @Override
+            public void call(SingleSubscriber<? super Integer> singleSubscriber) {
+                callSequence.add(""onSubscribe"");
+                singleSubscriber.onSuccess(1);
+            }
+        }).doOnSubscribe(new Action0() {
+            @Override
+            public void call() {
+                callSequence.add(""doOnSubscribe"");
+            }
+        });
+
+        single.subscribe();
+
+        assertEquals(2, callSequence.size());
+        assertEquals(""doOnSubscribe"", callSequence.get(0));
+        assertEquals(""onSubscribe"", callSequence.get(1));
+    }
+
     @Test
     public void delayWithSchedulerShouldDelayCompletion() {
         TestScheduler scheduler = new TestScheduler();"
250ac825075785eef0c544670133eb590aaf1168,orientdb,Fixed problem with LET and context variables--,c,https://github.com/orientechnologies/orientdb,"diff --git a/src/main/java/com/orientechnologies/orient/etl/OAbstractETLComponent.java b/src/main/java/com/orientechnologies/orient/etl/OAbstractETLComponent.java
index 3479d210f96..35bb3a519ff 100644
--- a/src/main/java/com/orientechnologies/orient/etl/OAbstractETLComponent.java
+++ b/src/main/java/com/orientechnologies/orient/etl/OAbstractETLComponent.java
@@ -103,7 +103,7 @@ protected Object resolve(final Object iContent) {
 
     Object value = null;
     if (iContent instanceof String) {
-      if (((String) iContent).startsWith(""$""))
+      if (((String) iContent).startsWith(""$"") && !((String) iContent).startsWith(OSystemVariableResolver.VAR_BEGIN))
         value = context.getVariable(iContent.toString());
       else
         value = OVariableParser.resolveVariables((String) iContent, OSystemVariableResolver.VAR_BEGIN,
diff --git a/src/main/java/com/orientechnologies/orient/etl/block/OLetBlock.java b/src/main/java/com/orientechnologies/orient/etl/block/OLetBlock.java
index 37bb615cf11..e81888aba56 100644
--- a/src/main/java/com/orientechnologies/orient/etl/block/OLetBlock.java
+++ b/src/main/java/com/orientechnologies/orient/etl/block/OLetBlock.java
@@ -26,18 +26,27 @@
 public class OLetBlock extends OAbstractBlock {
   protected String     name;
   protected OSQLFilter expression;
+  protected Object     value;
 
   @Override
   public ODocument getConfiguration() {
     return new ODocument().fromJSON(""{parameters:[{name:{optional:false,description:'Variable name'}},""
-        + ""{value:{optional:false,description:'Variable value'}}]}"");
+        + ""{value:{optional:true,description:'Variable value'}}""
+        + ""{expression:{optional:true,description:'Expression to evaluate'}}"" + ""]}"");
   }
 
   @Override
-  public void configure(OETLProcessor iProcessor, final ODocument iConfiguration, OBasicCommandContext iContext) {
+  public void configure(OETLProcessor iProcessor, final ODocument iConfiguration, final OBasicCommandContext iContext) {
     super.configure(iProcessor, iConfiguration, iContext);
+
     name = iConfiguration.field(""name"");
-    expression = new OSQLFilter((String) iConfiguration.field(""value""), iContext, null);
+    if (iConfiguration.containsField(""value"")) {
+      value = iConfiguration.field(""value"");
+    } else
+      expression = new OSQLFilter((String) iConfiguration.field(""expression""), iContext, null);
+
+    if (value == null && expression == null)
+      throw new IllegalArgumentException(""'value' or 'expression' parameter are mandatory in Let Transformer"");
   }
 
   @Override
@@ -47,6 +56,9 @@ public String getName() {
 
   @Override
   public void executeBlock() {
-    context.setVariable(name, expression.evaluate(null, null, context));
+    if (expression != null)
+      context.setVariable(name, expression.evaluate(null, null, context));
+    else
+      context.setVariable(name, resolve(value));
   }
 }
diff --git a/src/main/resources/config-dbpedia.json b/src/main/resources/config-dbpedia.json
index c122848a1f5..217d8f313cb 100644
--- a/src/main/resources/config-dbpedia.json
+++ b/src/main/resources/config-dbpedia.json
@@ -6,8 +6,8 @@
     parallel: true
   },
   begin: [
-   { let: { name: ""$filePath"",  value: ""$fileDirectory.append( $fileName )""} },
-   { let: { name: ""$className"", value: ""$fileName.substring( 0, $fileName.indexOf('.') )""} }
+   { let: { name: ""$filePath"",  expression: ""$fileDirectory.append( $fileName )""} },
+   { let: { name: ""$className"", expression: ""$fileName.substring( 0, $fileName.indexOf('.') )""} }
   ],
   source : {
     file: { path: ""$filePath"", lock : true }"
586b7e3deedb5a917cffc194a3783b453becf5ca,kotlin,Base class for multi-file tests extracted--,p,https://github.com/JetBrains/kotlin,"diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
index e58eecf7950bd..b9509bff0549e 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
@@ -18,12 +18,10 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import com.google.common.io.Files;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Conditions;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -34,29 +32,22 @@
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.JetLiteFixture;
-import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.asJava.AsJavaPackage;
-import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.diagnostics.*;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.Diagnostics;
 import org.jetbrains.jet.lang.types.Flexibility;
-import org.jetbrains.jet.utils.UtilsPackage;
 import org.junit.Assert;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public abstract class BaseDiagnosticsTest extends JetLiteFixture {
+public abstract class BaseDiagnosticsTest extends
+                                          KotlinMultiFileTestWithWithJava<BaseDiagnosticsTest.TestModule, BaseDiagnosticsTest.TestFile> {
 
     public static final String DIAGNOSTICS_DIRECTIVE = ""DIAGNOSTICS"";
     public static final Pattern DIAGNOSTICS_PATTERN = Pattern.compile(""([\\+\\-!])(\\w+)\\s*"");
@@ -86,81 +77,17 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
     private static final String EXPLICIT_FLEXIBLE_TYPES_IMPORT = ""import "" + EXPLICIT_FLEXIBLE_PACKAGE + ""."" + EXPLICIT_FLEXIBLE_CLASS_NAME;
 
     @Override
-    protected JetCoreEnvironment createEnvironment() {
-        File javaFilesDir = createJavaFilesDir();
-        return JetCoreEnvironment.createForTests(getTestRootDisposable(), JetTestUtils.compilerConfigurationForTests(
-                        ConfigurationKind.JDK_AND_ANNOTATIONS,
-                        TestJdkKind.MOCK_JDK,
-                        Arrays.asList(JetTestUtils.getAnnotationsJar()),
-                        Arrays.asList(javaFilesDir)
-                ));
+    protected TestModule createTestModule(String name) {
+        return new TestModule(name);
     }
 
-    protected File createJavaFilesDir() {
-        File javaFilesDir = new File(FileUtil.getTempDirectory(), ""java-files"");
-        try {
-            JetTestUtils.mkdirs(javaFilesDir);
-        }
-        catch (IOException e) {
-            throw UtilsPackage.rethrow(e);
-        }
-        return javaFilesDir;
-    }
-
-    private static boolean writeJavaFile(@NotNull String fileName, @NotNull String content, @NotNull File javaFilesDir) {
-        try {
-            File javaFile = new File(javaFilesDir, fileName);
-            JetTestUtils.mkdirs(javaFile.getParentFile());
-            Files.write(content, javaFile, Charset.forName(""utf-8""));
-            return true;
-        } catch (Exception e) {
-            throw UtilsPackage.rethrow(e);
-        }
+    @Override
+    protected TestFile createTestFile(TestModule module, String fileName, String text, Map<String, String> directives) {
+        return new TestFile(module, fileName, text, directives);
     }
 
-    protected void doTest(String filePath) throws IOException {
-        File file = new File(filePath);
-        final File javaFilesDir = createJavaFilesDir();
-
-        String expectedText = JetTestUtils.doLoadFile(file);
-
-        class ModuleAndDependencies {
-            final TestModule module;
-            final List<String> dependencies;
-
-            ModuleAndDependencies(TestModule module, List<String> dependencies) {
-                this.module = module;
-                this.dependencies = dependencies;
-            }
-        }
-        final Map<String, ModuleAndDependencies> modules = new HashMap<String, ModuleAndDependencies>();
-
-        List<TestFile> testFiles =
-                JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory<TestModule, TestFile>() {
-                    @Override
-                    public TestFile createFile(
-                            @Nullable TestModule module,
-                            @NotNull String fileName,
-                            @NotNull String text,
-                            @NotNull Map<String, String> directives
-                    ) {
-                        if (fileName.endsWith("".java"")) {
-                            writeJavaFile(fileName, text, javaFilesDir);
-                        }
-
-                        return new TestFile(module, fileName, text, directives);
-                    }
-
-                    @Override
-                    public TestModule createModule(@NotNull String name, @NotNull List<String> dependencies) {
-                        TestModule module = new TestModule(name);
-                        ModuleAndDependencies oldValue = modules.put(name, new ModuleAndDependencies(module, dependencies));
-                        assert oldValue == null : ""Module "" + name + "" declared more than once"";
-
-                        return module;
-                    }
-                });
-
+    @Override
+    protected void doMultiFileTest(File file, final Map<String, ModuleAndDependencies> modules, List<TestFile> testFiles) {
         for (final ModuleAndDependencies moduleAndDependencies : modules.values()) {
             List<TestModule> dependencies = KotlinPackage.map(
                     moduleAndDependencies.dependencies,
@@ -168,7 +95,10 @@ public TestModule createModule(@NotNull String name, @NotNull List<String> depen
                         @Override
                         public TestModule invoke(String name) {
                             ModuleAndDependencies dependency = modules.get(name);
-                            assert dependency != null : ""Dependency not found: "" + name + "" for module "" + moduleAndDependencies.module.getName();
+                            assert dependency != null : ""Dependency not found: "" +
+                                                        name +
+                                                        "" for module "" +
+                                                        moduleAndDependencies.module.getName();
                             return dependency.module;
                         }
                     }
diff --git a/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java
new file mode 100644
index 0000000000000..e8fc04fab4aa7
--- /dev/null
+++ b/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.checkers;
+
+import com.google.common.io.Files;
+import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.JetLiteFixture;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.TestJdkKind;
+import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
+import org.jetbrains.jet.config.CompilerConfiguration;
+import org.jetbrains.jet.utils.UtilsPackage;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class KotlinMultiFileTestWithWithJava<M, F> extends JetLiteFixture {
+    protected class ModuleAndDependencies {
+        final M module;
+        final List<String> dependencies;
+
+        ModuleAndDependencies(M module, List<String> dependencies) {
+            this.module = module;
+            this.dependencies = dependencies;
+        }
+    }
+
+    protected static boolean writeSourceFile(@NotNull String fileName, @NotNull String content, @NotNull File targetDir) {
+        try {
+            File sourceFile = new File(targetDir, fileName);
+            JetTestUtils.mkdirs(sourceFile.getParentFile());
+            Files.write(content, sourceFile, Charset.forName(""utf-8""));
+            return true;
+        }
+        catch (Exception e) {
+            throw UtilsPackage.rethrow(e);
+        }
+    }
+
+    @Override
+    protected JetCoreEnvironment createEnvironment() {
+        File javaFilesDir = createJavaFilesDir();
+        CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(
+                ConfigurationKind.JDK_AND_ANNOTATIONS,
+                TestJdkKind.MOCK_JDK,
+                Arrays.asList(JetTestUtils.getAnnotationsJar()),
+                Arrays.asList(javaFilesDir)
+        );
+        return JetCoreEnvironment.createForTests(getTestRootDisposable(), configuration);
+    }
+
+    protected File createJavaFilesDir() {
+        File dir = new File(FileUtil.getTempDirectory(), ""java-files"");
+        try {
+            JetTestUtils.mkdirs(dir);
+        }
+        catch (IOException e) {
+            throw UtilsPackage.rethrow(e);
+        }
+        return dir;
+    }
+
+    protected void doTest(String filePath) throws Exception {
+        File file = new File(filePath);
+        final File javaFilesDir = createJavaFilesDir();
+
+        String expectedText = JetTestUtils.doLoadFile(file);
+
+        final Map<String, ModuleAndDependencies> modules = new HashMap<String, ModuleAndDependencies>();
+
+        List<F> testFiles =
+                JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory<M, F>() {
+                    @Override
+                    public F createFile(
+                            @Nullable M module,
+                            @NotNull String fileName,
+                            @NotNull String text,
+                            @NotNull Map<String, String> directives
+                    ) {
+                        if (fileName.endsWith("".java"")) {
+                            writeSourceFile(fileName, text, javaFilesDir);
+                        }
+
+                        return createTestFile(module, fileName, text, directives);
+                    }
+
+                    @Override
+                    public M createModule(@NotNull String name, @NotNull List<String> dependencies) {
+                        M module = createTestModule(name);
+                        ModuleAndDependencies oldValue = modules.put(name, new ModuleAndDependencies(module, dependencies));
+                        assert oldValue == null : ""Module "" + name + "" declared more than once"";
+
+                        return module;
+                    }
+                });
+
+        doMultiFileTest(file, modules, testFiles);
+    }
+
+    protected abstract M createTestModule(String name);
+
+    protected abstract F createTestFile(M module, String fileName, String text, Map<String, String> directives);
+
+    protected abstract void doMultiFileTest(File file, Map<String, ModuleAndDependencies> modules, List<F> files) throws Exception;
+}"
407ba7ef39b8a60e6153b64bb18ba54fa723937b,isa-tools$isacreator,"More additions to merge the new ontology browsing functionality into the tool base. I still have to rehook in the history component, allow the ontology browser selections to influence the ontology term definition pane, fix some GUI things and test more.
",p,https://github.com/isa-tools/isacreator,"diff --git a/src/main/java/org/isatools/isacreator/ontologybrowsingutils/WSOntologyTreeCreator.java b/src/main/java/org/isatools/isacreator/ontologybrowsingutils/WSOntologyTreeCreator.java
index 9a3e21a8..fee620e8 100644
--- a/src/main/java/org/isatools/isacreator/ontologybrowsingutils/WSOntologyTreeCreator.java
+++ b/src/main/java/org/isatools/isacreator/ontologybrowsingutils/WSOntologyTreeCreator.java
@@ -37,7 +37,7 @@ public class WSOntologyTreeCreator implements OntologyTreeCreator, TreeSelection
     private DefaultTreeModel treeModel;
     private Map<String, RecommendedOntology> ontologies;
 
-    private JPanel browser;
+    private Container browser;
     private OntologyService bioportalClient;
     private OntologyService olsClient;
     private JTree tree;
@@ -46,7 +46,7 @@ public class WSOntologyTreeCreator implements OntologyTreeCreator, TreeSelection
     private Set<String> knownLeaves;
 
 
-    public WSOntologyTreeCreator(JPanel browser, JTree tree) {
+    public WSOntologyTreeCreator(Container browser, JTree tree) {
         this.browser = browser;
         this.tree = tree;
         observers = new ArrayList<TreeObserver>();
@@ -93,13 +93,13 @@ private void initiateOntologyVisualization() {
 
             String nodeLabel = recommendedOntology.getOntology().getOntologyDisplayLabel();
 
-            OntologyService service  = getCorrectOntologyService(recommendedOntology.getOntology());
+            OntologyService service = getCorrectOntologyService(recommendedOntology.getOntology());
 
             if (recommendedOntology.getBranchToSearchUnder() != null) {
 
                 nodeLabel += "" under "" + recommendedOntology.getBranchToSearchUnder().getBranchName();
 
-                rootTerms = service.getTermChildren(recommendedOntology.getBranchToSearchUnder().getBranchIdentifier(),  getCorrectQueryString(service, recommendedOntology.getOntology()));
+                rootTerms = service.getTermChildren(recommendedOntology.getBranchToSearchUnder().getBranchIdentifier(), getCorrectQueryString(service, recommendedOntology.getOntology()));
 
             } else {
                 rootTerms = service.getOntologyRoots(
@@ -109,7 +109,6 @@ private void initiateOntologyVisualization() {
 
             DefaultMutableTreeNode ontologyNode = new DefaultMutableTreeNode(nodeLabel);
 
-
             rootNode.add(ontologyNode);
 
             // update the tree
@@ -134,7 +133,7 @@ private OntologyService getCorrectOntologyService(Ontology ontology) {
         return OntologyUtils.getSourceOntologyPortal(ontology) == OntologyPortal.OLS ? olsClient : bioportalClient;
     }
 
-    private String getCorrectQueryString(OntologyService service, Ontology ontology){
+    private String getCorrectQueryString(OntologyService service, Ontology ontology) {
         return service instanceof BioPortalClient ? ontology.getOntologyVersion() : ontology.getOntologyAbbreviation();
     }
 
@@ -157,7 +156,7 @@ private void preloadNextOntologyLevel(String termAccession, DefaultMutableTreeNo
 
         Ontology ontology = extractOntologyFromNode(parentTerm);
 
-         OntologyService service  = getCorrectOntologyService(ontology);
+        OntologyService service = getCorrectOntologyService(ontology);
 
         Map<String, String> termChildren = service.getTermChildren(termAccession, getCorrectQueryString(service, ontology));
 
@@ -238,7 +237,7 @@ public void valueChanged(TreeSelectionEvent treeSelectionEvent) {
 
                 // load children only for leaf nodes and those that have not been marked as processed
                 if (node.isLeaf() && node.getAllowsChildren()) {
-                    OntologyService service  = getCorrectOntologyService(ontologyTerm.getOntology());
+                    OntologyService service = getCorrectOntologyService(ontologyTerm.getOntology());
                     // load children. if no children, set allowsChildren to false
                     Map<String, String> termChildren = service.getTermChildren(ontologyTerm.getBranch().getBranchIdentifier(),
                             getCorrectQueryString(service, ontologyTerm.getOntology()));
diff --git a/src/main/java/org/isatools/isacreator/ontologymanager/BioPortalClient.java b/src/main/java/org/isatools/isacreator/ontologymanager/BioPortalClient.java
index 8a18e0d0..1fd982d8 100644
--- a/src/main/java/org/isatools/isacreator/ontologymanager/BioPortalClient.java
+++ b/src/main/java/org/isatools/isacreator/ontologymanager/BioPortalClient.java
@@ -333,6 +333,10 @@ public Map<String, String> getOntologyRoots(String ontology) {
 
             BioPortalClassBeanResultHandler handler = new BioPortalClassBeanResultHandler();
 
+            if(fileWithNameSpace == null) {
+                return new HashMap<String,String>();
+            }
+
             Map<String, BioPortalOntology> result = handler.parseRootConceptFile(fileWithNameSpace.getAbsolutePath(), noChildren);
 
             Map<String, String> processedResult = new HashMap<String, String>();
diff --git a/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologyCellEditor.java b/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologyCellEditor.java
index 3d506a21..d4eeccd1 100755
--- a/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologyCellEditor.java
+++ b/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologyCellEditor.java
@@ -199,6 +199,8 @@ public Component getTableCellEditorComponent(JTable table, Object value,
         ontologyTool.setLocation(proposedX, proposedY);
         ontologyTool.makeVisible();
 
+        ontologyTool.loadRecommendedOntologiesIfAllowed();
+
         return this;
     }
 
diff --git a/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologySelectionTool.java b/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologySelectionTool.java
index 1f9f2df4..814cbc9d 100755
--- a/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologySelectionTool.java
+++ b/src/main/java/org/isatools/isacreator/ontologyselectiontool/OntologySelectionTool.java
@@ -53,6 +53,7 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 import org.isatools.isacreator.effects.SingleSelectionListCellRenderer;
 import org.isatools.isacreator.effects.borders.RoundedBorder;
 import org.isatools.isacreator.model.Contact;
+import org.isatools.isacreator.ontologybrowsingutils.WSOntologyTreeCreator;
 import org.isatools.isacreator.ontologymanager.*;
 import org.isatools.isacreator.ontologymanager.bioportal.model.BioPortalOntology;
 import org.isatools.isacreator.ontologymanager.bioportal.model.OntologyPortal;
@@ -69,11 +70,14 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 import javax.swing.border.TitledBorder;
 import javax.swing.plaf.basic.BasicTreeUI;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreeNode;
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.io.FileNotFoundException;
 import java.util.*;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -126,7 +130,15 @@ public class OntologySelectionTool extends JFrame implements MouseListener,
 
     private JTextField searchField, selectedTerm;
 
-    private FilterableJTree ontologySearchResults;
+    private FilterableJTree ontologySearchResultsTree;
+    private JTree browseRecommendedOntologyTree;
+
+    private JPanel ontologyViewContainer;
+    private JPanel searchUIContainer;
+    private JPanel browseUIContainer;
+
+    private WSOntologyTreeCreator wsOntologyTreeCreator;
+
     private Map<String, String> result = null;
 
     // maps an ontology id e.g. 1123 for OBI to it's version e.g. 40832
@@ -156,9 +168,10 @@ public OntologySelectionTool(OntologyConsumer consumer,
                                  boolean multipleTermsAllowed, Map<String, RecommendedOntology> recommendedOntologies) {
         this.addWindowListener(this);
 
-
         this.recommendedOntologies = recommendedOntologies;
 
+        this.ontologyViewContainer = new JPanel(new FlowLayout());
+
         if (consumer == null) {
             this.history = new HashMap<String, OntologyObject>();
             this.searchResultCache = new ResultCache<String, Map<String, String>>();
@@ -235,6 +248,8 @@ private JPanel createSearchPanel() {
         searchOntologies.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent mouseEvent) {
+                resetButtons();
+                swapContainers(searchUIContainer);
                 searchOntologies.setIcon(searchOntologiesIconOver);
                 mode = SEARCH_MODE;
                 // todo change view
@@ -265,28 +280,62 @@ public void mouseExited(MouseEvent mouseEvent) {
 
             @Override
             public void mousePressed(MouseEvent mouseEvent) {
+                resetButtons();
+                swapContainers(browseUIContainer);
+                browseRecommendedOntologies.setIcon(browseOntologiesIconOver);
+                mode = BROWSE_MODE;
+
+                try {
+                    wsOntologyTreeCreator.createTree(recommendedOntologies);
+                } catch (FileNotFoundException e) {
+                    log.error(e.getMessage());
+                    browseRecommendedOntologyTree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(""Unable to load recommended ontologies"")));
+                }
             }
         });
 
+        boolean recommendedOntologiesAvailable = false;
+        if ((recommendedOntologies != null) &&
+                recommendedOntologies.size() > 0) {
+            recommendedOntologiesAvailable = true;
+
+        }
+
         Box buttonContainer = Box.createHorizontalBox();
         buttonContainer.add(searchOntologies);
-        buttonContainer.add(Box.createHorizontalStrut(5));
-        buttonContainer.add(browseRecommendedOntologies);
+
+        if (recommendedOntologiesAvailable) {
+            buttonContainer.add(Box.createHorizontalStrut(5));
+            buttonContainer.add(browseRecommendedOntologies);
+        }
 
 
         container.add(buttonContainer, BorderLayout.NORTH);
 
-        JPanel searchUIContainer = new JPanel();
+
+        if (recommendedOntologiesAvailable) {
+            // instantiate the recommended ontology browser...
+            createBrowseUI();
+        }
+
+
+        // todo searchUIContainer will be one JPanel and browseUIcontainer will be another. depending on which button is pressed, the containers are swapped
+        // searchUIContainer will be initialised
+        createSearchUI(recommendedOntologiesAvailable);
+
+        ontologyViewContainer.add(recommendedOntologiesAvailable ? browseUIContainer : searchUIContainer);
+
+        container.add(ontologyViewContainer, BorderLayout.CENTER);
+
+        return container;
+    }
+
+    private void createSearchUI(boolean recommendedOntologiesAvailable) {
+        searchUIContainer = new JPanel();
         searchUIContainer.setLayout(new BorderLayout());
         searchUIContainer.setBorder(new TitledBorder(new RoundedBorder(UIHelper.LIGHT_GREEN_COLOR, 6), """"));
         searchUIContainer.setBackground(UIHelper.BG_COLOR);
 
-        boolean recommendedOntologiesAvailable = false;
-        if ((recommendedOntologies != null) &&
-                recommendedOntologies.size() > 0) {
-            recommendedOntologiesAvailable = true;
-
-        }
 
         // instantiate the searchSpan OptionGroup object
         createOntologySearchSpanOptions(recommendedOntologiesAvailable);
@@ -344,18 +393,6 @@ public void mouseExited(MouseEvent event) {
 
         searchFieldCont.add(horBox, BorderLayout.NORTH);
 
-        DefaultMutableTreeNode top = new DefaultMutableTreeNode(""result"");
-
-        ontologySearchResults = new FilterableJTree();
-        TreeFilterModel treeModel = new FilterableOntologyTreeModel<Contact, Set<String>>(top, ontologySearchResults);
-
-        ontologySearchResults.setModel(treeModel);
-        ontologySearchResults.setCellRenderer(new CustomTreeRenderer());
-        ontologySearchResults.expandRow(0);
-        ontologySearchResults.expandRow(1); // expand root and first result node on acquiring result! if there is no result, no exceptions will be thrown!
-        ontologySearchResults.setShowsRootHandles(false);
-
-        // remove standard icon used to indicate that node is open.
         BasicTreeUI ui = new BasicTreeUI() {
             public Icon getCollapsedIcon() {
                 return null;
@@ -366,10 +403,10 @@ public Icon getExpandedIcon() {
             }
         };
 
-        ontologySearchResults.setUI(ui);
-        UIHelper.renderComponent(ontologySearchResults, UIHelper.VER_11_BOLD, UIHelper.GREY_COLOR, false);
+        createSearchResultsTree(ui);
+
 
-        JScrollPane treeScroll = new JScrollPane(ontologySearchResults,
+        JScrollPane treeScroll = new JScrollPane(ontologySearchResultsTree,
                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                 JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         treeScroll.setBorder(new EtchedBorder());
@@ -377,7 +414,7 @@ public Icon getExpandedIcon() {
         treeScroll.setPreferredSize(new Dimension(400, 170));
         IAppWidgetFactory.makeIAppScrollPane(treeScroll);
 
-        ontologySearchResults.addMouseListener(this);
+        ontologySearchResultsTree.addMouseListener(this);
 
 
         JPanel searchFields = new JPanel();
@@ -386,6 +423,7 @@ public Icon getExpandedIcon() {
 
         searchFields.add(searchSpan);
         searchFields.add(searchFieldCont);
+        searchFields.add(Box.createVerticalStrut(10));
 
         searchUIContainer.add(searchFields, BorderLayout.NORTH);
         searchUIContainer.add(treeScroll);
@@ -394,20 +432,75 @@ public Icon getExpandedIcon() {
         filterPanel.setBackground(UIHelper.BG_COLOR);
         filterPanel.setLayout(new BoxLayout(filterPanel, BoxLayout.LINE_AXIS));
 
-        ((JComponent) ontologySearchResults.getFilterField()).setBorder(null);
-        UIHelper.renderComponent(ontologySearchResults.getFilterField(), UIHelper.VER_11_BOLD, UIHelper.DARK_GREEN_COLOR, false);
+        ((JComponent) ontologySearchResultsTree.getFilterField()).setBorder(null);
+        UIHelper.renderComponent(ontologySearchResultsTree.getFilterField(), UIHelper.VER_11_BOLD, UIHelper.DARK_GREEN_COLOR, false);
 
         filterPanel.add(new JLabel(filterInfo));
         filterPanel.add(new JLabel(leftFieldIcon));
-        filterPanel.add(ontologySearchResults.getFilterField());
-        filterPanel.add(new ClearFieldUtility(ontologySearchResults.getFilterField()));
+        filterPanel.add(ontologySearchResultsTree.getFilterField());
+        filterPanel.add(new ClearFieldUtility(ontologySearchResultsTree.getFilterField()));
         filterPanel.add(new JLabel(rightFieldIcon));
 
         searchUIContainer.add(filterPanel, BorderLayout.SOUTH);
+    }
+
+    private void createSearchResultsTree(BasicTreeUI ui) {
+        DefaultMutableTreeNode top = new DefaultMutableTreeNode(""result"");
+
+        ontologySearchResultsTree = new FilterableJTree();
+        TreeFilterModel treeModel = new FilterableOntologyTreeModel<Contact, Set<String>>(top, ontologySearchResultsTree);
+
+        ontologySearchResultsTree.setModel(treeModel);
+        ontologySearchResultsTree.setCellRenderer(new CustomTreeRenderer());
+        ontologySearchResultsTree.expandRow(0);
+        ontologySearchResultsTree.expandRow(1); // expand root and first result node on acquiring result! if there is no result, no exceptions will be thrown!
+        ontologySearchResultsTree.setShowsRootHandles(false);
+
+        ontologySearchResultsTree.setUI(ui);
+        // UIHelper.renderComponent(ontologySearchResultsTree, UIHelper.VER_11_BOLD, UIHelper.GREY_COLOR, false);
+
+    }
+
+    private void createBrowseUI() {
+        browseUIContainer = new JPanel();
+        browseUIContainer.setLayout(new BorderLayout());
+        browseUIContainer.setBorder(new TitledBorder(new RoundedBorder(UIHelper.LIGHT_GREEN_COLOR, 6), """"));
+        browseUIContainer.setBackground(UIHelper.BG_COLOR);
+
+        BasicTreeUI ui = new BasicTreeUI() {
+            public Icon getCollapsedIcon() {
+                return null;
+            }
+
+            public Icon getExpandedIcon() {
+                return null;
+            }
+        };
+
+        createBrowseRecommendedOntologyTree(ui, recommendedOntologies);
+
+        JScrollPane treeScroll = new JScrollPane(browseRecommendedOntologyTree,
+                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+                JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        treeScroll.setBorder(new EtchedBorder());
+        treeScroll.getViewport().setBackground(UIHelper.BG_COLOR);
+        treeScroll.setPreferredSize(new Dimension(400, 170));
+        IAppWidgetFactory.makeIAppScrollPane(treeScroll);
+
+        browseUIContainer.add(treeScroll, BorderLayout.CENTER);
+    }
+
+    private void createBrowseRecommendedOntologyTree(BasicTreeUI ui, Map<String, RecommendedOntology> ontologies) {
+
+        browseRecommendedOntologyTree = new JTree();
+        wsOntologyTreeCreator = new WSOntologyTreeCreator(this, browseRecommendedOntologyTree);
+
+        browseRecommendedOntologyTree.setCellRenderer(new CustomTreeRenderer());
+        browseRecommendedOntologyTree.setShowsRootHandles(false);
+
+        browseRecommendedOntologyTree.setUI(ui);
 
-        container.add(searchUIContainer, BorderLayout.CENTER);
 
-        return container;
     }
 
     private void createOntologySearchSpanOptions(boolean recommendedOntologiesAvailable) {
@@ -995,7 +1088,7 @@ private void reconstructTree() {
             sortedAndProcessedResults.put(title, terms);
         }
 
-        ontologySearchResults.setItems(sortedAndProcessedResults);
+        ontologySearchResultsTree.setItems(sortedAndProcessedResults);
     }
 
     /**
@@ -1045,6 +1138,7 @@ public void makeVisible() {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 setVisible(true);
+
                 searchField.requestFocusInWindow();
                 repaint();
             }
@@ -1052,6 +1146,26 @@ public void run() {
 
     }
 
+    public void loadRecommendedOntologiesIfAllowed() {
+        if (recommendedOntologies != null && recommendedOntologies.size() > 0) {
+            swapContainers(browseUIContainer);
+            try {
+                wsOntologyTreeCreator.createTree(recommendedOntologies);
+
+            } catch (FileNotFoundException e) {
+                log.error(e.getMessage());
+                browseRecommendedOntologyTree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(""Unable to load recommended ontologies"")));
+
+            } finally {
+                resetButtons();
+                mode = BROWSE_MODE;
+                browseRecommendedOntologies.setIcon(browseOntologiesIconOver);
+
+                repaint();
+            }
+        }
+    }
+
     private OntologyBranch createOntologyBranchFromSelectedTerm(TreeNode selectedNode) {
         if (selectedNode != null) {
             String nodeString = selectedNode.toString();
@@ -1078,7 +1192,7 @@ public void mouseExited(MouseEvent event) {
 
     public void mousePressed(MouseEvent event) {
 
-        final DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) ontologySearchResults.getLastSelectedPathComponent();
+        final DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) ontologySearchResultsTree.getLastSelectedPathComponent();
         if (selectedNode != null) {
 
             if (selectedNode.isLeaf()) {
@@ -1149,11 +1263,25 @@ public void windowDeactivated(WindowEvent event) {
         firePropertyChange(""noSelectedOntology"", ""canceled"", """");
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                historyList.getFilterField().setText("""");
-                historyList.clearSelection();
+//                historyList.getFilterField().setText("""");
+//                historyList.clearSelection();
                 setVisible(false);
             }
         });
     }
 
+    private void resetButtons() {
+        searchOntologies.setIcon(searchOntologiesIcon);
+        browseRecommendedOntologies.setIcon(browseOntologiesIcon);
+    }
+
+    private void swapContainers(Container newContainer) {
+        if (newContainer != null) {
+            ontologyViewContainer.removeAll();
+            ontologyViewContainer.add(newContainer);
+            ontologyViewContainer.repaint();
+            ontologyViewContainer.validate();
+        }
+    }
+
 }"
4e446e768912ca08b30d74b3c570ddb336b837a6,hbase,HBASE-1869 IndexedTable delete fails when used in- conjunction with RowLock()--git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@819060 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hbase,"diff --git a/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java b/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
index 4d9563bc567b..fcd12873ccc5 100644
--- a/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
+++ b/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
@@ -244,7 +244,7 @@ public void delete(Delete delete, final Integer lockid, boolean writeToWAL)
         }
       }
       
-      Result oldRow = super.get(get, null);
+      Result oldRow = super.get(get, lockid);
       SortedMap<byte[], byte[]> oldColumnValues = convertToValueMap(oldRow);
       
       
@@ -255,7 +255,7 @@ public void delete(Delete delete, final Integer lockid, boolean writeToWAL)
       // Handle if there is still a version visible.
       if (delete.getTimeStamp() != HConstants.LATEST_TIMESTAMP) {
         get.setTimeRange(1, delete.getTimeStamp());
-        oldRow = super.get(get, null);
+        oldRow = super.get(get, lockid);
         SortedMap<byte[], byte[]> currentColumnValues = convertToValueMap(oldRow);
         
         for (IndexSpecification indexSpec : getIndexes()) {
diff --git a/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/tableindexed/TestIndexedTable.java b/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/tableindexed/TestIndexedTable.java
index 0cd440acd141..d7c1b15c020e 100644
--- a/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/tableindexed/TestIndexedTable.java
+++ b/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/tableindexed/TestIndexedTable.java
@@ -36,6 +36,7 @@
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.RowLock; 
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.regionserver.tableindexed.IndexedRegionServer;
 import org.apache.hadoop.hbase.util.Bytes;
 
@@ -144,6 +145,24 @@ private void assertRowUpdated(int updatedRow, int expectedRowValue)
                                     Bytes.toString(persistedRowValue));
   }
 
+  private void assertRowDeleted(int numRowsExpected)
+      throws IndexNotFoundException, IOException {
+    // Check the size of the primary table
+    ResultScanner scanner = table.getScanner(new Scan());
+    int numRows = 0;
+    for (Result rowResult : scanner) {
+      byte[] colA = rowResult.getValue(FAMILY, QUAL_A);
+      LOG.info(""primary scan : row ["" + Bytes.toString(rowResult.getRow())
+          + ""] value ["" + Bytes.toString(colA) + ""]"");
+      numRows++;
+    }
+    scanner.close();
+    Assert.assertEquals(numRowsExpected, numRows);
+
+    // Check the size of the index tables
+    assertRowsInOrder(numRowsExpected); 
+  }
+
   private void updateRow(int row, int newValue) throws IOException {
       Put update = new Put(PerformanceEvaluation.format(row));
       byte[] valueA = PerformanceEvaluation.format(newValue);
@@ -220,4 +239,15 @@ public void testLockedRowUpdateNoAutoFlush() throws IOException {
     updateLockedRowNoAutoFlush(row, value);
     assertRowUpdated(row, value);
   } 
+
+  public void testLockedRowDelete() throws IOException {
+    writeInitalRows();
+    // Delete the first row;
+    byte[] row = PerformanceEvaluation.format(0);
+    RowLock lock = table.lockRow(row);
+    table.delete(new Delete(row, HConstants.LATEST_TIMESTAMP, lock));
+    table.unlockRow(lock);    
+
+    assertRowDeleted(NUM_ROWS - 1);  
+  }
 }"
93c84a28089a7d8e96b2c22b2b0201a49b7c7aff,Valadoc,"driver/0.18.x: Add support for vala-0.17.4
",a,https://github.com/GNOME/vala/,"diff --git a/configure.in b/configure.in
index 38bb5f9b65..5260732724 100644
--- a/configure.in
+++ b/configure.in
@@ -62,12 +62,20 @@ AC_SUBST(LIBGDKPIXBUF_LIBS)
 ## Drivers:
 ##
 
-PKG_CHECK_MODULES(LIBVALA_0_18_X, libvala-0.18 >= 0.17.1, have_libvala_0_18_x=""yes"", have_libvala_0_18_x=""no"")
+PKG_CHECK_MODULES(LIBVALA_0_18_X, libvala-0.18 >= 0.17.4, have_libvala_0_18_x=""yes"", have_libvala_0_18_x=""no"")
 AM_CONDITIONAL(HAVE_LIBVALA_0_18_X, test ""$have_libvala_0_18_x"" = ""yes"")
 AC_SUBST(LIBVALA_0_18_X_CFLAGS)
 AC_SUBST(LIBVALA_0_18_X_LIBS)
 
 
+
+PKG_CHECK_MODULES(LIBVALA_0_17__1_3, libvala-0.18 >= 0.17.1   libvala-0.18 <= 0.17.3, have_libvala_0_17__1_3=""yes"", have_libvala_0_17__1_3=""no"")
+AM_CONDITIONAL(HAVE_LIBVALA_0_17__1_3, test ""$have_libvala_0_17__1_3"" = ""yes"")
+AC_SUBST(HAVE_LIBVALA_0_17__1_3_CFLAGS)
+AC_SUBST(HAVE_LIBVALA_0_17__1_3_LIBS)
+
+
+
 PKG_CHECK_MODULES(LIBVALA_0_17_0, libvala-0.18 = 0.17.0, have_libvala_0_17_0=""yes"", have_libvala_0_17_0=""no"")
 AM_CONDITIONAL(HAVE_LIBVALA_0_17_0, test ""$have_libvala_0_17_0"" = ""yes"")
 AC_SUBST(LIBVALA_0_17_0_CFLAGS)
@@ -153,7 +161,7 @@ AC_CONFIG_FILES([Makefile
                  src/doclets/gtkdoc/Makefile
                  src/valadoc/Makefile
                  tests/Makefile
-				 ])
+	])
 
 
 AC_OUTPUT
diff --git a/src/driver/0.18.x/Makefile.am b/src/driver/0.18.x/Makefile.am
index 9958cf36c8..ad64d18208 100644
--- a/src/driver/0.18.x/Makefile.am
+++ b/src/driver/0.18.x/Makefile.am
@@ -9,6 +9,9 @@ if HAVE_LIBVALA_0_17_0
 VALA_FLAGS = -D VALA_0_17_0
 endif
 
+if HAVE_LIBVALA_0_17__1_3
+VALA_FLAGS = -D VALA_0_17__1_3
+endif
 
 
 AM_CFLAGS =  -g \
@@ -17,6 +20,7 @@ AM_CFLAGS =  -g \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBVALA_0_18_X_CFLAGS) \
+	$(LIBVALA_0_17__1_3_CFLAGS) \
 	$(LIBVALA_0_17_1_CFLAGS) \
 	$(LIBVALA_0_17_0_CFLAGS) \
 	$(NULL)
@@ -61,6 +65,7 @@ libdriver_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
 	$(GLIB_LIBS) \
 	$(LIBVALA_0_18_X_LIBS) \
+	$(LIBVALA_0_17__1_3_LIBS) \
 	$(LIBVALA_0_17_1_LIBS) \
 	$(LIBVALA_0_17_0_LIBS) \
 	$(LIBGEE_LIBS) \
diff --git a/src/driver/0.18.x/initializerbuilder.vala b/src/driver/0.18.x/initializerbuilder.vala
index 70fd1d6bb9..737de3ee85 100644
--- a/src/driver/0.18.x/initializerbuilder.vala
+++ b/src/driver/0.18.x/initializerbuilder.vala
@@ -559,12 +559,14 @@ private class Valadoc.Api.InitializerBuilder : Vala.CodeVisitor {
 		signature.append_literal (lit.to_string (), false);
 	}
 
+#if VALA_0_17__1_3 || VALA_0_17_0
 	/**
 	 * {@inheritDoc}
 	 */
 	public override void visit_list_literal (Vala.ListLiteral lit) {
 		signature.append_literal (lit.to_string (), false);
 	}
+#endif
 
 	/**
 	 * {@inheritDoc}
diff --git a/src/driver/0.18.x/treebuilder.vala b/src/driver/0.18.x/treebuilder.vala
index dcfae0bd06..68e0f057cb 100644
--- a/src/driver/0.18.x/treebuilder.vala
+++ b/src/driver/0.18.x/treebuilder.vala
@@ -671,16 +671,18 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 					register_source_file (source_package, source_file);
 
-					if (context.profile == Vala.Profile.POSIX) {
-						// import the Posix namespace by default (namespace of backend-specific standard library)
-						var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, ""Posix"", null));
-						source_file.add_using_directive (ns_ref);
-						context.root.add_using_directive (ns_ref);
-					} else if (context.profile == Vala.Profile.GOBJECT) {
+					if (context.profile == Vala.Profile.GOBJECT) {
 						// import the GLib namespace by default (namespace of backend-specific standard library)
 						var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, ""GLib"", null));
 						source_file.add_using_directive (ns_ref);
 						context.root.add_using_directive (ns_ref);
+#if VALA_0_17__1_3|| VALA_0_17_0
+					} else if (context.profile == Vala.Profile.POSIX) {
+						// import the Posix namespace by default (namespace of backend-specific standard library)
+						var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, ""Posix"", null));
+						source_file.add_using_directive (ns_ref);
+						context.root.add_using_directive (ns_ref);
+#endif
 					}
 
 					context.add_source_file (source_file);
@@ -749,12 +751,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 			}
 		}
 
-		if (context.profile == Vala.Profile.POSIX) {
-			// default package
-			if (!add_package (context, ""posix"")) {
-				Vala.Report.error (null, ""posix not found in specified Vala API directories"");
-			}
-		} else if (context.profile == Vala.Profile.GOBJECT) {
+		if (context.profile == Vala.Profile.GOBJECT) {
 			int glib_major = 2;
 			int glib_minor = 12;
 
@@ -786,9 +783,15 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 			if (!this.add_package (context, ""gobject-2.0"")) { //
 				Vala.Report.error (null, ""gobject-2.0 not found in specified Vala API directories"");
 			}
+#if VALA_0_17__1_3 || VALA_0_17_0
+		} else if (context.profile == Vala.Profile.POSIX) {
+			// default package
+			if (!add_package (context, ""posix"")) {
+				Vala.Report.error (null, ""posix not found in specified Vala API directories"");
+			}
+#endif
 		}
 
-
 		// add user defined files:
 		add_depencies (context, settings.packages);
 		if (reporter.errors > 0) {
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 34f992dfef..4ed5eef0ae 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -38,6 +38,10 @@ if HAVE_LIBVALA_0_17_0
 DRIVER_0_18_X_DIR = 0.18.x
 endif
 
+if HAVE_LIBVALA_0_17__1_3
+DRIVER_0_18_X_DIR = 0.18.x
+endif
+
 if HAVE_LIBVALA_0_18_X
 DRIVER_0_18_X_DIR = 0.18.x
 endif"
3cf09ec9a51263838270cb5f62d5b34cb58f26bb,Vala,"clutter-1.0: add missing type_arguments for several new methods

Partially fixes bug 609875.
",c,https://github.com/GNOME/vala/,"diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 52e392de44..d7aa954b92 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -324,7 +324,7 @@ namespace Clutter {
 		public Animator ();
 		public bool compute_value (GLib.Object object, string property_name, double progress, GLib.Value value);
 		public uint get_duration ();
-		public unowned GLib.List get_keys (GLib.Object object, string property_name, double progress);
+		public GLib.List<weak Clutter.AnimatorKey> get_keys (GLib.Object object, string property_name, double progress);
 		public unowned Clutter.Timeline get_timeline ();
 		public bool property_get_ease_in (GLib.Object object, string property_name);
 		public Clutter.Interpolation property_get_interpolation (GLib.Object object, string property_name);
@@ -606,9 +606,9 @@ namespace Clutter {
 		public static unowned Clutter.DeviceManager get_default ();
 		public virtual unowned Clutter.InputDevice get_device (int device_id);
 		[NoWrapper]
-		public virtual unowned GLib.SList get_devices ();
-		public unowned GLib.SList list_devices ();
-		public unowned GLib.SList peek_devices ();
+		public virtual unowned GLib.SList<Clutter.InputDevice> get_devices ();
+		public GLib.SList<weak Clutter.InputDevice> list_devices ();
+		public unowned GLib.SList<Clutter.InputDevice> peek_devices ();
 		[NoWrapper]
 		public virtual void remove_device (Clutter.InputDevice device);
 		[NoAccessorMethod]
@@ -870,7 +870,7 @@ namespace Clutter {
 		public void @foreach (Clutter.PathCallback callback);
 		public uint get_n_nodes ();
 		public void get_node (uint index_, Clutter.PathNode node);
-		public unowned GLib.SList get_nodes ();
+		public GLib.SList<weak Clutter.PathNode> get_nodes ();
 		public uint get_position (double progress, Clutter.Knot position);
 		public void insert_node (int index_, Clutter.PathNode node);
 		public void remove_node (uint index_);
@@ -903,7 +903,7 @@ namespace Clutter {
 		public bool get_loop ();
 		public unowned Clutter.Timeline get_timeline (ulong id);
 		public bool is_playing ();
-		public unowned GLib.SList list_timelines ();
+		public GLib.SList<weak Clutter.Timeline> list_timelines ();
 		public void pause ();
 		public void remove (ulong id);
 		public void remove_all ();
@@ -930,7 +930,7 @@ namespace Clutter {
 		public unowned GLib.Object get_object (string name);
 		public int get_objects (...);
 		public virtual GLib.Type get_type_from_name (string type_name);
-		public unowned GLib.List list_objects ();
+		public GLib.List<weak GLib.Object> list_objects ();
 		public uint load_from_data (string data, ssize_t length) throws GLib.Error;
 		public uint load_from_file (string filename) throws GLib.Error;
 		public unowned string lookup_filename (string filename);
diff --git a/vapi/packages/clutter-1.0/clutter-1.0.metadata b/vapi/packages/clutter-1.0/clutter-1.0.metadata
index 7bdd7ea968..24ea92af00 100644
--- a/vapi/packages/clutter-1.0/clutter-1.0.metadata
+++ b/vapi/packages/clutter-1.0/clutter-1.0.metadata
@@ -111,6 +111,8 @@ clutter_animation_set_mode hidden=""1""
 clutter_animation_set_object hidden=""1""
 clutter_animation_set_timeline hidden=""1""
 
+clutter_animator_get_keys type_arguments=""unowned AnimatorKey"" transfer_ownership=""1""
+
 ClutterAnyEvent is_value_type=""1""
 
 clutter_behaviour_actors_foreach.data hidden=""1""
@@ -205,6 +207,10 @@ clutter_container_sort_depth_order hidden=""1""
 
 ClutterCrossingEvent is_value_type=""1""
 
+clutter_device_manager_list_devices type_arguments=""unowned InputDevice"" transfer_ownership=""1""
+clutter_device_manager_peek_devices type_arguments=""InputDevice""
+clutter_device_manager_get_devices type_arguments=""InputDevice""
+
 clutter_event_type name=""get_type""
 
 ClutterFeatureFlags hidden=""1""
@@ -281,6 +287,7 @@ clutter_param_spec_units hidden=""1""
 
 clutter_path_get_description hidden=""1""
 clutter_path_get_length hidden=""1""
+clutter_path_get_nodes type_arguments=""unowned PathNode"" transfer_ownership=""1""
 
 ClutterPathNode is_value_type=""1""
 ClutterPerspective is_value_type=""1""
@@ -294,6 +301,10 @@ clutter_rectangle_set_color hidden=""1""
 
 clutter_redraw hidden=""1""
 
+clutter_score_list_timelines type_arguments=""unowned Timeline"" transfer_ownership=""1""
+
+clutter_script_list_objects type_arguments=""unowned GLib.Object"" transfer_ownership=""1""
+
 ClutterScrollEvent is_value_type=""1""
 
 clutter_shader_get_cogl_fragment_shader hidden=""1"""
7d14cbcc88e784a0729148713eb86ca3a399ee54,d2rq$d2rq,"Removed the plan package (which was only used for find queries) by inlining its functionality into FindQuery and a new class CompatibleRelationGroup.
",p,https://github.com/d2rq/d2rq,"diff --git a/src/de/fuberlin/wiwiss/d2rq/find/CompatibleRelationGroup.java b/src/de/fuberlin/wiwiss/d2rq/find/CompatibleRelationGroup.java
new file mode 100644
index 00000000..64b5776a
--- /dev/null
+++ b/src/de/fuberlin/wiwiss/d2rq/find/CompatibleRelationGroup.java
@@ -0,0 +1,96 @@
+package de.fuberlin.wiwiss.d2rq.find;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import de.fuberlin.wiwiss.d2rq.algebra.Relation;
+import de.fuberlin.wiwiss.d2rq.algebra.RelationImpl;
+import de.fuberlin.wiwiss.d2rq.algebra.RelationName;
+import de.fuberlin.wiwiss.d2rq.sql.ResultRow;
+import de.fuberlin.wiwiss.d2rq.sql.TripleMaker;
+
+/**
+ * A group of {@link Relation}s that can be combined into a single
+ * relation without changing the semantics of {@link TripleMaker}s.
+ * 
+ * Relations can be combined iff they access the same database and 
+ * they contain exactly the same joins and WHERE clauses. If they
+ * both contain no joins, they must contain only columns from the same 
+ * table.
+ * 
+ * @author Richard Cyganiak (richard@cyganiak.de)
+ * @version $Id: CompatibleRelationGroup.java,v 1.1 2008/08/12 13:07:53 cyganiak Exp $
+ */
+public class CompatibleRelationGroup implements TripleMaker {
+
+	private final List tripleMakers = new ArrayList();
+	private final Relation firstBaseRelation;
+	private boolean allUnique = true;
+	private Set projections = new HashSet();
+	
+	public CompatibleRelationGroup(Relation first, TripleMaker tripleMaker) {
+		firstBaseRelation = first;
+		add(first, tripleMaker);
+	}
+
+	public boolean isCompatible(Relation otherRelation) {
+		if (!firstBaseRelation.database().equals(otherRelation.database())) {
+			return false;
+		}
+		if (!firstBaseRelation.joinConditions().equals(otherRelation.joinConditions())) {
+			return false;
+		}
+		if (!firstBaseRelation.condition().equals(otherRelation.condition())) {
+			return false;
+		}
+		Set firstTables = firstBaseRelation.tables();
+		Set secondTables = otherRelation.tables();
+		if (!firstTables.equals(secondTables)) {
+			return false;
+		}
+		Iterator it = firstTables.iterator();
+		while (it.hasNext()) {
+			RelationName tableName = (RelationName) it.next();
+			if (!firstBaseRelation.aliases().originalOf(tableName).equals(
+					otherRelation.aliases().originalOf(tableName))) {
+				return false;
+			}
+		}
+		if (!firstBaseRelation.isUnique() || !otherRelation.isUnique()) {
+			return false;
+		}
+		return true;
+	}
+
+	public void add(Relation relation, TripleMaker tripleMaker) {
+		tripleMakers.add(tripleMaker);
+		projections.addAll(relation.projections());
+		allUnique = allUnique && relation.isUnique();
+	}
+	
+	public Relation baseRelation() {
+		if (tripleMakers.size() == 1) {
+			return firstBaseRelation;
+		}
+		return new RelationImpl(firstBaseRelation.database(), firstBaseRelation.aliases(),
+				firstBaseRelation.condition(), firstBaseRelation.joinConditions(), 
+				projections, allUnique);
+	}
+	
+	public Collection makeTriples(ResultRow row) {
+		if (tripleMakers.size() == 1) {
+			return ((TripleMaker) tripleMakers.get(0)).makeTriples(row);
+		}
+		List result = new ArrayList();
+		Iterator it = this.tripleMakers.iterator();
+		while (it.hasNext()) {
+			TripleMaker relation = (TripleMaker) it.next();
+			result.addAll(relation.makeTriples(row));
+		}
+		return result;
+	}
+}
diff --git a/src/de/fuberlin/wiwiss/d2rq/find/FindQuery.java b/src/de/fuberlin/wiwiss/d2rq/find/FindQuery.java
index e0cbf377..72ec687a 100644
--- a/src/de/fuberlin/wiwiss/d2rq/find/FindQuery.java
+++ b/src/de/fuberlin/wiwiss/d2rq/find/FindQuery.java
@@ -13,13 +13,7 @@
 import de.fuberlin.wiwiss.d2rq.algebra.Relation;
 import de.fuberlin.wiwiss.d2rq.algebra.TripleRelation;
 import de.fuberlin.wiwiss.d2rq.find.URIMakerRule.URIMakerRuleChecker;
-import de.fuberlin.wiwiss.d2rq.plan.ExecuteCompatibleTripleRelations;
-import de.fuberlin.wiwiss.d2rq.plan.ExecuteSequence;
-import de.fuberlin.wiwiss.d2rq.plan.ExecuteTripleRelation;
-import de.fuberlin.wiwiss.d2rq.plan.ExecutionPlanElement;
-import de.fuberlin.wiwiss.d2rq.plan.ExecutionPlanVisitor;
 import de.fuberlin.wiwiss.d2rq.sql.RelationToTriplesIterator;
-import de.fuberlin.wiwiss.d2rq.sql.TripleMaker;
 
 
 /**
@@ -28,7 +22,7 @@
  * SQL statement where possible.
  *
  * @author Richard Cyganiak (richard@cyganiak.de)
- * @version $Id: FindQuery.java,v 1.14 2008/08/12 06:47:37 cyganiak Exp $
+ * @version $Id: FindQuery.java,v 1.15 2008/08/12 13:07:53 cyganiak Exp $
  */
 public class FindQuery {
 	private List compatibleRelations = new ArrayList();
@@ -40,84 +34,40 @@ public FindQuery(Triple triplePattern, Collection propertyBridges) {
 		URIMakerRuleChecker objectChecker = rule.createRuleChecker(triplePattern.getObject());
 		Iterator it = propertyBridges.iterator();
 		while (it.hasNext()) {
-			TripleRelation bridge = (TripleRelation) it.next();
-			TripleRelation selectionBridge = bridge.selectTriple(triplePattern);
-			if (selectionBridge != null
-					&& subjectChecker.canMatch(bridge.nodeMaker(TripleRelation.SUBJECT_NODE_MAKER))
-					&& objectChecker.canMatch(bridge.nodeMaker(TripleRelation.OBJECT_NODE_MAKER))) {
-				subjectChecker.addPotentialMatch(bridge.nodeMaker(TripleRelation.SUBJECT_NODE_MAKER));
-				objectChecker.addPotentialMatch(bridge.nodeMaker(TripleRelation.OBJECT_NODE_MAKER));
-				addRelation(new JoinOptimizer(selectionBridge).optimize());
+			TripleRelation tripleRelation = (TripleRelation) it.next();
+			TripleRelation selectedTripleRelation = tripleRelation.selectTriple(triplePattern);
+			if (selectedTripleRelation != null
+					&& subjectChecker.canMatch(tripleRelation.nodeMaker(TripleRelation.SUBJECT_NODE_MAKER))
+					&& objectChecker.canMatch(tripleRelation.nodeMaker(TripleRelation.OBJECT_NODE_MAKER))) {
+				subjectChecker.addPotentialMatch(tripleRelation.nodeMaker(TripleRelation.SUBJECT_NODE_MAKER));
+				objectChecker.addPotentialMatch(tripleRelation.nodeMaker(TripleRelation.OBJECT_NODE_MAKER));
+				addRelation(new JoinOptimizer(selectedTripleRelation).optimize());
 			}
 		}
 	}
 	
-	private void addRelation(TripleRelation relation) {
+	private void addRelation(TripleRelation tripleRelation) {
 		Iterator it = this.compatibleRelations.iterator();
 		while (it.hasNext()) {
-			List queries = (List) it.next();
-			if (ExecuteCompatibleTripleRelations.areCompatible(
-					((TripleRelation) queries.get(0)).baseRelation(), 
-					relation.baseRelation())) {
-				queries.add(relation);
+			CompatibleRelationGroup group = (CompatibleRelationGroup) it.next();
+			if (group.isCompatible(tripleRelation.baseRelation())) {
+				group.add(tripleRelation.baseRelation(), tripleRelation);
 				return;
 			}
 		}
-		List newList = new ArrayList();
-		newList.add(relation);
-		this.compatibleRelations.add(newList);
+		this.compatibleRelations.add(new CompatibleRelationGroup(tripleRelation.baseRelation(), tripleRelation));
 	}
 
-	private ExecutionPlanElement createPlan() {
-		ExecuteSequence sequence = new ExecuteSequence();
+	public ExtendedIterator iterator() {
+		ExtendedIterator result = NullIterator.emptyIterator();
 		Iterator it = compatibleRelations.iterator();
 		while (it.hasNext()) {
-			List tripleRelations = (List) it.next();
-			sequence.add(createPlanForTripleRelationList(tripleRelations));
-		}
-		return sequence;
-	}
-	
-	private ExecutionPlanElement createPlanForTripleRelationList(List tripleRelations) {
-		if (tripleRelations.size() == 1) {
-			return new ExecuteTripleRelation((TripleRelation) tripleRelations.get(0));
-		}
-		return new ExecuteCompatibleTripleRelations(tripleRelations);
-	}
-	
-	public ExtendedIterator iterator() {
-		TripleIteratorVisitor visitor = new TripleIteratorVisitor();
-		createPlan().visit(visitor);
-		return visitor.iterator();
-	}
-	
-	private class TripleIteratorVisitor implements ExecutionPlanVisitor {
-		private ExtendedIterator iterator = new NullIterator();
-		public ExtendedIterator iterator() {
-			return iterator;
-		}
-		public void visit(ExecuteTripleRelation planElement) {
-			TripleRelation relation = planElement.getTripleRelation();
-			chain(relation.baseRelation(), relation);
-		}
-		public void visit(ExecuteCompatibleTripleRelations union) {
-			chain(union.relation(), union);
-		}
-		public void visit(ExecuteSequence sequence) {
-			Iterator it = sequence.elements().iterator();
-			while (it.hasNext()) {
-				ExecutionPlanElement element = (ExecutionPlanElement) it.next();
-				element.visit(this);
-			}
-		}
-		public void visitEmptyPlanElement() {
-			// Do nothing
-		}
-		private void chain(Relation relation, TripleMaker tripleMaker) {
-			if (relation.equals(Relation.EMPTY)) {
-				return;
+			CompatibleRelationGroup group = (CompatibleRelationGroup) it.next();
+			if (!group.baseRelation().equals(Relation.EMPTY)) {
+				result = result.andThen(
+						RelationToTriplesIterator.createTripleIterator(group.baseRelation(), group));
 			}
-			iterator = iterator.andThen(RelationToTriplesIterator.createTripleIterator(relation, tripleMaker));
 		}
+		return result;
 	}
 }
diff --git a/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteCompatibleTripleRelations.java b/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteCompatibleTripleRelations.java
deleted file mode 100644
index 91ce18d2..00000000
--- a/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteCompatibleTripleRelations.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package de.fuberlin.wiwiss.d2rq.plan;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import de.fuberlin.wiwiss.d2rq.algebra.Relation;
-import de.fuberlin.wiwiss.d2rq.algebra.RelationImpl;
-import de.fuberlin.wiwiss.d2rq.algebra.RelationName;
-import de.fuberlin.wiwiss.d2rq.algebra.TripleRelation;
-import de.fuberlin.wiwiss.d2rq.sql.ResultRow;
-import de.fuberlin.wiwiss.d2rq.sql.TripleMaker;
-
-/**
- * @author Richard Cyganiak (richard@cyganiak.de)
- * @version $Id: ExecuteCompatibleTripleRelations.java,v 1.4 2008/07/29 18:45:32 cyganiak Exp $
- */
-public class ExecuteCompatibleTripleRelations implements ExecutionPlanElement, TripleMaker {
-
-	/**
-	 * Checks if two {@link Relation}s can be combined into
-	 * a single SQL statement. Relations can be combined iff
-	 * they access the same database and they contain exactly the same
-	 * joins and WHERE clauses. If they both contain no joins, they
-	 * must contain only columns from the same table.
-	 * 
-	 * @return <tt>true</tt> if both arguments are combinable
-	 */
-	public static boolean areCompatible(Relation first, Relation second) {
-		if (!first.database().equals(second.database())) {
-			return false;
-		}
-		if (!first.joinConditions().equals(second.joinConditions())) {
-			return false;
-		}
-		if (!first.condition().equals(second.condition())) {
-			return false;
-		}
-		Set firstTables = first.tables();
-		Set secondTables = second.tables();
-		if (!firstTables.equals(secondTables)) {
-			return false;
-		}
-		Iterator it = firstTables.iterator();
-		while (it.hasNext()) {
-			RelationName tableName = (RelationName) it.next();
-			if (!first.aliases().originalOf(tableName).equals(
-					second.aliases().originalOf(tableName))) {
-				return false;
-			}
-		}
-		if (!first.isUnique() || !second.isUnique()) {
-			return false;
-		}
-		return true;
-	}
-
-	private Relation baseRelation;
-	private List tripleMakers;
-	
-	public ExecuteCompatibleTripleRelations(List baseRelations) {
-		this.tripleMakers = baseRelations;
-		Relation base = ((TripleRelation) baseRelations.get(0)).baseRelation();
-		Set projections = new HashSet();
-		boolean allUnique = true;
-		Iterator it = baseRelations.iterator();
-		while (it.hasNext()) {
-			TripleRelation bridge = (TripleRelation) it.next();
-			projections.addAll(bridge.baseRelation().projections());
-			allUnique = allUnique && bridge.baseRelation().isUnique();
-		}
-		this.baseRelation = new RelationImpl(base.database(), base.aliases(),
-				base.condition(), base.joinConditions(), projections, allUnique);
-	}
-
-	public Relation relation() {
-		return this.baseRelation;
-	}
-	
-	public Collection makeTriples(ResultRow row) {
-		List result = new ArrayList();
-		Iterator it = this.tripleMakers.iterator();
-		while (it.hasNext()) {
-			TripleMaker relation = (TripleMaker) it.next();
-			result.addAll(relation.makeTriples(row));
-		}
-		return result;
-	}
-	
-	public void visit(ExecutionPlanVisitor visitor) {
-		visitor.visit(this);
-	}
-}
diff --git a/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteSequence.java b/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteSequence.java
deleted file mode 100644
index 5cfd0824..00000000
--- a/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteSequence.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.fuberlin.wiwiss.d2rq.plan;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class ExecuteSequence implements ExecutionPlanElement {
-	private final List elements = new ArrayList();
-	
-	public ExecuteSequence() {
-		this(Collections.EMPTY_LIST);
-	}
-	
-	public ExecuteSequence(List elements) {
-		this.elements.addAll(elements);
-	}
-	
-	public void add(ExecutionPlanElement element) {
-		this.elements.add(element);
-	}
-	
-	public List elements() {
-		return Collections.unmodifiableList(elements);
-	}
-	
-	public void visit(ExecutionPlanVisitor visitor) {
-		visitor.visit(this);
-	}
-}
diff --git a/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteTripleRelation.java b/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteTripleRelation.java
deleted file mode 100644
index 36158901..00000000
--- a/src/de/fuberlin/wiwiss/d2rq/plan/ExecuteTripleRelation.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.fuberlin.wiwiss.d2rq.plan;
-
-import de.fuberlin.wiwiss.d2rq.algebra.TripleRelation;
-
-public class ExecuteTripleRelation implements ExecutionPlanElement {
-	private TripleRelation tripleRelation;
-	
-	public ExecuteTripleRelation(TripleRelation tripleRelation) {
-		this.tripleRelation = tripleRelation;
-	}
-	
-	public TripleRelation getTripleRelation() {
-		return tripleRelation;
-	}
-	
-	public void visit(ExecutionPlanVisitor visitor) {
-		visitor.visit(this);
-	}
-}
diff --git a/src/de/fuberlin/wiwiss/d2rq/plan/ExecutionPlanElement.java b/src/de/fuberlin/wiwiss/d2rq/plan/ExecutionPlanElement.java
deleted file mode 100644
index 388ef2c4..00000000
--- a/src/de/fuberlin/wiwiss/d2rq/plan/ExecutionPlanElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.fuberlin.wiwiss.d2rq.plan;
-
-
-/**
- * A relation, as defined in relational algebra, plus a set of NodeMakers
- * attached to the relation, plus a set of TripleMakers attached to the
- * NodeMakers. Very much work in progress.
- * 
- * @author Richard Cyganiak (richard@cyganiak.de)
- * @version $Id: ExecutionPlanElement.java,v 1.1 2008/04/25 11:25:05 cyganiak Exp $
- */
-public interface ExecutionPlanElement {
-	
-	public static final ExecutionPlanElement EMPTY = new ExecutionPlanElement() {
-		public String toString() { return ""ExecutionPlanElement.EMPTY""; }
-		public void visit(ExecutionPlanVisitor visitor) { visitor.visitEmptyPlanElement(); }
-	};
-	
-	public void visit(ExecutionPlanVisitor visitor);
-}
\ No newline at end of file
diff --git a/src/de/fuberlin/wiwiss/d2rq/plan/ExecutionPlanVisitor.java b/src/de/fuberlin/wiwiss/d2rq/plan/ExecutionPlanVisitor.java
deleted file mode 100644
index 63719f7a..00000000
--- a/src/de/fuberlin/wiwiss/d2rq/plan/ExecutionPlanVisitor.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.fuberlin.wiwiss.d2rq.plan;
-
-
-public interface ExecutionPlanVisitor {
-
-	void visit(ExecuteTripleRelation tripleRelation);
-	
-	void visit(ExecuteCompatibleTripleRelations compatibleRelations);
-	
-	void visit(ExecuteSequence sequence);
-	
-	void visitEmptyPlanElement();
-}
diff --git a/test/de/fuberlin/wiwiss/d2rq/D2RQTestSuite.java b/test/de/fuberlin/wiwiss/d2rq/D2RQTestSuite.java
index 71dd0d5a..0b8dbc94 100644
--- a/test/de/fuberlin/wiwiss/d2rq/D2RQTestSuite.java
+++ b/test/de/fuberlin/wiwiss/d2rq/D2RQTestSuite.java
@@ -7,7 +7,7 @@
  * Test suite for D2RQ
  *
  * @author Richard Cyganiak (richard@cyganiak.de)
- * @version $Id: D2RQTestSuite.java,v 1.14 2008/07/29 18:45:31 cyganiak Exp $
+ * @version $Id: D2RQTestSuite.java,v 1.15 2008/08/12 13:07:53 cyganiak Exp $
  */
 public class D2RQTestSuite {
 	public static final String DIRECTORY = ""test/de/fuberlin/wiwiss/d2rq/"";
@@ -31,7 +31,6 @@ public static Test suite() {
 		suite.addTest(de.fuberlin.wiwiss.d2rq.map.AllTests.suite());
 		suite.addTest(de.fuberlin.wiwiss.d2rq.nodes.AllTests.suite());
 		suite.addTest(de.fuberlin.wiwiss.d2rq.parser.AllTests.suite());
-		suite.addTest(de.fuberlin.wiwiss.d2rq.plan.AllTests.suite());
 		suite.addTest(de.fuberlin.wiwiss.d2rq.pp.AllTests.suite());
 		suite.addTest(de.fuberlin.wiwiss.d2rq.sql.AllTests.suite());
 		suite.addTest(de.fuberlin.wiwiss.d2rq.values.AllTests.suite());
diff --git a/test/de/fuberlin/wiwiss/d2rq/find/AllTests.java b/test/de/fuberlin/wiwiss/d2rq/find/AllTests.java
index 81d49ac7..0f8491cb 100644
--- a/test/de/fuberlin/wiwiss/d2rq/find/AllTests.java
+++ b/test/de/fuberlin/wiwiss/d2rq/find/AllTests.java
@@ -8,6 +8,7 @@ public class AllTests {
 	public static Test suite() {
 		TestSuite suite = new TestSuite(""Test for de.fuberlin.wiwiss.d2rq.find"");
 		//$JUnit-BEGIN$
+		suite.addTestSuite(CompatibleRelationGroupTest.class);
 		suite.addTestSuite(URIMakerRuleTest.class);
 		//$JUnit-END$
 		return suite;
diff --git a/test/de/fuberlin/wiwiss/d2rq/plan/ExecuteCompatibleTripleRelationsTest.java b/test/de/fuberlin/wiwiss/d2rq/find/CompatibleRelationGroupTest.java
similarity index 68%
rename from test/de/fuberlin/wiwiss/d2rq/plan/ExecuteCompatibleTripleRelationsTest.java
rename to test/de/fuberlin/wiwiss/d2rq/find/CompatibleRelationGroupTest.java
index 88ba8662..3d1b63f2 100644
--- a/test/de/fuberlin/wiwiss/d2rq/plan/ExecuteCompatibleTripleRelationsTest.java
+++ b/test/de/fuberlin/wiwiss/d2rq/find/CompatibleRelationGroupTest.java
@@ -1,4 +1,4 @@
-package de.fuberlin.wiwiss.d2rq.plan;
+package de.fuberlin.wiwiss.d2rq.find;
 
 import java.util.Collections;
 import java.util.Set;
@@ -8,9 +8,10 @@
 import de.fuberlin.wiwiss.d2rq.algebra.Attribute;
 import de.fuberlin.wiwiss.d2rq.algebra.RelationImpl;
 import de.fuberlin.wiwiss.d2rq.expr.Expression;
+import de.fuberlin.wiwiss.d2rq.find.CompatibleRelationGroup;
 import de.fuberlin.wiwiss.d2rq.sql.DummyDB;
 
-public class ExecuteCompatibleTripleRelationsTest extends TestCase {
+public class CompatibleRelationGroupTest extends TestCase {
 
 	public void testNotUniqueIsNotCompatible() {
 		Set projections1 = Collections.singleton(new Attribute(null, ""table"", ""unique""));
@@ -21,7 +22,8 @@ public void testNotUniqueIsNotCompatible() {
 		RelationImpl notUnique = new RelationImpl(
 				new DummyDB(), AliasMap.NO_ALIASES, Expression.TRUE, Collections.EMPTY_SET, 
 				projections2, false);
-		assertTrue(ExecuteCompatibleTripleRelations.areCompatible(unique, unique));
-		assertFalse(ExecuteCompatibleTripleRelations.areCompatible(unique, notUnique));
+		assertTrue(new CompatibleRelationGroup(unique, null).isCompatible(unique));
+		assertFalse(new CompatibleRelationGroup(unique, null).isCompatible(notUnique));
+		assertFalse(new CompatibleRelationGroup(notUnique, null).isCompatible(unique));
 	}
 }
diff --git a/test/de/fuberlin/wiwiss/d2rq/plan/AllTests.java b/test/de/fuberlin/wiwiss/d2rq/plan/AllTests.java
deleted file mode 100644
index 44e913a3..00000000
--- a/test/de/fuberlin/wiwiss/d2rq/plan/AllTests.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package de.fuberlin.wiwiss.d2rq.plan;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(""Test for de.fuberlin.wiwiss.d2rq.plan"");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(ExecuteCompatibleTripleRelationsTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}"
b93f6e6d7ff3b79a6b97c92aea857fcb366fa7ba,Vala,"Call g_signal_handlers_destroy on gtypeinstance finalizer

Fixes bug 708130
",a,https://github.com/GNOME/vala/,"diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 3dc3729f70..02c5b6e5c2 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1710,6 +1710,13 @@ public class Vala.GTypeModule : GErrorModule {
 
 			ccode.add_declaration (""%s *"".printf (get_ccode_name (cl)), new CCodeVariableDeclarator (""self""));
 			ccode.add_assignment (new CCodeIdentifier (""self""), ccast);
+
+			if (!cl.is_compact && cl.base_class == null) {
+				// non-gobject class
+				var call = new CCodeFunctionCall (new CCodeIdentifier (""g_signal_handlers_destroy""));
+				call.add_argument (new CCodeIdentifier (""self""));
+				ccode.add_expression (call);
+			}
 		} else {
 			var function = new CCodeFunction (get_ccode_lower_case_prefix (cl) + ""free"", ""void"");
 			if (cl.is_private_symbol ()) {"
a72d7744322cea57224b426f06d1f81521c027fe,simpleserver$simpleserver,"completed custAuth export
* made exports resources
* added default option
* improved stability
* closes #117
",p,https://github.com/simpleserver/simpleserver,"diff --git a/src/simpleserver/Authenticator.java b/src/simpleserver/Authenticator.java
index 26fe9d3a..9402a34b 100644
--- a/src/simpleserver/Authenticator.java
+++ b/src/simpleserver/Authenticator.java
@@ -120,7 +120,11 @@ public void register(String playerName, String password) {
     server.data.save();
 
     if (server.options.getBoolean(""enableCustAuthExport"")) {
-      server.custAuthExport.addEntry(playerName, server.config.players.get(playerName), pwHash);
+      Integer groupId = server.config.players.get(playerName);
+      if (groupId == null) {
+        groupId = server.config.properties.getInt(""defaultGroup"");
+      }
+      server.custAuthExport.addEntry(playerName, groupId, pwHash);
     }
   }
 
diff --git a/src/simpleserver/Server.java b/src/simpleserver/Server.java
index 3f2e331d..dbe5bf5a 100644
--- a/src/simpleserver/Server.java
+++ b/src/simpleserver/Server.java
@@ -48,7 +48,6 @@
 import simpleserver.config.xml.Config;
 import simpleserver.config.xml.GlobalConfig;
 import simpleserver.export.CustAuthExport;
-import simpleserver.export.Export;
 import simpleserver.lang.Translations;
 import simpleserver.log.AdminLog;
 import simpleserver.log.ConnectionLog;
@@ -108,7 +107,6 @@ public class Server {
   private MessageLog messageLog;
   private SystemInputQueue systemInput;
 
-  private List<Export> exports;
   public CustAuthExport custAuthExport;
 
   private MinecraftWrapper minecraft;
@@ -272,12 +270,6 @@ public void saveConfig() {
     globalConfig.save();
   }
 
-  public void saveExports() {
-    for (Export export : exports) {
-      export.save();
-    }
-  }
-
   public String findName(String prefix) {
     Player i = playerList.findPlayer(prefix);
     if (i != null) {
@@ -412,11 +404,6 @@ private void initialize() {
     resources.add(data = new GlobalData());
     resources.add(docs = new ReadFiles());
 
-    exports = new LinkedList<Export>();
-    if (options.getBoolean(""enableCustAuthExport"")) {
-      exports.add(custAuthExport = new CustAuthExport(this));
-    }
-
     time = new Time(this);
     bots = new BotController(this);
 
@@ -454,6 +441,11 @@ private void startup() {
     requestTracker = new RequestTracker(this);
     messager = new Messager(this);
 
+    if (options.getBoolean(""enableCustAuthExport"")) {
+      resources.add(custAuthExport = new CustAuthExport(this));
+      custAuthExport.load();
+    }
+
     messageLog = new MessageLog(config.properties.get(""logMessageFormat""), config.properties.getBoolean(""logMessages""));
 
     minecraft = new MinecraftWrapper(this, options, systemInput);
@@ -523,7 +515,6 @@ private void shutdown() {
     requestTracker.stop();
     c10t.stop();
     saveResources();
-    saveExports();
 
     playerList.waitUntilEmpty();
     minecraft.stop();
diff --git a/src/simpleserver/command/SetGroupCommand.java b/src/simpleserver/command/SetGroupCommand.java
index d2250403..2eeb06ba 100644
--- a/src/simpleserver/command/SetGroupCommand.java
+++ b/src/simpleserver/command/SetGroupCommand.java
@@ -111,5 +111,9 @@ protected void setGroup(Server server, int group, String target) {
     server.config.players.set(target, group);
     server.saveConfig();
     System.out.println(""[SimpleServer] Player "" + target + ""'s group was set to "" + new Integer(group).toString() + ""!"");
+
+    if (server.options.getBoolean(""enableCustAuthExport"")) {
+      server.custAuthExport.updateGroup(target, group);
+    }
   }
 }
diff --git a/src/simpleserver/export/CustAuthExport.java b/src/simpleserver/export/CustAuthExport.java
index a351ac54..4bed8801 100644
--- a/src/simpleserver/export/CustAuthExport.java
+++ b/src/simpleserver/export/CustAuthExport.java
@@ -22,13 +22,14 @@
 
 import simpleserver.Server;
 
-public class CustAuthExport extends PropertiesExport implements Export {
+public class CustAuthExport extends PropertiesExport {
   private Server server;
 
   public CustAuthExport(Server server) {
     super(""custAuthData.txt"", 2);
     this.server = server;
-    header = ""Export of custAuth data in the format: playerName=groupId,pwHash"";
+    header = ""Export of custAuth data in the format: playerName=groupId,pwHash\n"" +
+        ""DO NOT MODIFY THIS FILE!"";
   }
 
   @Override
@@ -43,14 +44,17 @@ protected void populate() {
 
   public void addEntry(String playerName, int groupId, byte[] pwHash) {
     setEntry(playerName, String.valueOf(groupId), hashToHex(pwHash));
+    save();
   }
 
   public void updatePw(String playerName, byte[] pwHash) {
     updateEntry(playerName, 1, hashToHex(pwHash));
+    save();
   }
 
   public void updateGroup(String playerName, int groupId) {
     updateEntry(playerName, 0, String.valueOf(groupId));
+    save();
   }
 
   private String hashToHex(byte[] pwHash) {
diff --git a/src/simpleserver/export/Export.java b/src/simpleserver/export/Export.java
deleted file mode 100644
index b44152b0..00000000
--- a/src/simpleserver/export/Export.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2010 SimpleServer authors (see CONTRIBUTORS)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the ""Software""), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package simpleserver.export;
-
-public interface Export {
-  public void save();
-}
diff --git a/src/simpleserver/export/PropertiesExport.java b/src/simpleserver/export/PropertiesExport.java
index 59625ab0..15adf6f3 100644
--- a/src/simpleserver/export/PropertiesExport.java
+++ b/src/simpleserver/export/PropertiesExport.java
@@ -21,13 +21,17 @@
 package simpleserver.export;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 
+import simpleserver.Resource;
 import simpleserver.config.SortedProperties;
 
-abstract class PropertiesExport implements Export {
+abstract class PropertiesExport implements Resource {
   private static final String LOCATION = ""simpleserver"" + File.separator + ""export"";
   protected SortedProperties properties;
 
@@ -52,11 +56,28 @@ protected File getFile() {
       return file;
     }
 
-    new File(LOCATION).mkdir();
     populate();
+    new File(LOCATION).mkdir();
     return file;
   }
 
+  public void load() {
+    try {
+      InputStream stream = new FileInputStream(getFile());
+      try {
+        properties.load(stream);
+      } finally {
+        stream.close();
+      }
+    } catch (FileNotFoundException e) {
+      save();
+    } catch (IOException e) {
+      properties.clear();
+      populate();
+      save();
+    }
+  }
+
   public void save() {
     try {
       OutputStream stream = new FileOutputStream(getFile());
@@ -103,7 +124,7 @@ public static String join(String glue, String[] pieces) {
     }
 
     if (pieces.length > 0) {
-      return value.substring(0, value.length() - 2);
+      return value.substring(0, value.length() - 1);
     } else {
       return """";
     }
diff --git a/src/simpleserver/options/defaults/simpleserver.properties b/src/simpleserver/options/defaults/simpleserver.properties
index 27ba0026..99b620eb 100644
--- a/src/simpleserver/options/defaults/simpleserver.properties
+++ b/src/simpleserver/options/defaults/simpleserver.properties
@@ -6,6 +6,7 @@ c10tMins=60
 custAuth=false
 enableRcon=false
 enableTelnet=false
+enableCustAuthExport=false
 gameMode=0
 internalPort=25566
 ipAddress=0.0.0.0"
df09fcb6a53b70a828698fbad71e681edbcdc7f4,ReactiveX-RxJava,ObserveOn/SubscribeOn unit tests--,p,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-core/src/main/java/rx/concurrency/ForwardingScheduler.java b/rxjava-core/src/main/java/rx/concurrency/ForwardingScheduler.java
new file mode 100644
index 0000000000..2714808766
--- /dev/null
+++ b/rxjava-core/src/main/java/rx/concurrency/ForwardingScheduler.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2013 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.concurrency;
+
+import rx.Scheduler;
+import rx.Subscription;
+import rx.util.functions.Action0;
+import rx.util.functions.Func0;
+
+import java.util.concurrent.TimeUnit;
+
+public class ForwardingScheduler implements Scheduler {
+    private final Scheduler underlying;
+
+    public ForwardingScheduler(Scheduler underlying) {
+        this.underlying = underlying;
+    }
+
+    @Override
+    public Subscription schedule(Action0 action) {
+        return underlying.schedule(action);
+    }
+
+    @Override
+    public Subscription schedule(Func0<Subscription> action) {
+        return underlying.schedule(action);
+    }
+
+    @Override
+    public Subscription schedule(Action0 action, long timespan, TimeUnit unit) {
+        return underlying.schedule(action, timespan, unit);
+    }
+
+    @Override
+    public Subscription schedule(Func0<Subscription> action, long timespan, TimeUnit unit) {
+        return underlying.schedule(action, timespan, unit);
+    }
+
+    @Override
+    public long now() {
+        return underlying.now();
+    }
+}
\ No newline at end of file
diff --git a/rxjava-core/src/main/java/rx/concurrency/ImmediateScheduler.java b/rxjava-core/src/main/java/rx/concurrency/ImmediateScheduler.java
index 59908e4e0c..e54d178ae0 100644
--- a/rxjava-core/src/main/java/rx/concurrency/ImmediateScheduler.java
+++ b/rxjava-core/src/main/java/rx/concurrency/ImmediateScheduler.java
@@ -38,8 +38,9 @@ private ImmediateScheduler() {
 
     @Override
     public Subscription schedule(Func0<Subscription> action) {
-        action.call();
-        return Subscriptions.empty();
+        DiscardableAction discardableAction = new DiscardableAction(action);
+        discardableAction.call();
+        return discardableAction;
     }
 
     public static class UnitTest {
diff --git a/rxjava-core/src/main/java/rx/concurrency/Schedulers.java b/rxjava-core/src/main/java/rx/concurrency/Schedulers.java
index 61b51d070d..9f5ff2065d 100644
--- a/rxjava-core/src/main/java/rx/concurrency/Schedulers.java
+++ b/rxjava-core/src/main/java/rx/concurrency/Schedulers.java
@@ -44,4 +44,8 @@ public static Scheduler executor(Executor executor) {
     public static Scheduler scheduledExecutor(ScheduledExecutorService executor) {
         return new ScheduledExecutorServiceScheduler(executor);
     }
+
+    public static Scheduler forwardingScheduler(Scheduler underlying) {
+        return new ForwardingScheduler(underlying);
+    }
 }
diff --git a/rxjava-core/src/main/java/rx/operators/OperationObserveOn.java b/rxjava-core/src/main/java/rx/operators/OperationObserveOn.java
index 85228f2cff..4e6e14bb85 100644
--- a/rxjava-core/src/main/java/rx/operators/OperationObserveOn.java
+++ b/rxjava-core/src/main/java/rx/operators/OperationObserveOn.java
@@ -15,14 +15,20 @@
  */
 package rx.operators;
 
+import org.junit.Test;
 import rx.Observable;
 import rx.Observer;
 import rx.Scheduler;
 import rx.Subscription;
+import rx.concurrency.Schedulers;
 import rx.util.functions.Action0;
-import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 public class OperationObserveOn {
 
     public static <T> Func1<Observer<T>, Subscription> observeOn(Observable<T> source, Scheduler scheduler) {
@@ -64,23 +70,46 @@ public void call() {
         }
 
         @Override
-        public void onError(Exception e) {
+        public void onError(final Exception e) {
             scheduler.schedule(new Action0() {
                 @Override
                 public void call() {
-                    underlying.onCompleted();
+                    underlying.onError(e);
                 }
             });
         }
 
         @Override
-        public void onNext(T args) {
+        public void onNext(final T args) {
             scheduler.schedule(new Action0() {
                 @Override
                 public void call() {
-                    underlying.onCompleted();
+                    underlying.onNext(args);
                 }
             });
         }
     }
+
+    public static class UnitTest {
+
+        @Test
+        @SuppressWarnings(""unchecked"")
+        public void testObserveOn() {
+
+            Scheduler scheduler = spy(Schedulers.forwardingScheduler(Schedulers.immediate()));
+
+            Observer<Integer> observer = mock(Observer.class);
+            Observable.create(observeOn(Observable.toObservable(1, 2, 3), scheduler)).subscribe(observer);
+
+            verify(scheduler, times(4)).schedule(any(Action0.class));
+            verifyNoMoreInteractions(scheduler);
+
+            verify(observer, times(1)).onNext(1);
+            verify(observer, times(1)).onNext(2);
+            verify(observer, times(1)).onNext(3);
+            verify(observer, times(1)).onCompleted();
+        }
+
+    }
+
 }
diff --git a/rxjava-core/src/main/java/rx/operators/OperationSubscribeOn.java b/rxjava-core/src/main/java/rx/operators/OperationSubscribeOn.java
index b59dd5f37d..104a134657 100644
--- a/rxjava-core/src/main/java/rx/operators/OperationSubscribeOn.java
+++ b/rxjava-core/src/main/java/rx/operators/OperationSubscribeOn.java
@@ -15,14 +15,19 @@
  */
 package rx.operators;
 
+import org.junit.Test;
 import rx.Observable;
 import rx.Observer;
 import rx.Scheduler;
 import rx.Subscription;
+import rx.concurrency.Schedulers;
 import rx.util.functions.Action0;
 import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
 public class OperationSubscribeOn {
 
     public static <T> Func1<Observer<T>, Subscription> subscribeOn(Observable<T> source, Scheduler scheduler) {
@@ -68,4 +73,30 @@ public void call() {
             });
         }
     }
-}
+
+    public static class UnitTest {
+
+        @Test
+        @SuppressWarnings(""unchecked"")
+        public void testSubscribeOn() {
+            Observable<Integer> w = Observable.toObservable(1, 2, 3);
+
+            Scheduler scheduler = spy(Schedulers.forwardingScheduler(Schedulers.immediate()));
+
+            Observer<Integer> observer = mock(Observer.class);
+            Subscription subscription = Observable.create(subscribeOn(w, scheduler)).subscribe(observer);
+
+            verify(scheduler, times(1)).schedule(any(Func0.class));
+            subscription.unsubscribe();
+            verify(scheduler, times(1)).schedule(any(Action0.class));
+            verifyNoMoreInteractions(scheduler);
+
+            verify(observer, times(1)).onNext(1);
+            verify(observer, times(1)).onNext(2);
+            verify(observer, times(1)).onNext(3);
+            verify(observer, times(1)).onCompleted();
+        }
+
+    }
+
+}
\ No newline at end of file"
367a2b8bf66addf6fd731c54b8436ffdd8ed9061,hadoop,HDFS-2465. Add HDFS support for fadvise readahead- and drop-behind. Contributed by Todd Lipcon.--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190625 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hadoop,"diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 08a78a07e6a31..8bd74374ac678 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -772,6 +772,8 @@ Release 0.23.0 - Unreleased
     HDFS-2500. Avoid file system operations in BPOfferService thread while
     processing deletes. (todd)
 
+    HDFS-2465. Add HDFS support for fadvise readahead and drop-behind. (todd)
+
   BUG FIXES
 
     HDFS-2344. Fix the TestOfflineEditsViewer test failure in 0.23 branch.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index 9c53bc08796cd..6c10d0e8473bf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -54,6 +54,15 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   public static final String  DFS_NAMENODE_BACKUP_SERVICE_RPC_ADDRESS_KEY = ""dfs.namenode.backup.dnrpc-address"";
   public static final String  DFS_DATANODE_BALANCE_BANDWIDTHPERSEC_KEY = ""dfs.datanode.balance.bandwidthPerSec"";
   public static final long    DFS_DATANODE_BALANCE_BANDWIDTHPERSEC_DEFAULT = 1024*1024;
+  public static final String  DFS_DATANODE_READAHEAD_BYTES_KEY = ""dfs.datanode.readahead.bytes"";
+  public static final long    DFS_DATANODE_READAHEAD_BYTES_DEFAULT = 0;
+  public static final String  DFS_DATANODE_DROP_CACHE_BEHIND_WRITES_KEY = ""dfs.datanode.drop.cache.behind.writes"";
+  public static final boolean DFS_DATANODE_DROP_CACHE_BEHIND_WRITES_DEFAULT = false;
+  public static final String  DFS_DATANODE_SYNC_BEHIND_WRITES_KEY = ""dfs.datanode.sync.behind.writes"";
+  public static final boolean DFS_DATANODE_SYNC_BEHIND_WRITES_DEFAULT = false;
+  public static final String  DFS_DATANODE_DROP_CACHE_BEHIND_READS_KEY = ""dfs.datanode.drop.cache.behind.reads"";
+  public static final boolean DFS_DATANODE_DROP_CACHE_BEHIND_READS_DEFAULT = false;
+
   public static final String  DFS_NAMENODE_HTTP_ADDRESS_KEY = ""dfs.namenode.http-address"";
   public static final String  DFS_NAMENODE_HTTP_ADDRESS_DEFAULT = ""0.0.0.0:50070"";
   public static final String  DFS_NAMENODE_RPC_ADDRESS_KEY = ""dfs.namenode.rpc-address"";
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
index 50e118aaa0093..b935aafd412fb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
@@ -24,6 +24,7 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.EOFException;
+import java.io.FileDescriptor;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -46,6 +47,7 @@
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
 import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.io.nativeio.NativeIO;
 import org.apache.hadoop.util.Daemon;
 import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.util.PureJavaCrc32;
@@ -57,10 +59,13 @@
 class BlockReceiver implements Closeable {
   public static final Log LOG = DataNode.LOG;
   static final Log ClientTraceLog = DataNode.ClientTraceLog;
+
+  private static final long CACHE_DROP_LAG_BYTES = 8 * 1024 * 1024;
   
   private DataInputStream in = null; // from where data are read
   private DataChecksum checksum; // from where chunks of a block can be read
   private OutputStream out = null; // to block file at local disk
+  private FileDescriptor outFd;
   private OutputStream cout = null; // output stream for cehcksum file
   private DataOutputStream checksumOut = null; // to crc file at local disk
   private int bytesPerChecksum;
@@ -80,6 +85,11 @@ class BlockReceiver implements Closeable {
   private final DataNode datanode;
   volatile private boolean mirrorError;
 
+  // Cache management state
+  private boolean dropCacheBehindWrites;
+  private boolean syncBehindWrites;
+  private long lastCacheDropOffset = 0;
+
   /** The client name.  It is empty if a datanode is the client */
   private final String clientname;
   private final boolean isClient; 
@@ -170,6 +180,8 @@ class BlockReceiver implements Closeable {
       this.checksum = DataChecksum.newDataChecksum(in);
       this.bytesPerChecksum = checksum.getBytesPerChecksum();
       this.checksumSize = checksum.getChecksumSize();
+      this.dropCacheBehindWrites = datanode.shouldDropCacheBehindWrites();
+      this.syncBehindWrites = datanode.shouldSyncBehindWrites();
       
       final boolean isCreate = isDatanode || isTransfer 
           || stage == BlockConstructionStage.PIPELINE_SETUP_CREATE;
@@ -177,6 +189,12 @@ class BlockReceiver implements Closeable {
           this.bytesPerChecksum, this.checksumSize);
       if (streams != null) {
         this.out = streams.dataOut;
+        if (out instanceof FileOutputStream) {
+          this.outFd = ((FileOutputStream)out).getFD();
+        } else {
+          LOG.warn(""Could not get file descriptor for outputstream of class "" +
+              out.getClass());
+        }
         this.cout = streams.checksumOut;
         this.checksumOut = new DataOutputStream(new BufferedOutputStream(
             streams.checksumOut, HdfsConstants.SMALL_BUFFER_SIZE));
@@ -631,6 +649,8 @@ private int receivePacket(long offsetInBlock, long seqno,
           );
           
           datanode.metrics.incrBytesWritten(len);
+
+          dropOsCacheBehindWriter(offsetInBlock);
         }
       } catch (IOException iex) {
         datanode.checkDiskError(iex);
@@ -645,6 +665,28 @@ private int receivePacket(long offsetInBlock, long seqno,
     return lastPacketInBlock?-1:len;
   }
 
+  private void dropOsCacheBehindWriter(long offsetInBlock) throws IOException {
+    try {
+      if (outFd != null &&
+          offsetInBlock > lastCacheDropOffset + CACHE_DROP_LAG_BYTES) {
+        long twoWindowsAgo = lastCacheDropOffset - CACHE_DROP_LAG_BYTES;
+        if (twoWindowsAgo > 0 && dropCacheBehindWrites) {
+          NativeIO.posixFadviseIfPossible(outFd, 0, lastCacheDropOffset,
+              NativeIO.POSIX_FADV_DONTNEED);
+        }
+        
+        if (syncBehindWrites) {
+          NativeIO.syncFileRangeIfPossible(outFd, lastCacheDropOffset, CACHE_DROP_LAG_BYTES,
+              NativeIO.SYNC_FILE_RANGE_WRITE);
+        }
+        
+        lastCacheDropOffset += CACHE_DROP_LAG_BYTES;
+      }
+    } catch (Throwable t) {
+      LOG.warn(""Couldn't drop os cache behind writer for "" + block, t);
+    }
+  }
+
   void writeChecksumHeader(DataOutputStream mirrorOut) throws IOException {
     checksum.writeHeader(mirrorOut);
   }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
index 84b38b37e9a14..ca9765ce3ea0f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
@@ -20,6 +20,7 @@
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,6 +37,9 @@
 import org.apache.hadoop.hdfs.protocol.datatransfer.PacketHeader;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
 import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.io.ReadaheadPool;
+import org.apache.hadoop.io.ReadaheadPool.ReadaheadRequest;
+import org.apache.hadoop.io.nativeio.NativeIO;
 import org.apache.hadoop.net.SocketOutputStream;
 import org.apache.hadoop.util.DataChecksum;
 
@@ -118,7 +122,9 @@ class BlockSender implements java.io.Closeable {
   private DataInputStream checksumIn;
   /** Checksum utility */
   private final DataChecksum checksum;
-  /** Starting position to read */
+  /** Initial position to read */
+  private long initialOffset;
+  /** Current position of read */
   private long offset;
   /** Position of last byte to read from block file */
   private final long endOffset;
@@ -142,6 +148,24 @@ class BlockSender implements java.io.Closeable {
   private final String clientTraceFmt;
   private volatile ChunkChecksum lastChunkChecksum = null;
   
+  /** The file descriptor of the block being sent */
+  private FileDescriptor blockInFd;
+
+  // Cache-management related fields
+  private final long readaheadLength;
+  private boolean shouldDropCacheBehindRead;
+  private ReadaheadRequest curReadahead;
+  private long lastCacheDropOffset;
+  private static final long CACHE_DROP_INTERVAL_BYTES = 1024 * 1024; // 1MB
+  /**
+   * Minimum length of read below which management of the OS
+   * buffer cache is disabled.
+   */
+  private static final long LONG_READ_THRESHOLD_BYTES = 256 * 1024;
+  
+  private static ReadaheadPool readaheadPool =
+    ReadaheadPool.getInstance();
+
   /**
    * Constructor
    * 
@@ -165,6 +189,8 @@ class BlockSender implements java.io.Closeable {
       this.corruptChecksumOk = corruptChecksumOk;
       this.verifyChecksum = verifyChecksum;
       this.clientTraceFmt = clientTraceFmt;
+      this.readaheadLength = datanode.getReadaheadLength();
+      this.shouldDropCacheBehindRead = datanode.shouldDropCacheBehindReads();
       
       synchronized(datanode.data) { 
         this.replica = getReplica(block, datanode);
@@ -277,6 +303,11 @@ class BlockSender implements java.io.Closeable {
         DataNode.LOG.debug(""replica="" + replica);
       }
       blockIn = datanode.data.getBlockInputStream(block, offset); // seek to offset
+      if (blockIn instanceof FileInputStream) {
+        blockInFd = ((FileInputStream)blockIn).getFD();
+      } else {
+        blockInFd = null;
+      }
     } catch (IOException ioe) {
       IOUtils.closeStream(this);
       IOUtils.closeStream(blockIn);
@@ -288,6 +319,20 @@ class BlockSender implements java.io.Closeable {
    * close opened files.
    */
   public void close() throws IOException {
+    if (blockInFd != null && shouldDropCacheBehindRead) {
+      // drop the last few MB of the file from cache
+      try {
+        NativeIO.posixFadviseIfPossible(
+            blockInFd, lastCacheDropOffset, offset - lastCacheDropOffset,
+            NativeIO.POSIX_FADV_DONTNEED);
+      } catch (Exception e) {
+        LOG.warn(""Unable to drop cache on file close"", e);
+      }
+    }
+    if (curReadahead != null) {
+      curReadahead.cancel();
+    }
+    
     IOException ioe = null;
     if(checksumIn!=null) {
       try {
@@ -304,6 +349,7 @@ public void close() throws IOException {
         ioe = e;
       }
       blockIn = null;
+      blockInFd = null;
     }
     // throw IOException if there is any
     if(ioe!= null) {
@@ -538,10 +584,20 @@ long sendBlock(DataOutputStream out, OutputStream baseStream,
     if (out == null) {
       throw new IOException( ""out stream is null"" );
     }
-    final long initialOffset = offset;
+    initialOffset = offset;
     long totalRead = 0;
     OutputStream streamForSendChunks = out;
     
+    lastCacheDropOffset = initialOffset;
+
+    if (isLongRead() && blockInFd != null) {
+      // Advise that this file descriptor will be accessed sequentially.
+      NativeIO.posixFadviseIfPossible(blockInFd, 0, 0, NativeIO.POSIX_FADV_SEQUENTIAL);
+    }
+    
+    // Trigger readahead of beginning of file if configured.
+    manageOsCache();
+
     final long startTime = ClientTraceLog.isInfoEnabled() ? System.nanoTime() : 0;
     try {
       writeChecksumHeader(out);
@@ -569,6 +625,7 @@ long sendBlock(DataOutputStream out, OutputStream baseStream,
       ByteBuffer pktBuf = ByteBuffer.allocate(pktSize);
 
       while (endOffset > offset) {
+        manageOsCache();
         long len = sendPacket(pktBuf, maxChunksPerPacket, streamForSendChunks,
             transferTo, throttler);
         offset += len;
@@ -595,6 +652,45 @@ long sendBlock(DataOutputStream out, OutputStream baseStream,
     }
     return totalRead;
   }
+
+  /**
+   * Manage the OS buffer cache by performing read-ahead
+   * and drop-behind.
+   */
+  private void manageOsCache() throws IOException {
+    if (!isLongRead() || blockInFd == null) {
+      // don't manage cache manually for short-reads, like
+      // HBase random read workloads.
+      return;
+    }
+
+    // Perform readahead if necessary
+    if (readaheadLength > 0 && readaheadPool != null) {
+      curReadahead = readaheadPool.readaheadStream(
+          clientTraceFmt, blockInFd,
+          offset, readaheadLength, Long.MAX_VALUE,
+          curReadahead);
+    }
+
+    // Drop what we've just read from cache, since we aren't
+    // likely to need it again
+    long nextCacheDropOffset = lastCacheDropOffset + CACHE_DROP_INTERVAL_BYTES;
+    if (shouldDropCacheBehindRead &&
+        offset >= nextCacheDropOffset) {
+      long dropLength = offset - lastCacheDropOffset;
+      if (dropLength >= 1024) {
+        NativeIO.posixFadviseIfPossible(blockInFd,
+            lastCacheDropOffset, dropLength,
+            NativeIO.POSIX_FADV_DONTNEED);
+      }
+      lastCacheDropOffset += CACHE_DROP_INTERVAL_BYTES;
+    }
+  }
+
+  private boolean isLongRead() {
+    return (endOffset - offset) > LONG_READ_THRESHOLD_BYTES;
+  }
+
   
   /**
    * Write checksum header to the output stream
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 3f7733608999c..5be82dd59d8cf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -104,6 +104,7 @@
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.HDFSPolicyProvider;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
@@ -410,6 +411,11 @@ void refreshNamenodes(Configuration conf)
   int socketTimeout;
   int socketWriteTimeout = 0;  
   boolean transferToAllowed = true;
+  private boolean dropCacheBehindWrites = false;
+  private boolean syncBehindWrites = false;
+  private boolean dropCacheBehindReads = false;
+  private long readaheadLength = 0;
+
   int writePacketSize = 0;
   boolean isBlockTokenEnabled;
   BlockPoolTokenSecretManager blockPoolTokenSecretManager;
@@ -493,6 +499,20 @@ private void initConfig(Configuration conf) {
         DFS_DATANODE_TRANSFERTO_ALLOWED_DEFAULT);
     this.writePacketSize = conf.getInt(DFS_CLIENT_WRITE_PACKET_SIZE_KEY, 
                                        DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT);
+
+    this.readaheadLength = conf.getLong(
+        DFSConfigKeys.DFS_DATANODE_READAHEAD_BYTES_KEY,
+        DFSConfigKeys.DFS_DATANODE_READAHEAD_BYTES_DEFAULT);
+    this.dropCacheBehindWrites = conf.getBoolean(
+        DFSConfigKeys.DFS_DATANODE_DROP_CACHE_BEHIND_WRITES_KEY,
+        DFSConfigKeys.DFS_DATANODE_DROP_CACHE_BEHIND_WRITES_DEFAULT);
+    this.syncBehindWrites = conf.getBoolean(
+        DFSConfigKeys.DFS_DATANODE_SYNC_BEHIND_WRITES_KEY,
+        DFSConfigKeys.DFS_DATANODE_SYNC_BEHIND_WRITES_DEFAULT);
+    this.dropCacheBehindReads = conf.getBoolean(
+        DFSConfigKeys.DFS_DATANODE_DROP_CACHE_BEHIND_READS_KEY,
+        DFSConfigKeys.DFS_DATANODE_DROP_CACHE_BEHIND_READS_DEFAULT);
+
     this.blockReportInterval = conf.getLong(DFS_BLOCKREPORT_INTERVAL_MSEC_KEY,
         DFS_BLOCKREPORT_INTERVAL_MSEC_DEFAULT);
     this.initialBlockReportDelay = conf.getLong(
@@ -2859,4 +2879,20 @@ public Long getBalancerBandwidth() {
                        (DataXceiverServer) this.dataXceiverServer.getRunnable();
     return dxcs.balanceThrottler.getBandwidth();
   }
+
+  long getReadaheadLength() {
+    return readaheadLength;
+  }
+
+  boolean shouldDropCacheBehindWrites() {
+    return dropCacheBehindWrites;
+  }
+
+  boolean shouldDropCacheBehindReads() {
+    return dropCacheBehindReads;
+  }
+  
+  boolean shouldSyncBehindWrites() {
+    return syncBehindWrites;
+  }
 }"
50ccd7ec86dc105c4c6030cd152423ec7b1483a2,restlet-framework-java,JAX-RS-Extension: - added javadoc to util methods.--,p,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/util/Util.java b/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/util/Util.java
index 1378510e3c..0df57b574c 100644
--- a/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/util/Util.java
+++ b/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/util/Util.java
@@ -41,7 +41,6 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.logging.Logger;
 
 import javax.ws.rs.Path;
@@ -334,19 +333,6 @@ public static <A> Set<A> createSet(A... objects) {
         return set;
     }
 
-    /**
-     * @param <A>
-     * @param collection
-     * @param comparator
-     * @return
-     */
-    public static <A> Collection<A> createTreeSet(Collection<A> collection,
-            Comparator<A> comparator) {
-        Collection<A> coll2 = new TreeSet<A>(comparator);
-        coll2.addAll(collection);
-        return coll2;
-    }
-
     /**
      * Check if the given objects are equal. Can deal with null references. if
      * both elements are null, than the result is true.
@@ -362,7 +348,7 @@ public static boolean equals(Object object1, Object object2) {
     }
 
     /**
-     * Converte the given Date into a String. Copied from
+     * Converts the given Date into a String. Copied from
      * {@link com.noelios.restlet.HttpCall}.
      * 
      * @param date
@@ -380,16 +366,19 @@ public static String formatDate(Date date, boolean cookie) {
     }
 
     /**
+     * Returns the first element of the given collection. Throws an exception if
+     * the collection is empty.
+     * 
      * @param coll
      * @param <A>
      * @return Returns the first Element of the collection
-     * @throws IndexOutOfBoundsException
-     *                 If the list is empty
+     * @throws NoSuchElementException
+     *                 If the collection is empty.
      */
     public static <A> A getFirstElement(Collection<A> coll)
-            throws IndexOutOfBoundsException {
+            throws NoSuchElementException {
         if (coll.isEmpty())
-            throw new IndexOutOfBoundsException(
+            throw new NoSuchElementException(
                     ""The Collection is empty; you can't get the first element of it."");
         if (coll instanceof LinkedList)
             return ((LinkedList<A>) coll).getFirst();
@@ -399,14 +388,17 @@ public static <A> A getFirstElement(Collection<A> coll)
     }
 
     /**
+     * Returns the first element of the given {@link Iterable}. Throws an
+     * exception if the {@link Iterable} is empty.
+     * 
      * @param coll
      * @param <A>
      * @return Returns the first Element of the collection
-     * @throws IndexOutOfBoundsException
-     *                 If the list is empty
+     * @throws NoSuchElementException
+     *                 If the collection is empty
      */
     public static <A> A getFirstElement(Iterable<A> coll)
-            throws IndexOutOfBoundsException {
+            throws NoSuchElementException {
         if (coll instanceof LinkedList)
             return ((LinkedList<A>) coll).getFirst();
         if (coll instanceof List)
@@ -415,6 +407,9 @@ public static <A> A getFirstElement(Iterable<A> coll)
     }
 
     /**
+     * Returns the first element of the {@link List}. Throws an exception if
+     * the list is empty.
+     * 
      * @param list
      * @param <A>
      * @return Returns the first Element of the collection
@@ -432,14 +427,15 @@ public static <A> A getFirstElement(List<A> list)
     }
 
     /**
+     * Returns the first element of the given {@link Iterable}. Returns null,
+     * if the {@link Iterable} is empty.
+     * 
      * @param coll
      * @param <A>
-     * @return Returns the first Element of the collection
-     * @throws IndexOutOfBoundsException
-     *                 If the list is empty
+     * @return the first element of the collection, or null if the iterable is
+     *         empty.
      */
-    public static <A> A getFirstElementOrNull(Iterable<A> coll)
-            throws IndexOutOfBoundsException {
+    public static <A> A getFirstElementOrNull(Iterable<A> coll) {
         if (coll instanceof LinkedList) {
             LinkedList<A> linkedList = ((LinkedList<A>) coll);
             if (linkedList.isEmpty())
@@ -460,12 +456,13 @@ public static <A> A getFirstElementOrNull(Iterable<A> coll)
     }
 
     /**
+     * Returns the first entry of the given {@link Map}. Throws an exception if
+     * the Map is empty.
+     * 
      * @param map
      * @param <K>
      * @param <V>
-     * @return Returns the first element, returned by the iterator over the
-     *         map.entrySet()
-     * 
+     * @return the first entry of the given {@link Map}.
      * @throws NoSuchElementException
      *                 If the map is empty.
      */
@@ -475,12 +472,13 @@ public static <K, V> Map.Entry<K, V> getFirstEntry(Map<K, V> map)
     }
 
     /**
-     * @return Returns the first element, returned by the iterator over the
-     *         map.keySet()
+     * Returns the key of the first entry of the given {@link Map}. Throws an
+     * exception if the Map is empty.
      * 
      * @param map
      * @param <K>
      * @param <V>
+     * @return the key of the first entry of the given {@link Map}.
      * @throws NoSuchElementException
      *                 If the map is empty.
      */
@@ -490,11 +488,13 @@ public static <K, V> K getFirstKey(Map<K, V> map)
     }
 
     /**
-     * @return Returns the first element, returned by the iterator over the
-     *         map.values()
+     * Returns the value of the first entry of the given {@link Map}. Throws an
+     * exception if the Map is empty.
+     * 
      * @param map
      * @param <K>
      * @param <V>
+     * @return the value of the first entry of the given {@link Map}.
      * @throws NoSuchElementException
      *                 If the map is empty.
      */
@@ -504,8 +504,10 @@ public static <K, V> V getFirstValue(Map<K, V> map)
     }
 
     /**
+     * Returns the HTTP headers of the Restlet {@link Request} as {@link Form}.
+     * 
      * @param request
-     * @return Returns the HTTP-Headers-Form from the Request.
+     * @return Returns the HTTP headers of the Request.
      */
     public static Form getHttpHeaders(Request request) {
         Form headers = (Form) request.getAttributes().get(
@@ -518,9 +520,10 @@ public static Form getHttpHeaders(Request request) {
     }
 
     /**
+     * Returns the HTTP headers of the Restlet {@link Response} as {@link Form}.
+     * 
      * @param response
-     *                a Restlet response
-     * @return Returns the HTTP-Headers-Form from the Response.
+     * @return Returns the HTTP headers of the Response.
      */
     public static Form getHttpHeaders(Response response) {
         Form headers = (Form) response.getAttributes().get(
@@ -553,9 +556,12 @@ public static MultivaluedMap<String, String> getJaxRsHttpHeaders(
     }
 
     /**
+     * Returns the last element of the given {@link Iterable}. Throws an
+     * exception if the given iterable is empty.
+     * 
      * @param iterable
      * @param <A>
-     * @return Returns the last Element of the {@link Iterable}
+     * @return Returns the last element of the {@link Iterable}
      * @throws IndexOutOfBoundsException
      *                 If the {@link Iterable} is a {@link List} and its is
      *                 empty.
@@ -575,9 +581,12 @@ public static <A> A getLastElement(Iterable<A> iterable)
     }
 
     /**
+     * Returns the last element of the given {@link Iterator}. Throws an
+     * exception if the given iterator is empty.
+     * 
      * @param iter
      * @param <A>
-     * @return Returns the last Element of the {@link Iterator}.
+     * @return Returns the last element of the {@link Iterator}.
      * @throws NoSuchElementException
      *                 If the {@link Iterator} is empty.
      */
@@ -590,9 +599,12 @@ public static <A> A getLastElement(Iterator<A> iter)
     }
 
     /**
+     * Returns the last element of the given {@link List}. Throws an exception
+     * if the given list is empty.
+     * 
      * @param list
      * @param <A>
-     * @return Returns the last Element of the list
+     * @return Returns the last element of the list
      * @throws IndexOutOfBoundsException
      *                 If the list is empty
      */
@@ -604,7 +616,8 @@ public static <A> A getLastElement(List<A> list)
     }
 
     /**
-     * Returns the last element of the given Iterable, or null, if it is empty.
+     * Returns the last element of the given {@link Iterable}, or null, if the
+     * iterable is empty. Returns null, if the iterable is empty.
      * 
      * @param iterable
      * @param <A>
@@ -632,11 +645,12 @@ public static <A> A getLastElementOrNull(Iterable<A> iterable) {
     }
 
     /**
+     * Returns the last element of the given {@link Iterator}, or null, if the
+     * iterator is empty. Returns null, if the iterator is empty.
+     * 
      * @param iter
      * @param <A>
      * @return Returns the last Element of the {@link Iterator}.
-     * @throws NoSuchElementException
-     *                 If the {@link Iterator} is empty.
      */
     public static <A> A getLastElementOrNull(Iterator<A> iter) {
         A e = null;
@@ -716,9 +730,13 @@ public static String getOnlyMetadataName(List<? extends Metadata> metadatas) {
     }
 
     /**
+     * Returns the &#64;{@link Path} annotation of the given root resource
+     * class.
+     * 
      * @param jaxRsClass
-     * @return the path annotation or null, if no is present and requirePath is
-     *         false.
+     *                the root resource class.
+     * @return the &#64;{@link Path} annotation of the given root resource
+     *         class.
      * @throws MissingAnnotationException
      *                 if the path annotation is missing
      * @throws IllegalArgumentException
@@ -737,9 +755,12 @@ public static Path getPathAnnotation(Class<?> jaxRsClass)
     }
 
     /**
+     * Returns the &#64;{@link Path} annotation of the given sub resource
+     * locator. Throws an exception if no &#64;{@link Path} annotation is
+     * available.
+     * 
      * @param method
      *                the java method to get the &#64;Path from
-     * @param pathRequired
      * @return the &#64;Path annotation.
      * @throws IllegalArgumentException
      *                 if null was given.
@@ -759,6 +780,9 @@ public static Path getPathAnnotation(Method method)
     }
 
     /**
+     * Returns the &#64;{@link Path} annotation of the given sub resource
+     * locator. Returns null if no &#64;{@link Path} annotation is available.
+     * 
      * @param method
      *                the java method to get the &#64;Path from
      * @return the &#64;Path annotation or null, if not present.
@@ -774,6 +798,8 @@ public static Path getPathAnnotationOrNull(Method method)
     }
 
     /**
+     * Returns the perhaps decoded template of the path annotation.
+     * 
      * @param resource
      * @return Returns the path template as String. Never returns null.
      * @throws IllegalPathOnClassException
@@ -932,7 +958,7 @@ public Object run() throws Exception {
     }
 
     /**
-     * Checks, if the list is empty.
+     * Checks, if the list is empty or null.
      * 
      * @param list
      * @return true, if the list is empty or null, or false, if the list
@@ -944,7 +970,7 @@ public static boolean isEmpty(List<?> list) {
     }
 
     /**
-     * Tests, if the given array is empty. Will not throw a
+     * Tests, if the given array is empty or null. Will not throw a
      * NullPointerException.
      * 
      * @param array
@@ -959,11 +985,12 @@ public static boolean isEmpty(Object[] array) {
     }
 
     /**
-     * Tests, if the given String is empty or ""/"". Will not throw a
+     * Tests, if the given String is null, empty or ""/"". Will not throw a
      * NullPointerException.
      * 
      * @param string
-     * @return Returns true, if the given string ist null, empty or equals ""/""
+     * @return Returns true, if the given string ist null, empty or equals ""/"",
+     *         otherwise false.
      */
     public static boolean isEmptyOrSlash(String string) {
         return string == null || string.length() == 0 || string.equals(""/"");
diff --git a/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/IntoRrcInjector.java b/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/IntoRrcInjector.java
index 7020117cc8..6fb83146e9 100644
--- a/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/IntoRrcInjector.java
+++ b/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/IntoRrcInjector.java
@@ -179,12 +179,11 @@ protected void inject(ResourceObject resourceObject,
         }
         for (Field ppf : this.injectFieldsPathParam) {
             PathParam headerParam = ppf.getAnnotation(PathParam.class);
-            DefaultValue defaultValue = ppf.getAnnotation(DefaultValue.class);
+            // REQUEST forbid @DefaultValue on @PathParam
             Class<?> convTo = ppf.getType();
             Type paramGenericType = ppf.getGenericType();
             Object value = WrapperUtil.getPathParamValue(convTo,
-                    paramGenericType, headerParam, leaveEncoded, defaultValue,
-                    callContext);
+                    paramGenericType, headerParam, leaveEncoded, callContext);
             Util.inject(jaxRsResObj, ppf, value);
         }
         for (Field cpf : this.injectFieldsQueryParam) {
diff --git a/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/WrapperUtil.java b/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/WrapperUtil.java
index c362ef193e..7b0e25733b 100644
--- a/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/WrapperUtil.java
+++ b/modules/org.restlet.ext.jaxrs_1.0/src/org/restlet/ext/jaxrs/internal/wrappers/WrapperUtil.java
@@ -134,6 +134,8 @@ public void remove() {
     private static final Collection<Class<? extends Annotation>> VALID_ANNOTATIONS = createValidAnnotations();
 
     /**
+     * Checks, if the given annotation is annotated with at least one JAX-RS
+     * related annotation.
      * 
      * @param javaMethod
      *                Java method, class or something like that.
@@ -143,7 +145,7 @@ public void remove() {
     static boolean checkForJaxRsAnnotations(Method javaMethod) {
         for (Annotation annotation : javaMethod.getAnnotations()) {
             Class<? extends Annotation> annoType = annotation.annotationType();
-            if (annoType.getName().startsWith(WrapperUtil.JAX_RS_PACKAGE_PREFIX))
+            if (annoType.getName().startsWith(JAX_RS_PACKAGE_PREFIX))
                 return true;
             if (annoType.isAnnotationPresent(HttpMethod.class))
                 return true;
@@ -217,7 +219,7 @@ private static boolean checkParameterAnnotation(
     }
 
     /**
-     * converts the given value without any decoding.
+     * Converts the given value without any decoding.
      * 
      * @param paramClass
      * @param paramValue
@@ -419,8 +421,12 @@ static List<MediaType> convertToMediaTypes(String[] mimes) {
     }
 
     /**
+     * Creates the collection for the given
+     * {@link ParameterizedType parametrized Type}.<br>
+     * If the given type do not represent an collection, null is returned.
+     * 
      * @param type
-     * @return
+     * @return the created collection or null.
      */
     private static <A> Collection<A> createColl(ParameterizedType type) {
         Type rawType = type.getRawType();
@@ -432,28 +438,37 @@ else if (rawType.equals(SortedSet.class))
             return new TreeSet<A>();
         else if (rawType.equals(Collection.class)) {
             Logger logger = Logger.getAnonymousLogger();
-            logger.config(WrapperUtil.COLL_PARAM_NOT_DEFAULT);
+            logger.config(COLL_PARAM_NOT_DEFAULT);
             return new ArrayList<A>();
         }
         return null;
     }
 
     /**
+     * Creates a concrete instance of the given {@link Representation} subtype.
+     * It must contain a constructor with one parameter of type
+     * {@link Representation}.
+     * 
+     * @param representationType
+     *                the class to instantiate
      * @param entity
+     *                the Representation to use for the constructor.
+     * @param logger
+     *                the logger to use
      * @return the created representation, or null, if it could not be
      *         converted.
-     * @throws ConvertParameterException
+     * @throws ConvertRepresentationException
      */
     private static Object createConcreteRepresentationInstance(
-            Class<?> paramType, Representation entity, Logger logger)
+            Class<?> representationType, Representation entity, Logger logger)
             throws ConvertRepresentationException {
-        if (paramType.equals(Representation.class))
+        if (representationType.equals(Representation.class))
             return entity;
         Constructor<?> constr;
         try {
-            constr = paramType.getConstructor(Representation.class);
+            constr = representationType.getConstructor(Representation.class);
         } catch (SecurityException e) {
-            logger.warning(""The constructor "" + paramType
+            logger.warning(""The constructor "" + representationType
                     + ""(Representation) is not accessable."");
             return null;
         } catch (NoSuchMethodException e) {
@@ -462,7 +477,7 @@ private static Object createConcreteRepresentationInstance(
         try {
             return constr.newInstance(entity);
         } catch (Exception e) {
-            throw ConvertRepresentationException.object(paramType,
+            throw ConvertRepresentationException.object(representationType,
                     ""the message body"", e);
         }
     }
@@ -518,17 +533,14 @@ static Object createInstance(Constructor<?> constructor,
         try {
             return constructor.newInstance(args);
         } catch (IllegalArgumentException e) {
-            throw new InstantiateException(
-                    ""Could not instantiate "" + constructor.getDeclaringClass(),
-                    e);
+            throw new InstantiateException(""Could not instantiate ""
+                    + constructor.getDeclaringClass(), e);
         } catch (InstantiationException e) {
-            throw new InstantiateException(
-                    ""Could not instantiate "" + constructor.getDeclaringClass(),
-                    e);
+            throw new InstantiateException(""Could not instantiate ""
+                    + constructor.getDeclaringClass(), e);
         } catch (IllegalAccessException e) {
-            throw new InstantiateException(
-                    ""Could not instantiate "" + constructor.getDeclaringClass(),
-                    e);
+            throw new InstantiateException(""Could not instantiate ""
+                    + constructor.getDeclaringClass(), e);
         }
     }
 
@@ -540,11 +552,12 @@ static Collection<Class<? extends Annotation>> createValidAnnotations() {
     }
 
     /**
+     * Finds the constructor to use by the JAX-RS runtime.
+     * 
      * @param jaxRsClass
      * @return Returns the constructor to use for the given root resource class
-     *         (See JSR-311-Spec, section 2.3). If no constructor could be
-     *         found, null is returned. Than try {@link Class#newInstance()}
-     * @throws IllegalTypeException
+     *         or provider. If no constructor could be found, null is returned.
+     *         Than try {@link Class#newInstance()}
      */
     static Constructor<?> findJaxRsConstructor(Class<?> jaxRsClass) {
         Constructor<?> constructor = null;
@@ -608,6 +621,8 @@ static javax.ws.rs.ext.ContextResolver<?> getContextResolver(Field field,
     }
 
     /**
+     * Creates the value of a cookie as the given type.
+     * 
      * @param paramClass
      *                the class to convert to
      * @param paramGenericType
@@ -674,10 +689,10 @@ static Object getCookieParamValue(Class<?> paramClass,
             return convertParamValuesFromParam(paramClass, paramGenericType,
                     new ParamValueIter((Series) cookies.subList(cookieName)),
                     getValue(cookies.getFirst(cookieName)), defaultValue, true);
+            // leaveEncoded = true -> not change
         } catch (ConvertParameterException e) {
             throw new ConvertCookieParamException(e);
         }
-        // leaveEncoded = true -> not change
     }
 
     /**
@@ -707,6 +722,12 @@ static Object getHeaderParamValue(Class<?> paramClass,
         }
     }
 
+    /**
+     * Returns the HTTP method related to the given java method.
+     * 
+     * @param javaMethod
+     * @return
+     */
     static org.restlet.data.Method getHttpMethod(Method javaMethod) {
         for (Annotation annotation : javaMethod.getAnnotations()) {
             Class<? extends Annotation> annoType = annotation.annotationType();
@@ -812,8 +833,7 @@ else if (paramClass.equals(Conditions.class))
             }
             if (annoType.equals(PathParam.class)) {
                 return getPathParamValue(paramClass, paramGenericType,
-                        (PathParam) annotation, leaveEncoded, defaultValue,
-                        callContext);
+                        (PathParam) annotation, leaveEncoded, callContext);
             }
             if (annoType.equals(MatrixParam.class)) {
                 return getMatrixParamValue(paramClass, paramGenericType,
@@ -992,15 +1012,13 @@ private static Object getParamValueForPrimitive(Class<?> paramClass,
      *                the generic type to convert to
      * @param pathParam
      * @param leaveEncoded
-     * @param defaultValue
      * @param callContext
      * @param logger
      * @return
      * @throws ConvertPathParamException
      */
     static Object getPathParamValue(Class<?> paramClass, Type paramGenericType,
-            PathParam pathParam, boolean leaveEncoded,
-            DefaultValue defaultValue, CallContext callContext)
+            PathParam pathParam, boolean leaveEncoded, CallContext callContext)
             throws ConvertPathParamException {
         // LATER testen Path-Param: List<String> (see PathParamTest.testGet3())
         // TODO @PathParam(""x"") PathSegment allowed.
@@ -1008,10 +1026,13 @@ static Object getPathParamValue(Class<?> paramClass, Type paramGenericType,
         String pathParamValue = callContext.getLastPathParamEnc(pathParam);
         Iterator<String> pathParamValueIter = callContext
                 .pathParamEncIter(pathParam);
+        // REQUEST What should happens, if no PathParam could be found?
+        // Internal Server Error? It could be that someone request a qPathParam
+        // value of a prior @Path, but this is not good IMO.
+        // perhaps add another attribute to @PathParam, which allows it.
         try {
             return convertParamValuesFromParam(paramClass, paramGenericType,
-                    pathParamValueIter, pathParamValue, defaultValue,
-                    leaveEncoded);
+                    pathParamValueIter, pathParamValue, null, leaveEncoded);
         } catch (ConvertParameterException e) {
             throw new ConvertPathParamException(e);
         }"
c1cb5145202335076ae00ea1630f92ea0e0efcee,Delta Spike,"remove useless TODOs
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
index 2aa4ceb50..d661fe63f 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
@@ -163,17 +163,17 @@ public Enumeration getServlets()
 
     public void log(String msg)
     {
-        // TODO
+        // nothing to do
     }
 
     public void log(Exception exception, String msg)
     {
-        // TODO
+        // nothing to do
     }
 
     public void log(String message, Throwable throwable)
     {
-        // TODO
+        // nothing to do
     }
 
     public void removeAttribute(String name)"
e8979daeaaae5cc34788ca5b04bf32826af491ae,intellij-community,code-dups cleanup--,p,https://github.com/JetBrains/intellij-community,"diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java
index 750bae6c34237..fa5f8fd95740a 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java
@@ -60,14 +60,14 @@ public void injectAll(Disposable parent) {
     injectVariousStuffEverywhere(parent, myPsiManager);
 
     Project project = myPsiManager.getProject();
-    Language ql = findLanguageByID(""JPAQL"");
-    Language js = findLanguageByID(""JavaScript"");
+    Language ql = Language.findLanguageByID(""JPAQL"");
+    Language js = Language.findLanguageByID(""JavaScript"");
     registerForStringVarInitializer(parent, project, ql, ""ql"", null, null);
     registerForStringVarInitializer(parent, project, ql, ""qlPrefixed"", ""xxx"", null);
     registerForStringVarInitializer(parent, project, js, ""js"", null, null);
     registerForStringVarInitializer(parent, project, js, ""jsSeparated"", "" + "", "" + 'separator'"");
     registerForStringVarInitializer(parent, project, js, ""jsBrokenPrefix"", ""xx "", """");
-    registerForParameterValue(parent, project, findLanguageByID(""Groovy""), ""groovy"");
+    registerForParameterValue(parent, project, Language.findLanguageByID(""Groovy""), ""groovy"");
   }
 
   private static void registerForParameterValue(Disposable parent, final Project project, final Language language, final String paramName) {
@@ -149,19 +149,11 @@ public void dispose() {
     });
   }
 
-  private static Language findLanguageByID(@NonNls String id) {
-    for (Language language : Language.getRegisteredLanguages()) {
-      if (language == Language.ANY) continue;
-      if (language.getID().equals(id)) return language;
-    }
-    return null;
-  }
-
   private static void injectVariousStuffEverywhere(Disposable parent, final PsiManager psiManager) {
-    final Language ql = findLanguageByID(""JPAQL"");
-    final Language js = findLanguageByID(""JavaScript"");
+    final Language ql = Language.findLanguageByID(""JPAQL"");
+    final Language js = Language.findLanguageByID(""JavaScript"");
     if (ql == null || js == null) return;
-    final Language ecma4 = findLanguageByID(""ECMA Script Level 4"");
+    final Language ecma4 = Language.findLanguageByID(""ECMA Script Level 4"");
 
     final MultiHostInjector myMultiHostInjector = new MultiHostInjector() {
       public void getLanguagesToInject(@NotNull MultiHostRegistrar registrar, @NotNull PsiElement context) {
@@ -265,7 +257,7 @@ public void getLanguagesToInject(@NotNull PsiLanguageInjectionHost host, @NotNul
               paramList += parameter.getName();
             }
             @NonNls String header = ""function "" + method.getName() + ""(""+paramList+"") {"";
-            Language gwt = findLanguageByID(""GWT JavaScript"");
+            Language gwt = Language.findLanguageByID(""GWT JavaScript"");
             placesToInject.addPlace(gwt, textRange, header, ""}"");
             return;
           }
@@ -295,7 +287,7 @@ public void getLanguagesToInject(@NotNull PsiLanguageInjectionHost host, @NotNul
             PsiClass aClass = PsiTreeUtil.getParentOfType(variable, PsiClass.class);
             aClass = aClass.findInnerClassByName(""Language"", false);
             String text = aClass.getInitializers()[0].getBody().getFirstBodyElement().getNextSibling().getText().substring(2);
-            Language language = findLanguageByID(text);
+            Language language = Language.findLanguageByID(text);
 
             if (language != null) {
               placesToInject.addPlace(language, textRangeToInject(host), """", """");"
ff5b19bb8413cd0689d33e23b295a81c90dd38c3,orientdb,Drop database implemented and tested against- local and remote db--,a,https://github.com/orientechnologies/orientdb,"diff --git a/commons/src/main/java/com/orientechnologies/common/console/OConsoleApplication.java b/commons/src/main/java/com/orientechnologies/common/console/OConsoleApplication.java
index 0d9af09e443..c400af61a8b 100644
--- a/commons/src/main/java/com/orientechnologies/common/console/OConsoleApplication.java
+++ b/commons/src/main/java/com/orientechnologies/common/console/OConsoleApplication.java
@@ -154,7 +154,7 @@ protected boolean execute(String iCommand) {
 			methodName = m.getName();
 			ann = m.getAnnotation(ConsoleCommand.class);
 
-			StringBuilder commandName = new StringBuilder();
+			final StringBuilder commandName = new StringBuilder();
 			char ch;
 			int commandWordCount = 1;
 			for (int i = 0; i < methodName.length(); ++i) {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLDropClass.java b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLDropClass.java
index 6084ef01f3c..bf158216366 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLDropClass.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLDropClass.java
@@ -57,13 +57,13 @@ public OCommandExecutorSQLDropClass parse(final OCommandRequestText iRequest) {
 
 		className = word.toString();
 		if (className == null)
-			throw new OCommandSQLParsingException(""Class not found"", text, pos);
+			throw new OCommandSQLParsingException(""Class is null"", text, pos);
 
 		return this;
 	}
 
 	/**
-	 * Execute the CREATE PROPERTY.
+	 * Execute the DROP CLASS.
 	 */
 	public Object execute(final Map<Object, Object> iArgs) {
 		if (className == null)
diff --git a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
index 90a99a76a02..05750221f90 100644
--- a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
+++ b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
@@ -418,28 +418,67 @@ public void createIndex(@ConsoleParameter(name = ""command-text"", description = ""
 		out.println(""\nIndex created succesfully"");
 	}
 
+	@ConsoleCommand(description = ""Delete the current database"")
+	public void dropDatabase() throws IOException {
+		checkCurrentDatabase();
+
+		final String dbName = currentDatabase.getName();
+
+		if (currentDatabase.getURL().startsWith(OEngineRemote.NAME)) {
+			// REMOTE CONNECTION
+			final String dbURL = currentDatabase.getURL().substring(OEngineRemote.NAME.length() + 1);
+			new OServerAdmin(dbURL).connect(currentDatabaseUserName, currentDatabaseUserPassword).deleteDatabase();
+		} else {
+			// LOCAL CONNECTION
+			currentDatabase.delete();
+			currentDatabase = null;
+		}
+
+		out.println(""\nDatabase '"" + dbName + ""' deleted succesfully"");
+	}
+
+	@ConsoleCommand(description = ""Delete the specified database"")
+	public void dropDatabase(
+			@ConsoleParameter(name = ""database-url"", description = ""The url of the database to create in the format '<mode>:<path>'"") String iDatabaseURL,
+			@ConsoleParameter(name = ""user"", description = ""Server administrator name"") String iUserName,
+			@ConsoleParameter(name = ""password"", description = ""Server administrator password"") String iUserPassword) throws IOException {
+
+		if (iDatabaseURL.startsWith(OEngineRemote.NAME)) {
+			// REMOTE CONNECTION
+			final String dbURL = iDatabaseURL.substring(OEngineRemote.NAME.length() + 1);
+			new OServerAdmin(dbURL).connect(iUserName, iUserPassword).deleteDatabase();
+		} else {
+			// LOCAL CONNECTION
+			currentDatabase = new ODatabaseDocumentTx(iDatabaseURL);
+			currentDatabase.delete();
+			currentDatabase = null;
+		}
+
+		out.println(""\nDatabase '"" + iDatabaseURL + ""' deleted succesfully"");
+	}
+
 	@ConsoleCommand(splitInWords = false, description = ""Remove an index"")
-	public void removeIndex(@ConsoleParameter(name = ""command-text"", description = ""The command text to execute"") String iCommandText)
+	public void dropIndex(@ConsoleParameter(name = ""command-text"", description = ""The command text to execute"") String iCommandText)
 			throws IOException {
 		out.println(""\nRemoving index..."");
 
-		sqlCommand(""remove"", iCommandText, ""\nRemoved index %d link(s) in %f sec(s).\n"");
+		sqlCommand(""drop"", iCommandText, ""\nRemoved index %d link(s) in %f sec(s).\n"");
 
 		out.println(""\nIndex removed succesfully"");
 	}
 
 	@ConsoleCommand(splitInWords = false, description = ""Remove a class from the schema"")
-	public void removeClass(@ConsoleParameter(name = ""command-text"", description = ""The command text to execute"") String iCommandText)
+	public void dropClass(@ConsoleParameter(name = ""command-text"", description = ""The command text to execute"") String iCommandText)
 			throws IOException {
-		sqlCommand(""remove"", iCommandText, ""\nRemoved class in %f sec(s).\n"");
+		sqlCommand(""drop"", iCommandText, ""\nRemoved class in %f sec(s).\n"");
 		currentDatabase.getMetadata().getSchema().reload();
 		out.println(""\nClass removed succesfully"");
 	}
 
 	@ConsoleCommand(splitInWords = false, description = ""Remove a property from a class"")
-	public void removeProperty(
-			@ConsoleParameter(name = ""command-text"", description = ""The command text to execute"") String iCommandText) throws IOException {
-		sqlCommand(""remove"", iCommandText, ""\nRemoved class property in %f sec(s).\n"");
+	public void dropProperty(@ConsoleParameter(name = ""command-text"", description = ""The command text to execute"") String iCommandText)
+			throws IOException {
+		sqlCommand(""drop"", iCommandText, ""\nRemoved class property in %f sec(s).\n"");
 
 		out.println(""\nClass property removed succesfully"");
 	}"
fcfdfbbc6516d92624f5af9dc5556f6143df757f,orientdb,implementing math operations--,a,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/grammar/OrientSQL.jjt b/core/src/main/grammar/OrientSQL.jjt
index cdf20c5d084..d632af335d3 100644
--- a/core/src/main/grammar/OrientSQL.jjt
+++ b/core/src/main/grammar/OrientSQL.jjt
@@ -561,8 +561,8 @@ void ProjectionItem():
 			LOOKAHEAD( InputParameter() )
 			InputParameter()
 			|
-			LOOKAHEAD( OperationChain() )
-			OperationChain()
+			LOOKAHEAD( Expression() )
+			Expression()
 		)
 		[<AS> Alias() ]
 	)
@@ -613,8 +613,8 @@ void FilterItem():
 	LOOKAHEAD( InputParameter() )
     InputParameter()
     |
-    LOOKAHEAD( OperationChain() )
-	OperationChain()
+    LOOKAHEAD( Expression() )
+	Expression()
 }
 
 void ArraySelector():
@@ -634,8 +634,8 @@ void ArraySelector():
 	LOOKAHEAD( InputParameter() )
     InputParameter()
     |
-    LOOKAHEAD( OperationChain() )
-	OperationChain()
+    LOOKAHEAD( Expression() )
+	Expression()
 }
 
 void ArraySingleValuesSelector():
@@ -654,8 +654,8 @@ void ArrayRangeSelector():
         LOOKAHEAD( InputParameter() )
         InputParameter()
         |
-        LOOKAHEAD( OperationChain() )
-	    OperationChain()
+        LOOKAHEAD( Expression() )
+	    Expression()
     )
     <MINUS>
     (
@@ -665,8 +665,8 @@ void ArrayRangeSelector():
         LOOKAHEAD( InputParameter() )
         InputParameter()
         |
-        LOOKAHEAD( OperationChain() )
-	    OperationChain()
+        LOOKAHEAD( Expression() )
+	    Expression()
     )
 }
 
@@ -766,15 +766,86 @@ void Modifier():
    	    LOOKAHEAD(3)
         <DOT> SuffixIdentifier()
     )
-    [ Modifier() ]
+    [
+        LOOKAHEAD( Modifier() )
+        Modifier()
+    ]
 }
 
-void OperationChain():
+void Expression():
 {}
 {
-	BaseIdentifier() [ Modifier() ]
+    LOOKAHEAD( AddExpression() )
+	AddExpression()
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+void AddExpression():
+{}
+{
+	MultExpression() ( ( <PLUS> | <MINUS> ) MultExpression() )*
+}
+
+void MultExpression():
+{}
+{
+    FirstLevelExpression() ( ( <STAR> | <SLASH> ) FirstLevelExpression() )*
+}
+
+void FirstLevelExpression():
+{}
+{
+    LOOKAHEAD( ParenthesisExpression() )
+    ParenthesisExpression()
+    |
+    LOOKAHEAD( BaseExpression() )
+    BaseExpression()
+}
+
+void ParenthesisExpression():
+{}
+{
+	<LPAREN> AddExpression() <RPAREN>
+}
+
+void BaseExpression():
+{}
+{
+	BaseIdentifier() [ LOOKAHEAD( Modifier() ) Modifier() ]
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 void FromClause():
 {}
@@ -846,7 +917,7 @@ void AndBlock():
 void NotBlock():
 {}
 {
-	[ <NOT> ] ( ConditionBlock() | ParenthesisBlock() )
+	[ LOOKAHEAD(2) <NOT> ] (  LOOKAHEAD(ConditionBlock())  ConditionBlock() | LOOKAHEAD(ParenthesisBlock()) ParenthesisBlock() )
 }
 
 void ParenthesisBlock():
@@ -991,8 +1062,10 @@ void ContainsValueCondition():
 {
     FilterItem() ContainsValueOperator()
     (
+        LOOKAHEAD( 3 )
         <LPAREN> OrBlock() <RPAREN>
         |
+        LOOKAHEAD( FilterItem() )
         FilterItem()
     )
 }
@@ -1050,8 +1123,10 @@ void ContainsCondition():
 	FilterItem() <CONTAINS>
 
 	(
+	    LOOKAHEAD( 3 )
 	    <LPAREN> OrBlock() <RPAREN>
 	    |
+	    LOOKAHEAD( FilterItem() )
 	    FilterItem()
 	)
 
@@ -1096,7 +1171,7 @@ void ContainsAllCondition():
 void ContainsTextCondition():
 {}
 {
-	FilterItem() <CONTAINSTEXT> ( <STRING_LITERAL> | OperationChain() )
+	FilterItem() <CONTAINSTEXT> ( <STRING_LITERAL> | Expression() )
 }
 
 void MatchesCondition():
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAddExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAddExpression.java
new file mode 100644
index 00000000000..925e389beb2
--- /dev/null
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAddExpression.java
@@ -0,0 +1,21 @@
+/* Generated By:JJTree: Do not edit this line. OAddExpression.java Version 4.3 */
+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package com.orientechnologies.orient.core.sql.parser;
+
+public
+class OAddExpression extends SimpleNode {
+  public OAddExpression(int id) {
+    super(id);
+  }
+
+  public OAddExpression(OrientSql p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
+/* JavaCC - OriginalChecksum=f5b6dfc729cb26c6b861dea74bd1f741 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OOperationChain.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseExpression.java
similarity index 64%
rename from core/src/main/java/com/orientechnologies/orient/core/sql/parser/OOperationChain.java
rename to core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseExpression.java
index eb341a29798..797fc81206a 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OOperationChain.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseExpression.java
@@ -1,14 +1,14 @@
-/* Generated By:JJTree: Do not edit this line. OOperationChain.java Version 4.3 */
+/* Generated By:JJTree: Do not edit this line. OBaseExpression.java Version 4.3 */
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package com.orientechnologies.orient.core.sql.parser;
 
 public
-class OOperationChain extends SimpleNode {
-  public OOperationChain(int id) {
+class OBaseExpression extends SimpleNode {
+  public OBaseExpression(int id) {
     super(id);
   }
 
-  public OOperationChain(OrientSql p, int id) {
+  public OBaseExpression(OrientSql p, int id) {
     super(p, id);
   }
 
@@ -18,4 +18,4 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 }
-/* JavaCC - OriginalChecksum=4ebb6dfc48342982e67746cf94a81adc (do not edit this line) */
+/* JavaCC - OriginalChecksum=71b3e2d1b65c923dc7cfe11f9f449d2b (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OExpression.java
new file mode 100644
index 00000000000..587d334aa70
--- /dev/null
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OExpression.java
@@ -0,0 +1,21 @@
+/* Generated By:JJTree: Do not edit this line. OExpression.java Version 4.3 */
+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package com.orientechnologies.orient.core.sql.parser;
+
+public
+class OExpression extends SimpleNode {
+  public OExpression(int id) {
+    super(id);
+  }
+
+  public OExpression(OrientSql p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
+/* JavaCC - OriginalChecksum=9c860224b121acdc89522ae97010be01 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OFirstLevelExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OFirstLevelExpression.java
new file mode 100644
index 00000000000..a12867691aa
--- /dev/null
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OFirstLevelExpression.java
@@ -0,0 +1,21 @@
+/* Generated By:JJTree: Do not edit this line. OFirstLevelExpression.java Version 4.3 */
+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package com.orientechnologies.orient.core.sql.parser;
+
+public
+class OFirstLevelExpression extends SimpleNode {
+  public OFirstLevelExpression(int id) {
+    super(id);
+  }
+
+  public OFirstLevelExpression(OrientSql p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
+/* JavaCC - OriginalChecksum=30dc1016b686d4841bbd57d6e6c0bfbd (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMultExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMultExpression.java
new file mode 100644
index 00000000000..06f82f63be9
--- /dev/null
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMultExpression.java
@@ -0,0 +1,21 @@
+/* Generated By:JJTree: Do not edit this line. OMultExpression.java Version 4.3 */
+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package com.orientechnologies.orient.core.sql.parser;
+
+public
+class OMultExpression extends SimpleNode {
+  public OMultExpression(int id) {
+    super(id);
+  }
+
+  public OMultExpression(OrientSql p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
+/* JavaCC - OriginalChecksum=f75b8be48dca1e0cafae0cacadc608c8 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OParenthesisExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OParenthesisExpression.java
new file mode 100644
index 00000000000..2605cbea267
--- /dev/null
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OParenthesisExpression.java
@@ -0,0 +1,21 @@
+/* Generated By:JJTree: Do not edit this line. OParenthesisExpression.java Version 4.3 */
+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package com.orientechnologies.orient.core.sql.parser;
+
+public
+class OParenthesisExpression extends SimpleNode {
+  public OParenthesisExpression(int id) {
+    super(id);
+  }
+
+  public OParenthesisExpression(OrientSql p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
+/* JavaCC - OriginalChecksum=4656e5faf4f54dc3fc45a06d8e375c35 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSql.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSql.java
index 2b4689e72b7..66e8ac7fac8 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSql.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSql.java
@@ -286,6 +286,7 @@ final public void SelectStatement() throws ParseException {
       case FLOATING_POINT_LITERAL:
       case CHARACTER_LITERAL:
       case STRING_LITERAL:
+      case LPAREN:
       case LBRACKET:
       case HOOK:
       case COLON:
@@ -408,6 +409,7 @@ final public void TraverseStatement() throws ParseException {
       case FLOATING_POINT_LITERAL:
       case CHARACTER_LITERAL:
       case STRING_LITERAL:
+      case LPAREN:
       case LBRACKET:
       case HOOK:
       case COLON:
@@ -1019,6 +1021,7 @@ final public void ProjectionItem() throws ParseException {
       case FLOATING_POINT_LITERAL:
       case CHARACTER_LITERAL:
       case STRING_LITERAL:
+      case LPAREN:
       case LBRACKET:
       case HOOK:
       case COLON:
@@ -1051,7 +1054,7 @@ final public void ProjectionItem() throws ParseException {
               if (jj_2_11(2147483647)) {
                 InputParameter();
               } else if (jj_2_12(2147483647)) {
-                OperationChain();
+                Expression();
               } else {
                 jj_consume_token(-1);
                 throw new ParseException();
@@ -1209,7 +1212,7 @@ final public void FilterItem() throws ParseException {
             if (jj_2_17(2147483647)) {
               InputParameter();
             } else if (jj_2_18(2147483647)) {
-              OperationChain();
+              Expression();
             } else {
               jj_consume_token(-1);
               throw new ParseException();
@@ -1268,7 +1271,7 @@ final public void ArraySelector() throws ParseException {
           if (jj_2_20(2147483647)) {
             InputParameter();
           } else if (jj_2_21(2147483647)) {
-            OperationChain();
+            Expression();
           } else {
             jj_consume_token(-1);
             throw new ParseException();
@@ -1352,7 +1355,7 @@ final public void ArrayRangeSelector() throws ParseException {
       } else if (jj_2_23(2147483647)) {
         InputParameter();
       } else if (jj_2_24(2147483647)) {
-        OperationChain();
+        Expression();
       } else {
         jj_consume_token(-1);
         throw new ParseException();
@@ -1363,7 +1366,7 @@ final public void ArrayRangeSelector() throws ParseException {
       } else if (jj_2_26(2147483647)) {
         InputParameter();
       } else if (jj_2_27(2147483647)) {
-        OperationChain();
+        Expression();
       } else {
         jj_consume_token(-1);
         throw new ParseException();
@@ -1505,6 +1508,7 @@ final public void FunctionCall() throws ParseException {
         case FLOATING_POINT_LITERAL:
         case CHARACTER_LITERAL:
         case STRING_LITERAL:
+        case LPAREN:
         case LBRACKET:
         case HOOK:
         case COLON:
@@ -1578,6 +1582,7 @@ final public void MethodCall() throws ParseException {
       case FLOATING_POINT_LITERAL:
       case CHARACTER_LITERAL:
       case STRING_LITERAL:
+      case LPAREN:
       case LBRACKET:
       case HOOK:
       case COLON:
@@ -1791,13 +1796,9 @@ final public void Modifier() throws ParseException {
           throw new ParseException();
         }
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACKET:
-      case DOT:
+      if (jj_2_36(2147483647)) {
         Modifier();
-        break;
-      default:
-        jj_la1[52] = jj_gen;
+      } else {
         ;
       }
     } catch (Throwable jjte000) {
@@ -1822,21 +1823,232 @@ final public void Modifier() throws ParseException {
     }
   }
 
-  final public void OperationChain() throws ParseException {
- /*@bgen(jjtree) OperationChain */
-  OOperationChain jjtn000 = new OOperationChain(JJTOPERATIONCHAIN);
+  final public void Expression() throws ParseException {
+ /*@bgen(jjtree) Expression */
+  OExpression jjtn000 = new OExpression(JJTEXPRESSION);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtn000.jjtSetFirstToken(getToken(1));
+    try {
+      if (jj_2_37(2147483647)) {
+
+      } else {
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      AddExpression();
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtn000.jjtSetLastToken(getToken(0));
+      }
+    }
+  }
+
+  final public void AddExpression() throws ParseException {
+ /*@bgen(jjtree) AddExpression */
+  OAddExpression jjtn000 = new OAddExpression(JJTADDEXPRESSION);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtn000.jjtSetFirstToken(getToken(1));
+    try {
+      MultExpression();
+      label_11:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case PLUS:
+        case MINUS:
+          ;
+          break;
+        default:
+          jj_la1[52] = jj_gen;
+          break label_11;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case PLUS:
+          jj_consume_token(PLUS);
+          break;
+        case MINUS:
+          jj_consume_token(MINUS);
+          break;
+        default:
+          jj_la1[53] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+        MultExpression();
+      }
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtn000.jjtSetLastToken(getToken(0));
+          }
+    }
+  }
+
+  final public void MultExpression() throws ParseException {
+ /*@bgen(jjtree) MultExpression */
+  OMultExpression jjtn000 = new OMultExpression(JJTMULTEXPRESSION);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtn000.jjtSetFirstToken(getToken(1));
+    try {
+      FirstLevelExpression();
+      label_12:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case STAR:
+        case SLASH:
+          ;
+          break;
+        default:
+          jj_la1[54] = jj_gen;
+          break label_12;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case STAR:
+          jj_consume_token(STAR);
+          break;
+        case SLASH:
+          jj_consume_token(SLASH);
+          break;
+        default:
+          jj_la1[55] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+        FirstLevelExpression();
+      }
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtn000.jjtSetLastToken(getToken(0));
+      }
+    }
+  }
+
+  final public void FirstLevelExpression() throws ParseException {
+ /*@bgen(jjtree) FirstLevelExpression */
+  OFirstLevelExpression jjtn000 = new OFirstLevelExpression(JJTFIRSTLEVELEXPRESSION);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtn000.jjtSetFirstToken(getToken(1));
+    try {
+      if (jj_2_38(2147483647)) {
+        ParenthesisExpression();
+      } else if (jj_2_39(2147483647)) {
+        BaseExpression();
+      } else {
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtn000.jjtSetLastToken(getToken(0));
+      }
+    }
+  }
+
+  final public void ParenthesisExpression() throws ParseException {
+ /*@bgen(jjtree) ParenthesisExpression */
+  OParenthesisExpression jjtn000 = new OParenthesisExpression(JJTPARENTHESISEXPRESSION);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtn000.jjtSetFirstToken(getToken(1));
+    try {
+      jj_consume_token(LPAREN);
+      AddExpression();
+      jj_consume_token(RPAREN);
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtn000.jjtSetLastToken(getToken(0));
+          }
+    }
+  }
+
+  final public void BaseExpression() throws ParseException {
+ /*@bgen(jjtree) BaseExpression */
+  OBaseExpression jjtn000 = new OBaseExpression(JJTBASEEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
   jjtn000.jjtSetFirstToken(getToken(1));
     try {
       BaseIdentifier();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACKET:
-      case DOT:
+      if (jj_2_40(2147483647)) {
         Modifier();
-        break;
-      default:
-        jj_la1[53] = jj_gen;
+      } else {
         ;
       }
     } catch (Throwable jjte000) {
@@ -1906,15 +2118,15 @@ final public void FromItem() throws ParseException {
       case LBRACKET:
         jj_consume_token(LBRACKET);
         Rid();
-        label_11:
+        label_13:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case COMMA:
             ;
             break;
           default:
-            jj_la1[54] = jj_gen;
-            break label_11;
+            jj_la1[56] = jj_gen;
+            break label_13;
           }
           jj_consume_token(COMMA);
           Rid();
@@ -1952,14 +2164,14 @@ final public void FromItem() throws ParseException {
           TraverseStatement();
           break;
         default:
-          jj_la1[55] = jj_gen;
+          jj_la1[57] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         jj_consume_token(RPAREN);
         break;
       default:
-        jj_la1[56] = jj_gen;
+        jj_la1[58] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2038,7 +2250,7 @@ final public void IndexIdentifier() throws ParseException {
         jj_consume_token(INDEXVALUESDESC_IDENTIFIER);
         break;
       default:
-        jj_la1[57] = jj_gen;
+        jj_la1[59] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2088,15 +2300,15 @@ final public void OrBlock() throws ParseException {
   jjtn000.jjtSetFirstToken(getToken(1));
     try {
       AndBlock();
-      label_12:
+      label_14:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case OR:
           ;
           break;
         default:
-          jj_la1[58] = jj_gen;
-          break label_12;
+          jj_la1[60] = jj_gen;
+          break label_14;
         }
         jj_consume_token(OR);
         AndBlock();
@@ -2131,15 +2343,15 @@ final public void AndBlock() throws ParseException {
   jjtn000.jjtSetFirstToken(getToken(1));
     try {
       NotBlock();
-      label_13:
+      label_15:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case AND:
           ;
           break;
         default:
-          jj_la1[59] = jj_gen;
-          break label_13;
+          jj_la1[61] = jj_gen;
+          break label_15;
         }
         jj_consume_token(AND);
         NotBlock();
@@ -2173,41 +2385,16 @@ final public void NotBlock() throws ParseException {
   jjtree.openNodeScope(jjtn000);
   jjtn000.jjtSetFirstToken(getToken(1));
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case NOT:
+      if (jj_2_41(2)) {
         jj_consume_token(NOT);
-        break;
-      default:
-        jj_la1[60] = jj_gen;
+      } else {
         ;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case SET:
-      case NULL:
-      case ORDER:
-      case GROUP:
-      case OFFSET:
-      case THIS:
-      case RECORD_ATTRIBUTE:
-      case INTEGER_LITERAL:
-      case FLOATING_POINT_LITERAL:
-      case CHARACTER_LITERAL:
-      case STRING_LITERAL:
-      case LBRACKET:
-      case HOOK:
-      case COLON:
-      case MINUS:
-      case IN:
-      case KEY:
-      case IDENTIFIER:
-      case 118:
+      if (jj_2_42(2147483647)) {
         ConditionBlock();
-        break;
-      case LPAREN:
+      } else if (jj_2_43(2147483647)) {
         ParenthesisBlock();
-        break;
-      default:
-        jj_la1[61] = jj_gen;
+      } else {
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2272,35 +2459,35 @@ final public void ConditionBlock() throws ParseException {
   jjtree.openNodeScope(jjtn000);
   jjtn000.jjtSetFirstToken(getToken(1));
     try {
-      if (jj_2_36(2147483647)) {
+      if (jj_2_44(2147483647)) {
         IsNotNullCondition();
-      } else if (jj_2_37(2147483647)) {
+      } else if (jj_2_45(2147483647)) {
         IsNullCondition();
-      } else if (jj_2_38(2147483647)) {
+      } else if (jj_2_46(2147483647)) {
         IsNotDefinedCondition();
-      } else if (jj_2_39(2147483647)) {
+      } else if (jj_2_47(2147483647)) {
         IsDefinedCondition();
-      } else if (jj_2_40(2147483647)) {
+      } else if (jj_2_48(2147483647)) {
         InCondition();
-      } else if (jj_2_41(2147483647)) {
+      } else if (jj_2_49(2147483647)) {
         NotInCondition();
-      } else if (jj_2_42(2147483647)) {
+      } else if (jj_2_50(2147483647)) {
         BinaryCondition();
-      } else if (jj_2_43(2147483647)) {
+      } else if (jj_2_51(2147483647)) {
         BetweenCondition();
-      } else if (jj_2_44(2147483647)) {
+      } else if (jj_2_52(2147483647)) {
         ContainsCondition();
-      } else if (jj_2_45(2147483647)) {
+      } else if (jj_2_53(2147483647)) {
         ContainsValueCondition();
-      } else if (jj_2_46(2147483647)) {
+      } else if (jj_2_54(2147483647)) {
         ContainsAllCondition();
-      } else if (jj_2_47(2147483647)) {
+      } else if (jj_2_55(2147483647)) {
         ContainsTextCondition();
-      } else if (jj_2_48(2147483647)) {
+      } else if (jj_2_56(2147483647)) {
         MatchesCondition();
-      } else if (jj_2_49(2147483647)) {
+      } else if (jj_2_57(2147483647)) {
         IndexMatchCondition();
-      } else if (jj_2_50(2147483647)) {
+      } else if (jj_2_58(2147483647)) {
         InstanceofCondition();
       } else {
         jj_consume_token(-1);
@@ -2591,35 +2778,13 @@ final public void ContainsValueCondition() throws ParseException {
     try {
       FilterItem();
       ContainsValueOperator();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LPAREN:
+      if (jj_2_59(3)) {
         jj_consume_token(LPAREN);
         OrBlock();
         jj_consume_token(RPAREN);
-        break;
-      case SET:
-      case NULL:
-      case ORDER:
-      case GROUP:
-      case OFFSET:
-      case THIS:
-      case RECORD_ATTRIBUTE:
-      case INTEGER_LITERAL:
-      case FLOATING_POINT_LITERAL:
-      case CHARACTER_LITERAL:
-      case STRING_LITERAL:
-      case LBRACKET:
-      case HOOK:
-      case COLON:
-      case MINUS:
-      case IN:
-      case KEY:
-      case IDENTIFIER:
-      case 118:
+      } else if (jj_2_60(2147483647)) {
         FilterItem();
-        break;
-      default:
-        jj_la1[63] = jj_gen;
+      } else {
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2709,6 +2874,7 @@ final public void IndexMatchCondition() throws ParseException {
         case FLOATING_POINT_LITERAL:
         case CHARACTER_LITERAL:
         case STRING_LITERAL:
+        case LPAREN:
         case LBRACKET:
         case HOOK:
         case COLON:
@@ -2718,22 +2884,22 @@ final public void IndexMatchCondition() throws ParseException {
         case IDENTIFIER:
         case 118:
           FilterItem();
-          label_14:
+          label_16:
           while (true) {
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
             case COMMA:
               ;
               break;
             default:
-              jj_la1[64] = jj_gen;
-              break label_14;
+              jj_la1[63] = jj_gen;
+              break label_16;
             }
             jj_consume_token(COMMA);
             FilterItem();
           }
           break;
         default:
-          jj_la1[65] = jj_gen;
+          jj_la1[64] = jj_gen;
           ;
         }
         jj_consume_token(RBRACKET);
@@ -2753,6 +2919,7 @@ final public void IndexMatchCondition() throws ParseException {
         case FLOATING_POINT_LITERAL:
         case CHARACTER_LITERAL:
         case STRING_LITERAL:
+        case LPAREN:
         case LBRACKET:
         case HOOK:
         case COLON:
@@ -2762,22 +2929,22 @@ final public void IndexMatchCondition() throws ParseException {
         case IDENTIFIER:
         case 118:
           FilterItem();
-          label_15:
+          label_17:
           while (true) {
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
             case COMMA:
               ;
               break;
             default:
-              jj_la1[66] = jj_gen;
-              break label_15;
+              jj_la1[65] = jj_gen;
+              break label_17;
             }
             jj_consume_token(COMMA);
             FilterItem();
           }
           break;
         default:
-          jj_la1[67] = jj_gen;
+          jj_la1[66] = jj_gen;
           ;
         }
         jj_consume_token(RBRACKET);
@@ -2795,6 +2962,7 @@ final public void IndexMatchCondition() throws ParseException {
         case FLOATING_POINT_LITERAL:
         case CHARACTER_LITERAL:
         case STRING_LITERAL:
+        case LPAREN:
         case LBRACKET:
         case HOOK:
         case COLON:
@@ -2804,28 +2972,28 @@ final public void IndexMatchCondition() throws ParseException {
         case IDENTIFIER:
         case 118:
           FilterItem();
-          label_16:
+          label_18:
           while (true) {
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
             case COMMA:
               ;
               break;
             default:
-              jj_la1[68] = jj_gen;
-              break label_16;
+              jj_la1[67] = jj_gen;
+              break label_18;
             }
             jj_consume_token(COMMA);
             FilterItem();
           }
           break;
         default:
-          jj_la1[69] = jj_gen;
+          jj_la1[68] = jj_gen;
           ;
         }
         jj_consume_token(RBRACKET);
         break;
       default:
-        jj_la1[70] = jj_gen;
+        jj_la1[69] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3024,35 +3192,13 @@ final public void ContainsCondition() throws ParseException {
     try {
       FilterItem();
       jj_consume_token(CONTAINS);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LPAREN:
+      if (jj_2_61(3)) {
         jj_consume_token(LPAREN);
         OrBlock();
         jj_consume_token(RPAREN);
-        break;
-      case SET:
-      case NULL:
-      case ORDER:
-      case GROUP:
-      case OFFSET:
-      case THIS:
-      case RECORD_ATTRIBUTE:
-      case INTEGER_LITERAL:
-      case FLOATING_POINT_LITERAL:
-      case CHARACTER_LITERAL:
-      case STRING_LITERAL:
-      case LBRACKET:
-      case HOOK:
-      case COLON:
-      case MINUS:
-      case IN:
-      case KEY:
-      case IDENTIFIER:
-      case 118:
+      } else if (jj_2_62(2147483647)) {
         FilterItem();
-        break;
-      default:
-        jj_la1[71] = jj_gen;
+      } else {
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3107,15 +3253,15 @@ final public void InCondition() throws ParseException {
       case LBRACKET:
         jj_consume_token(LBRACKET);
         FilterItem();
-        label_17:
+        label_19:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case COMMA:
             ;
             break;
           default:
-            jj_la1[72] = jj_gen;
-            break label_17;
+            jj_la1[70] = jj_gen;
+            break label_19;
           }
           jj_consume_token(COMMA);
           FilterItem();
@@ -3132,7 +3278,7 @@ final public void InCondition() throws ParseException {
         InputParameter();
         break;
       default:
-        jj_la1[73] = jj_gen;
+        jj_la1[71] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3172,15 +3318,15 @@ final public void NotInCondition() throws ParseException {
       case LBRACKET:
         jj_consume_token(LBRACKET);
         FilterItem();
-        label_18:
+        label_20:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case COMMA:
             ;
             break;
           default:
-            jj_la1[74] = jj_gen;
-            break label_18;
+            jj_la1[72] = jj_gen;
+            break label_20;
           }
           jj_consume_token(COMMA);
           FilterItem();
@@ -3193,7 +3339,7 @@ final public void NotInCondition() throws ParseException {
         jj_consume_token(RPAREN);
         break;
       default:
-        jj_la1[75] = jj_gen;
+        jj_la1[73] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3272,14 +3418,15 @@ final public void ContainsTextCondition() throws ParseException {
       case OFFSET:
       case THIS:
       case RECORD_ATTRIBUTE:
+      case LPAREN:
       case LBRACKET:
       case IN:
       case KEY:
       case IDENTIFIER:
-        OperationChain();
+        Expression();
         break;
       default:
-        jj_la1[76] = jj_gen;
+        jj_la1[74] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3364,7 +3511,7 @@ final public void OrderBy() throws ParseException {
         jj_consume_token(RECORD_ATTRIBUTE);
         break;
       default:
-        jj_la1[77] = jj_gen;
+        jj_la1[75] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3379,24 +3526,24 @@ final public void OrderBy() throws ParseException {
           jj_consume_token(ASC);
           break;
         default:
-          jj_la1[78] = jj_gen;
+          jj_la1[76] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[77] = jj_gen;
         ;
       }
-      label_19:
+      label_21:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case COMMA:
           ;
           break;
         default:
-          jj_la1[80] = jj_gen;
-          break label_19;
+          jj_la1[78] = jj_gen;
+          break label_21;
         }
         jj_consume_token(COMMA);
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3417,7 +3564,7 @@ final public void OrderBy() throws ParseException {
           jj_consume_token(RECORD_ATTRIBUTE);
           break;
         default:
-          jj_la1[81] = jj_gen;
+          jj_la1[79] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -3432,13 +3579,13 @@ final public void OrderBy() throws ParseException {
             jj_consume_token(ASC);
             break;
           default:
-            jj_la1[82] = jj_gen;
+            jj_la1[80] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
           break;
         default:
-          jj_la1[83] = jj_gen;
+          jj_la1[81] = jj_gen;
           ;
         }
       }
@@ -3474,15 +3621,15 @@ final public void GroupBy() throws ParseException {
       jj_consume_token(GROUP);
       jj_consume_token(BY);
       Identifier();
-      label_20:
+      label_22:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case COMMA:
           ;
           break;
         default:
-          jj_la1[84] = jj_gen;
-          break label_20;
+          jj_la1[82] = jj_gen;
+          break label_22;
         }
         jj_consume_token(COMMA);
         Identifier();
@@ -3557,7 +3704,7 @@ final public void Skip() throws ParseException {
         Integer();
         break;
       default:
-        jj_la1[85] = jj_gen;
+        jj_la1[83] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3592,15 +3739,15 @@ final public void ItemsCollection() throws ParseException {
     try {
       jj_consume_token(LBRACKET);
       ValueItem();
-      label_21:
+      label_23:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case COMMA:
           ;
           break;
         default:
-          jj_la1[86] = jj_gen;
-          break label_21;
+          jj_la1[84] = jj_gen;
+          break label_23;
         }
         jj_consume_token(COMMA);
         ValueItem();
@@ -3978,95 +4125,158 @@ private boolean jj_2_50(int xla) {
     finally { jj_save(49, xla); }
   }
 
-  private boolean jj_3R_170() {
-    if (jj_3R_23()) return true;
+  private boolean jj_2_51(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_51(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(50, xla); }
+  }
+
+  private boolean jj_2_52(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_52(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(51, xla); }
+  }
+
+  private boolean jj_2_53(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_53(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(52, xla); }
+  }
+
+  private boolean jj_2_54(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_54(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(53, xla); }
+  }
+
+  private boolean jj_2_55(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_55(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(54, xla); }
+  }
+
+  private boolean jj_2_56(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_56(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(55, xla); }
+  }
+
+  private boolean jj_2_57(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_57(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(56, xla); }
+  }
+
+  private boolean jj_2_58(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_58(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(57, xla); }
+  }
+
+  private boolean jj_2_59(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_59(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(58, xla); }
+  }
+
+  private boolean jj_2_60(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_60(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(59, xla); }
+  }
+
+  private boolean jj_2_61(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_61(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(60, xla); }
+  }
+
+  private boolean jj_2_62(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_62(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(61, xla); }
+  }
+
+  private boolean jj_3R_188() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_101() {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_146()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_147()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACKET)) return true;
+  private boolean jj_3R_99() {
+    if (jj_scan_token(IN)) return true;
     return false;
   }
 
-  private boolean jj_3R_143() {
+  private boolean jj_3R_106() {
+    if (jj_3R_56()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_80() {
     if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_174()) {
+    if (jj_3R_134()) {
     jj_scanpos = xsp;
-    if (jj_3R_175()) {
+    if (jj_3R_135()) {
     jj_scanpos = xsp;
-    if (jj_3R_176()) return true;
+    if (jj_3R_136()) return true;
     }
     }
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_173() {
-    if (jj_scan_token(OFFSET)) return true;
-    if (jj_3R_24()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_172() {
-    if (jj_scan_token(SKIP2)) return true;
-    if (jj_3R_24()) return true;
+  private boolean jj_3_30() {
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_139() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_172()) {
-    jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
-    }
+  private boolean jj_3_61() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_30() {
-    if (jj_3R_29()) return true;
+  private boolean jj_3R_189() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
   private boolean jj_3_29() {
-    if (jj_3R_28()) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  private boolean jj_3R_186() {
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_178() {
+    if (jj_3R_56()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_208()) { jj_scanpos = xsp; break; }
+      if (jj_3R_207()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_161() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_134() {
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_99() {
+  private boolean jj_3R_36() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_143()) {
+    if (jj_3R_80()) {
     jj_scanpos = xsp;
     if (jj_3_34()) {
     jj_scanpos = xsp;
@@ -4074,126 +4284,97 @@ private boolean jj_3R_99() {
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_144()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_141() {
-    if (jj_scan_token(LIMIT)) return true;
-    if (jj_3R_24()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_169() {
-    if (jj_3R_59()) return true;
+    if (jj_3R_81()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_98() {
-    if (jj_3R_29()) return true;
+  private boolean jj_3R_49() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(CONTAINS)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_61()) {
+    jj_scanpos = xsp;
+    if (jj_3R_106()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_92() {
-    if (jj_scan_token(GROUP)) return true;
-    if (jj_scan_token(BY)) return true;
-    if (jj_3R_59()) return true;
+  private boolean jj_3R_150() {
+    if (jj_3R_56()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_138()) { jj_scanpos = xsp; break; }
+      if (jj_3R_188()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_24() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(76)) jj_scanpos = xsp;
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  private boolean jj_3R_138() {
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_57() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_97()) {
-    jj_scanpos = xsp;
-    if (jj_3R_98()) return true;
-    }
+  private boolean jj_3R_43() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(IS)) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_scan_token(DEFINED)) return true;
     return false;
   }
 
-  private boolean jj_3R_97() {
-    if (jj_3R_28()) return true;
+  private boolean jj_3R_137() {
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  private boolean jj_3R_145() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_26() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(76)) jj_scanpos = xsp;
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_137() {
-    if (jj_scan_token(COMMA)) return true;
+  private boolean jj_3R_82() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_169()) {
-    jj_scanpos = xsp;
-    if (jj_3R_170()) {
+    if (jj_3R_137()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(32)) return true;
-    }
+    if (jj_3R_138()) return true;
     }
-    xsp = jj_scanpos;
-    if (jj_3R_171()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_112() {
+  private boolean jj_3R_173() {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_124() {
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_151() {
+    if (jj_3R_56()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_161()) { jj_scanpos = xsp; break; }
+      if (jj_3R_189()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_91() {
-    if (jj_scan_token(ORDER)) return true;
-    if (jj_scan_token(BY)) return true;
+  private boolean jj_3R_44() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(IS)) return true;
+    if (jj_scan_token(DEFINED)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_67() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_134()) {
+    if (jj_scan_token(109)) {
     jj_scanpos = xsp;
-    if (jj_3R_135()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(32)) return true;
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_136()) jj_scanpos = xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_137()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_59() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(109)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(97)) {
+    if (jj_scan_token(97)) {
     jj_scanpos = xsp;
     if (jj_scan_token(15)) {
     jj_scanpos = xsp;
@@ -4213,74 +4394,64 @@ private boolean jj_3R_59() {
     return false;
   }
 
-  private boolean jj_3R_63() {
-    if (jj_3R_102()) return true;
+  private boolean jj_3R_71() {
+    if (jj_3R_128()) return true;
     return false;
   }
 
-  private boolean jj_3R_29() {
+  private boolean jj_3R_31() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_62()) {
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_63()) return true;
+    if (jj_3R_71()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_62() {
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_46() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(MATCHES)) return true;
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  private boolean jj_3R_70() {
+    if (jj_3R_67()) return true;
     return false;
   }
 
-  private boolean jj_3R_61() {
-    if (jj_3R_101()) return true;
+  private boolean jj_3R_41() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(IS)) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_scan_token(NULL)) return true;
     return false;
   }
 
-  private boolean jj_3_2() {
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
-    if (jj_scan_token(COLON)) return true;
-    if (jj_scan_token(INTEGER_LITERAL)) return true;
+  private boolean jj_3R_69() {
+    if (jj_3R_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_100() {
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_126() {
+    if (jj_3R_56()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_145()) { jj_scanpos = xsp; break; }
+      if (jj_3R_173()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_111() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
+  private boolean jj_3_2() {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_45() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(CONTAINSTEXT)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(49)) {
-    jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
-    }
+  private boolean jj_3R_42() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(IS)) return true;
+    if (jj_scan_token(NULL)) return true;
     return false;
   }
 
-  private boolean jj_3R_23() {
+  private boolean jj_3R_25() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_1()) {
@@ -4298,410 +4469,322 @@ private boolean jj_3_1() {
     return false;
   }
 
-  private boolean jj_3R_28() {
+  private boolean jj_3R_30() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_28()) {
     jj_scanpos = xsp;
     if (jj_scan_token(31)) {
     jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
+    if (jj_3R_69()) return true;
     }
     }
     return false;
   }
 
   private boolean jj_3_28() {
-    if (jj_3R_27()) return true;
+    if (jj_3R_29()) return true;
     return false;
   }
 
-  private boolean jj_3R_33() {
+  private boolean jj_3R_35() {
     if (jj_scan_token(DOT)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_67()) return true;
     if (jj_scan_token(LPAREN)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_186()) jj_scanpos = xsp;
+    if (jj_3R_178()) jj_scanpos = xsp;
     if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_44() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(CONTAINSALL)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(RPAREN)) return true;
+  private boolean jj_3R_48() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(BETWEEN)) return true;
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_60() {
+  private boolean jj_3R_111() {
+    if (jj_scan_token(BETWEEN)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_100()) jj_scanpos = xsp;
+    if (jj_3R_151()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_scan_token(AND)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_152()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_77() {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_68() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_112()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACKET)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_126()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_78() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_3R_22()) return true;
-    if (jj_scan_token(RPAREN)) return true;
+  private boolean jj_3R_110() {
+    if (jj_3R_105()) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_150()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_39() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_73()) return true;
+  private boolean jj_3R_54() {
+    if (jj_scan_token(KEY)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_77()) {
+    if (jj_3R_110()) {
     jj_scanpos = xsp;
-    if (jj_3R_78()) return true;
+    if (jj_3R_111()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_76() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3_60() {
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_27() {
-    if (jj_3R_59()) return true;
+  private boolean jj_3R_29() {
+    if (jj_3R_67()) return true;
     if (jj_scan_token(LPAREN)) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_3R_60()) return true;
+    if (jj_3R_68()) return true;
     }
     if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_75() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_3R_22()) return true;
-    if (jj_scan_token(RPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_74() {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_72()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_111()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACKET)) return true;
+  private boolean jj_3R_55() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(INSTANCEOF)) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
-  private boolean jj_3R_38() {
-    if (jj_3R_72()) return true;
-    if (jj_3R_73()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_74()) {
-    jj_scanpos = xsp;
-    if (jj_3R_75()) {
-    jj_scanpos = xsp;
-    if (jj_3R_76()) return true;
-    }
-    }
+  private boolean jj_3R_108() {
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_102() {
+  private boolean jj_3R_128() {
     if (jj_scan_token(RECORD_ATTRIBUTE)) return true;
     return false;
   }
 
-  private boolean jj_3_27() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3_59() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_159() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
+  private boolean jj_3_27() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_205() {
-    if (jj_3R_59()) return true;
+  private boolean jj_3R_216() {
+    if (jj_3R_67()) return true;
     return false;
   }
 
   private boolean jj_3_26() {
-    if (jj_3R_25()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_73() {
-    if (jj_scan_token(IN)) return true;
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_81() {
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_50() {
+    if (jj_3R_56()) return true;
+    if (jj_3R_107()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_59()) {
+    jj_scanpos = xsp;
+    if (jj_3R_108()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_80() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(RPAREN)) return true;
+  private boolean jj_3R_47() {
+    if (jj_3R_56()) return true;
+    if (jj_3R_105()) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_160() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_179() {
+    if (jj_scan_token(EQ)) return true;
     return false;
   }
 
   private boolean jj_3_24() {
-    if (jj_3R_26()) return true;
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_71() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_79() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_42() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(CONTAINS)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_80()) {
-    jj_scanpos = xsp;
-    if (jj_3R_81()) return true;
-    }
+  private boolean jj_3_23() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3_23() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3R_78() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_70() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3R_107() {
+    if (jj_scan_token(CONTAINSVALUE)) return true;
     return false;
   }
 
-  private boolean jj_3R_122() {
-    if (jj_3R_72()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_159()) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3_25() {
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3_25() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3R_75() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
-  private boolean jj_3R_36() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(IS)) return true;
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(DEFINED)) return true;
+  private boolean jj_3R_77() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_67() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_66()) return true;
+  private boolean jj_3R_187() {
+    if (jj_scan_token(CONTAINSKEY)) return true;
     return false;
   }
 
-  private boolean jj_3R_123() {
-    if (jj_3R_72()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_160()) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3R_76() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_69() {
+  private boolean jj_3_22() {
     if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_37() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(IS)) return true;
-    if (jj_scan_token(DEFINED)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_68() {
-    if (jj_3R_25()) return true;
-    return false;
-  }
-
-  private boolean jj_3_22() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3R_186() {
+    if (jj_scan_token(LIKE)) return true;
     return false;
   }
 
   private boolean jj_3R_34() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(IS)) return true;
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(NULL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_32() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_22()) {
     jj_scanpos = xsp;
-    if (jj_3R_68()) {
+    if (jj_3R_76()) {
     jj_scanpos = xsp;
-    if (jj_3R_69()) return true;
+    if (jj_3R_77()) return true;
     }
     }
     if (jj_scan_token(MINUS)) return true;
     xsp = jj_scanpos;
     if (jj_3_25()) {
     jj_scanpos = xsp;
-    if (jj_3R_70()) {
+    if (jj_3R_78()) {
     jj_scanpos = xsp;
-    if (jj_3R_71()) return true;
+    if (jj_3R_79()) return true;
     }
     }
     return false;
   }
 
   private boolean jj_3_20() {
-    if (jj_3R_25()) return true;
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3_21() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_185() {
+    if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  private boolean jj_3R_35() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(IS)) return true;
-    if (jj_scan_token(NULL)) return true;
+  private boolean jj_3_21() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_31() {
-    if (jj_3R_66()) return true;
+  private boolean jj_3R_33() {
+    if (jj_3R_74()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_67()) { jj_scanpos = xsp; break; }
+      if (jj_3R_75()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_41() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(BETWEEN)) return true;
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_72()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_106() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3R_184() {
+    if (jj_scan_token(GE)) return true;
     return false;
   }
 
-  private boolean jj_3R_87() {
-    if (jj_scan_token(BETWEEN)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_123()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
-    if (jj_scan_token(AND)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_124()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+  private boolean jj_3R_132() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_107() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_133() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_105() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_183() {
+    if (jj_scan_token(NEQ)) return true;
     return false;
   }
 
-  private boolean jj_3R_86() {
-    if (jj_3R_79()) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_122()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+  private boolean jj_3R_131() {
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3R_47() {
-    if (jj_scan_token(KEY)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
-    }
+  private boolean jj_3R_182() {
+    if (jj_scan_token(NE)) return true;
     return false;
   }
 
   private boolean jj_3_17() {
-    if (jj_3R_25()) return true;
+    if (jj_3R_27()) return true;
     return false;
   }
 
   private boolean jj_3_18() {
-    if (jj_3R_26()) return true;
+    if (jj_3R_28()) return true;
     return false;
   }
 
   private boolean jj_3_19() {
-    if (jj_3R_24()) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_66() {
+  private boolean jj_3R_74() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_19()) {
@@ -4712,11 +4795,11 @@ private boolean jj_3R_66() {
     jj_scanpos = xsp;
     if (jj_scan_token(48)) {
     jj_scanpos = xsp;
-    if (jj_3R_105()) {
+    if (jj_3R_131()) {
     jj_scanpos = xsp;
-    if (jj_3R_106()) {
+    if (jj_3R_132()) {
     jj_scanpos = xsp;
-    if (jj_3R_107()) return true;
+    if (jj_3R_133()) return true;
     }
     }
     }
@@ -4726,75 +4809,133 @@ private boolean jj_3R_66() {
     return false;
   }
 
-  private boolean jj_3R_48() {
-    if (jj_3R_72()) return true;
-    if (jj_scan_token(INSTANCEOF)) return true;
-    if (jj_3R_59()) return true;
+  private boolean jj_3_43() {
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  private boolean jj_3R_109() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3R_181() {
+    if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  private boolean jj_3R_84() {
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_180() {
+    if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  private boolean jj_3R_110() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_113() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_108() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_114() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_83() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(RPAREN)) return true;
+  private boolean jj_3R_177() {
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  private boolean jj_3_15() {
-    if (jj_3R_27()) return true;
+  private boolean jj_3R_112() {
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3R_43() {
-    if (jj_3R_72()) return true;
-    if (jj_3R_82()) return true;
+  private boolean jj_3R_149() {
+    if (jj_3R_187()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_141() {
+    if (jj_3R_179()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_105() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_83()) {
+    if (jj_3R_141()) {
+    jj_scanpos = xsp;
+    if (jj_3R_142()) {
+    jj_scanpos = xsp;
+    if (jj_3R_143()) {
+    jj_scanpos = xsp;
+    if (jj_3R_144()) {
     jj_scanpos = xsp;
-    if (jj_3R_84()) return true;
+    if (jj_3R_145()) {
+    jj_scanpos = xsp;
+    if (jj_3R_146()) {
+    jj_scanpos = xsp;
+    if (jj_3R_147()) {
+    jj_scanpos = xsp;
+    if (jj_3R_148()) {
+    jj_scanpos = xsp;
+    if (jj_3R_149()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_40() {
-    if (jj_3R_72()) return true;
-    if (jj_3R_79()) return true;
-    if (jj_3R_72()) return true;
+  private boolean jj_3R_148() {
+    if (jj_3R_186()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_147() {
+    if (jj_3R_185()) return true;
+    return false;
+  }
+
+  private boolean jj_3_15() {
+    if (jj_3R_29()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_146() {
+    if (jj_3R_184()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_145() {
+    if (jj_3R_183()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_144() {
+    if (jj_3R_182()) return true;
     return false;
   }
 
   private boolean jj_3_16() {
-    if (jj_3R_24()) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
   private boolean jj_3_14() {
-    if (jj_3R_25()) return true;
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_72() {
+  private boolean jj_3R_143() {
+    if (jj_3R_181()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_142() {
+    if (jj_3R_180()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_56() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(20)) {
@@ -4807,11 +4948,11 @@ private boolean jj_3R_72() {
     jj_scanpos = xsp;
     if (jj_scan_token(48)) {
     jj_scanpos = xsp;
-    if (jj_3R_108()) {
+    if (jj_3R_112()) {
     jj_scanpos = xsp;
-    if (jj_3R_109()) {
+    if (jj_3R_113()) {
     jj_scanpos = xsp;
-    if (jj_3R_110()) return true;
+    if (jj_3R_114()) return true;
     }
     }
     }
@@ -4822,233 +4963,179 @@ private boolean jj_3R_72() {
     return false;
   }
 
-  private boolean jj_3R_150() {
-    if (jj_scan_token(EQ)) return true;
+  private boolean jj_3_57() {
+    if (jj_3R_54()) return true;
     return false;
   }
 
-  private boolean jj_3R_189() {
-    if (jj_3R_99()) return true;
+  private boolean jj_3_58() {
+    if (jj_3R_55()) return true;
     return false;
   }
 
-  private boolean jj_3R_188() {
-    if (jj_3R_27()) return true;
+  private boolean jj_3_56() {
+    if (jj_3R_53()) return true;
     return false;
   }
 
-  private boolean jj_3R_187() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3R_215() {
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  private boolean jj_3_12() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_214() {
+    if (jj_3R_29()) return true;
     return false;
   }
 
-  private boolean jj_3R_82() {
-    if (jj_scan_token(CONTAINSVALUE)) return true;
+  private boolean jj_3R_213() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3_13() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  private boolean jj_3_12() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3_11() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3_54() {
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  private boolean jj_3R_158() {
-    if (jj_scan_token(CONTAINSKEY)) return true;
+  private boolean jj_3_55() {
+    if (jj_3R_52()) return true;
     return false;
   }
 
-  private boolean jj_3R_178() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_13()) {
-    jj_scanpos = xsp;
-    if (jj_3R_187()) {
-    jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_189()) jj_scanpos = xsp;
+  private boolean jj_3_13() {
+    if (jj_scan_token(STRING_LITERAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_177() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3_11() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_183() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_97() {
+    if (jj_3R_54()) return true;
     return false;
   }
 
-  private boolean jj_3R_157() {
-    if (jj_scan_token(LIKE)) return true;
+  private boolean jj_3_53() {
+    if (jj_3R_50()) return true;
     return false;
   }
 
-  private boolean jj_3R_182() {
-    if (jj_3R_25()) return true;
+  private boolean jj_3R_98() {
+    if (jj_3R_55()) return true;
     return false;
   }
 
-  private boolean jj_3R_184() {
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_205()) return true;
+  private boolean jj_3R_96() {
+    if (jj_3R_53()) return true;
     return false;
   }
 
-  private boolean jj_3R_156() {
-    if (jj_scan_token(LE)) return true;
+  private boolean jj_3_52() {
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  private boolean jj_3R_146() {
+  private boolean jj_3R_206() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(20)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(43)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(48)) {
+    if (jj_3_13()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) {
+    if (jj_3R_213()) {
     jj_scanpos = xsp;
-    if (jj_3R_178()) return true;
-    }
-    }
+    if (jj_3R_214()) return true;
     }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_215()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3_10() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
+  private boolean jj_3R_205() {
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_181() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3_51() {
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_126() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_125()) return true;
+  private boolean jj_3R_210() {
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_155() {
-    if (jj_scan_token(GE)) return true;
+  private boolean jj_3R_94() {
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  private boolean jj_3R_154() {
-    if (jj_scan_token(NEQ)) return true;
+  private boolean jj_3_50() {
+    if (jj_3R_47()) return true;
     return false;
   }
 
-  private boolean jj_3R_153() {
-    if (jj_scan_token(NE)) return true;
+  private boolean jj_3R_95() {
+    if (jj_3R_52()) return true;
     return false;
   }
 
-  private boolean jj_3R_152() {
-    if (jj_scan_token(GT)) return true;
+  private boolean jj_3R_209() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_162() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(20)) {
-    jj_scanpos = xsp;
-    if (jj_3R_181()) {
-    jj_scanpos = xsp;
-    if (jj_3_10()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(43)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(48)) {
-    jj_scanpos = xsp;
-    if (jj_3R_182()) {
-    jj_scanpos = xsp;
-    if (jj_3R_183()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_184()) jj_scanpos = xsp;
+  private boolean jj_3R_211() {
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_216()) return true;
     return false;
   }
 
-  private boolean jj_3R_88() {
-    if (jj_3R_125()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_126()) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3R_93() {
+    if (jj_3R_50()) return true;
     return false;
   }
 
-  private boolean jj_3R_125() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(77)) {
-    jj_scanpos = xsp;
-    if (jj_3R_162()) return true;
-    }
+  private boolean jj_3_42() {
+    if (jj_3R_39()) return true;
     return false;
   }
 
-  private boolean jj_3R_151() {
-    if (jj_scan_token(LT)) return true;
+  private boolean jj_3R_92() {
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  private boolean jj_3R_121() {
-    if (jj_3R_158()) return true;
+  private boolean jj_3_48() {
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  private boolean jj_3R_79() {
+  private boolean jj_3_49() {
+    if (jj_3R_46()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_174() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_113()) {
-    jj_scanpos = xsp;
-    if (jj_3R_114()) {
-    jj_scanpos = xsp;
-    if (jj_3R_115()) {
-    jj_scanpos = xsp;
-    if (jj_3R_116()) {
-    jj_scanpos = xsp;
-    if (jj_3R_117()) {
+    if (jj_scan_token(20)) {
     jj_scanpos = xsp;
-    if (jj_3R_118()) {
+    if (jj_scan_token(43)) {
     jj_scanpos = xsp;
-    if (jj_3R_119()) {
+    if (jj_scan_token(48)) {
     jj_scanpos = xsp;
-    if (jj_3R_120()) {
+    if (jj_3R_205()) {
     jj_scanpos = xsp;
-    if (jj_3R_121()) return true;
-    }
-    }
-    }
-    }
+    if (jj_3R_206()) return true;
     }
     }
     }
@@ -5056,292 +5143,422 @@ private boolean jj_3R_79() {
     return false;
   }
 
-  private boolean jj_3R_113() {
-    if (jj_3R_150()) return true;
+  private boolean jj_3_10() {
+    if (jj_scan_token(STRING_LITERAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_120() {
-    if (jj_3R_157()) return true;
+  private boolean jj_3R_91() {
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_119() {
-    if (jj_3R_156()) return true;
+  private boolean jj_3_47() {
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  private boolean jj_3R_96() {
-    if (jj_scan_token(COLON)) return true;
-    if (jj_3R_59()) return true;
+  private boolean jj_3R_208() {
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_118() {
-    if (jj_3R_155()) return true;
+  private boolean jj_3R_154() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_153()) return true;
     return false;
   }
 
-  private boolean jj_3R_117() {
-    if (jj_3R_154()) return true;
+  private boolean jj_3R_90() {
+    if (jj_3R_47()) return true;
     return false;
   }
 
-  private boolean jj_3R_116() {
-    if (jj_3R_153()) return true;
+  private boolean jj_3_46() {
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  private boolean jj_3R_115() {
-    if (jj_3R_152()) return true;
+  private boolean jj_3R_176() {
+    if (jj_3R_39()) return true;
     return false;
   }
 
-  private boolean jj_3R_114() {
-    if (jj_3R_151()) return true;
+  private boolean jj_3_45() {
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3R_95() {
-    if (jj_scan_token(HOOK)) return true;
+  private boolean jj_3R_88() {
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  private boolean jj_3_49() {
-    if (jj_3R_47()) return true;
+  private boolean jj_3_44() {
+    if (jj_3R_41()) return true;
     return false;
   }
 
-  private boolean jj_3_50() {
-    if (jj_3R_48()) return true;
+  private boolean jj_3R_89() {
+    if (jj_3R_46()) return true;
     return false;
   }
 
-  private boolean jj_3_48() {
-    if (jj_3R_46()) return true;
+  private boolean jj_3R_87() {
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  private boolean jj_3R_56() {
-    if (jj_3R_96()) return true;
+  private boolean jj_3R_86() {
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  private boolean jj_3R_25() {
+  private boolean jj_3R_85() {
+    if (jj_3R_42()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_39() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_55()) {
+    if (jj_3R_84()) {
     jj_scanpos = xsp;
-    if (jj_3R_56()) return true;
+    if (jj_3R_85()) {
+    jj_scanpos = xsp;
+    if (jj_3R_86()) {
+    jj_scanpos = xsp;
+    if (jj_3R_87()) {
+    jj_scanpos = xsp;
+    if (jj_3R_88()) {
+    jj_scanpos = xsp;
+    if (jj_3R_89()) {
+    jj_scanpos = xsp;
+    if (jj_3R_90()) {
+    jj_scanpos = xsp;
+    if (jj_3R_91()) {
+    jj_scanpos = xsp;
+    if (jj_3R_92()) {
+    jj_scanpos = xsp;
+    if (jj_3R_93()) {
+    jj_scanpos = xsp;
+    if (jj_3R_94()) {
+    jj_scanpos = xsp;
+    if (jj_3R_95()) {
+    jj_scanpos = xsp;
+    if (jj_3R_96()) {
+    jj_scanpos = xsp;
+    if (jj_3R_97()) {
+    jj_scanpos = xsp;
+    if (jj_3R_98()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_55() {
-    if (jj_3R_95()) return true;
+  private boolean jj_3R_84() {
+    if (jj_3R_41()) return true;
     return false;
   }
 
-  private boolean jj_3_9() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_191() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(20)) {
+    jj_scanpos = xsp;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3_10()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(43)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(48)) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) {
+    jj_scanpos = xsp;
+    if (jj_3R_210()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_211()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3_46() {
-    if (jj_3R_44()) return true;
+  private boolean jj_3R_130() {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_129()) return true;
     return false;
   }
 
-  private boolean jj_3_47() {
-    if (jj_3R_45()) return true;
+  private boolean jj_3R_115() {
+    if (jj_3R_153()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_154()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_203() {
-    if (jj_3R_47()) return true;
+  private boolean jj_3R_153() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(77)) {
+    jj_scanpos = xsp;
+    if (jj_3R_191()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_204() {
-    if (jj_3R_48()) return true;
+  private boolean jj_3R_40() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_45() {
-    if (jj_3R_43()) return true;
+  private boolean jj_3_41() {
+    if (jj_scan_token(NOT)) return true;
     return false;
   }
 
-  private boolean jj_3R_202() {
-    if (jj_3R_46()) return true;
+  private boolean jj_3R_73() {
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_72()) return true;
     return false;
   }
 
-  private boolean jj_3_44() {
-    if (jj_3R_42()) return true;
+  private boolean jj_3R_129() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_41()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_176()) {
+    jj_scanpos = xsp;
+    if (jj_3R_177()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3_43() {
-    if (jj_3R_41()) return true;
+  private boolean jj_3R_123() {
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
-  private boolean jj_3R_200() {
-    if (jj_3R_44()) return true;
-    return false;
+  private boolean jj_3R_72() {
+    if (jj_3R_129()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_130()) { jj_scanpos = xsp; break; }
+    }
+    return false;
   }
 
-  private boolean jj_3R_201() {
-    if (jj_3R_45()) return true;
+  private boolean jj_3R_122() {
+    if (jj_scan_token(HOOK)) return true;
     return false;
   }
 
-  private boolean jj_3_42() {
-    if (jj_3R_40()) return true;
+  private boolean jj_3R_32() {
+    if (jj_3R_72()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_73()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_199() {
-    if (jj_3R_43()) return true;
+  private boolean jj_3R_64() {
+    if (jj_3R_123()) return true;
     return false;
   }
 
-  private boolean jj_3_8() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3R_27() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_63()) {
+    jj_scanpos = xsp;
+    if (jj_3R_64()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_198() {
-    if (jj_3R_42()) return true;
+  private boolean jj_3R_63() {
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  private boolean jj_3_40() {
-    if (jj_3R_38()) return true;
+  private boolean jj_3R_197() {
+    if (jj_3R_212()) return true;
     return false;
   }
 
-  private boolean jj_3_41() {
-    if (jj_3R_39()) return true;
+  private boolean jj_3R_117() {
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  private boolean jj_3R_197() {
-    if (jj_3R_41()) return true;
+  private boolean jj_3_9() {
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_39() {
-    if (jj_3R_37()) return true;
+  private boolean jj_3R_194() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(110)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(111)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(112)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(113)) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_149() {
-    if (jj_3R_180()) return true;
+  private boolean jj_3_8() {
+    if (jj_3R_26()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_195() {
+    if (jj_scan_token(METADATA_IDENTIFIER)) return true;
     return false;
   }
 
   private boolean jj_3R_196() {
-    if (jj_3R_40()) return true;
+    if (jj_3R_24()) return true;
     return false;
   }
 
-  private boolean jj_3_38() {
-    if (jj_3R_36()) return true;
+  private boolean jj_3R_192() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_37() {
-    if (jj_3R_35()) return true;
+  private boolean jj_3R_193() {
+    if (jj_scan_token(CLUSTER_IDENTIFIER)) return true;
     return false;
   }
 
-  private boolean jj_3R_194() {
-    if (jj_3R_38()) return true;
+  private boolean jj_3R_161() {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_197()) return true;
+    }
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_195() {
-    if (jj_3R_39()) return true;
+  private boolean jj_3_6() {
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_36() {
-    if (jj_3R_34()) return true;
+  private boolean jj_3R_160() {
+    if (jj_3R_67()) return true;
     return false;
   }
 
-  private boolean jj_3_6() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_158() {
+    if (jj_3R_194()) return true;
     return false;
   }
 
-  private boolean jj_3R_193() {
-    if (jj_3R_37()) return true;
+  private boolean jj_3R_164() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(30)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(28)) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_192() {
-    if (jj_3R_36()) return true;
+  private boolean jj_3_7() {
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_191() {
-    if (jj_3R_35()) return true;
+  private boolean jj_3R_159() {
+    if (jj_3R_195()) return true;
     return false;
   }
 
-  private boolean jj_3_7() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3R_157() {
+    if (jj_3R_193()) return true;
     return false;
   }
 
-  private boolean jj_3R_190() {
-    if (jj_3R_34()) return true;
+  private boolean jj_3R_156() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_25()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_192()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_179() {
+  private boolean jj_3R_200() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_190()) {
-    jj_scanpos = xsp;
-    if (jj_3R_191()) {
-    jj_scanpos = xsp;
-    if (jj_3R_192()) {
-    jj_scanpos = xsp;
-    if (jj_3R_193()) {
-    jj_scanpos = xsp;
-    if (jj_3R_194()) {
-    jj_scanpos = xsp;
-    if (jj_3R_195()) {
-    jj_scanpos = xsp;
-    if (jj_3R_196()) {
-    jj_scanpos = xsp;
-    if (jj_3R_197()) {
+    if (jj_scan_token(30)) {
     jj_scanpos = xsp;
-    if (jj_3R_198()) {
+    if (jj_scan_token(28)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_155() {
+    if (jj_3R_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_116() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_155()) {
     jj_scanpos = xsp;
-    if (jj_3R_199()) {
+    if (jj_3R_156()) {
     jj_scanpos = xsp;
-    if (jj_3R_200()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_201()) {
+    if (jj_3R_158()) {
     jj_scanpos = xsp;
-    if (jj_3R_202()) {
+    if (jj_3R_159()) {
     jj_scanpos = xsp;
-    if (jj_3R_203()) {
+    if (jj_3R_160()) {
     jj_scanpos = xsp;
-    if (jj_3R_204()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_161()) return true;
     }
     }
     }
@@ -5351,405 +5568,548 @@ private boolean jj_3R_179() {
     return false;
   }
 
-  private boolean jj_3R_148() {
-    if (jj_3R_179()) return true;
+  private boolean jj_3_40() {
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  private boolean jj_3R_104() {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_103()) return true;
+  private boolean jj_3R_58() {
+    if (jj_3R_116()) return true;
     return false;
   }
 
-  private boolean jj_3R_180() {
-    if (jj_scan_token(LPAREN)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(RPAREN)) return true;
+  private boolean jj_3R_175() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_174()) return true;
     return false;
   }
 
-  private boolean jj_3R_65() {
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_64()) return true;
+  private boolean jj_3_4() {
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_4() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_83() {
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  private boolean jj_3R_103() {
+  private boolean jj_3_5() {
+    if (jj_3R_26()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_109() {
+    if (jj_3R_28()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_166() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_163() {
+    if (jj_3R_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_199() {
+    if (jj_3R_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_38() {
+    if (jj_3R_82()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(96)) jj_scanpos = xsp;
+    if (jj_3R_83()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_172() {
+    Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_148()) {
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_3R_149()) return true;
+    if (jj_scan_token(78)) return true;
     }
+    if (jj_3R_171()) return true;
     return false;
   }
 
-  private boolean jj_3R_64() {
-    if (jj_3R_103()) return true;
+  private boolean jj_3R_127() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_174()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_104()) { jj_scanpos = xsp; break; }
+      if (jj_3R_175()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3_5() {
-    if (jj_3R_24()) return true;
+  private boolean jj_3R_202() {
+    if (jj_scan_token(OFFSET)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_30() {
-    if (jj_3R_64()) return true;
+  private boolean jj_3R_201() {
+    if (jj_scan_token(SKIP2)) return true;
+    if (jj_3R_26()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_167() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_65()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_201()) {
+    jj_scanpos = xsp;
+    if (jj_3R_202()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_168() {
-    if (jj_3R_185()) return true;
+  private boolean jj_3_39() {
+    if (jj_3R_38()) return true;
     return false;
   }
 
-  private boolean jj_3R_90() {
-    if (jj_3R_30()) return true;
+  private boolean jj_3R_37() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_66()) return true;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_165() {
+  private boolean jj_3R_162() {
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_125() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(110)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(111)) {
+    if (jj_scan_token(75)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(112)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(113)) return true;
-    }
-    }
+    if (jj_scan_token(76)) return true;
     }
+    if (jj_3R_124()) return true;
     return false;
   }
 
-  private boolean jj_3R_166() {
-    if (jj_scan_token(METADATA_IDENTIFIER)) return true;
+  private boolean jj_3_38() {
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3R_167() {
-    if (jj_3R_22()) return true;
+  private boolean jj_3R_190() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_56()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_169() {
+    if (jj_scan_token(LIMIT)) return true;
+    if (jj_3R_26()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_198() {
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_204() {
+    if (jj_3R_38()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_119() {
+    if (jj_scan_token(GROUP)) return true;
+    if (jj_scan_token(BY)) return true;
+    if (jj_3R_67()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_166()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_163() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_203() {
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3R_164() {
-    if (jj_scan_token(CLUSTER_IDENTIFIER)) return true;
+  private boolean jj_3R_171() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_203()) {
+    jj_scanpos = xsp;
+    if (jj_3R_204()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_133() {
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_165() {
+    if (jj_scan_token(COMMA)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_167()) {
+    if (jj_3R_198()) {
+    jj_scanpos = xsp;
+    if (jj_3R_199()) {
     jj_scanpos = xsp;
-    if (jj_3R_168()) return true;
+    if (jj_scan_token(32)) return true;
     }
-    if (jj_scan_token(RPAREN)) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_200()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_132() {
-    if (jj_3R_59()) return true;
+  private boolean jj_3R_140() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_207() {
-    if (jj_scan_token(WHILE)) return true;
-    if (jj_3R_90()) return true;
+  private boolean jj_3R_118() {
+    if (jj_scan_token(ORDER)) return true;
+    if (jj_scan_token(BY)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_163()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(32)) return true;
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_164()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_165()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_142() {
-    if (jj_3R_139()) return true;
+  private boolean jj_3R_152() {
+    if (jj_3R_56()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_190()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_130() {
-    if (jj_3R_165()) return true;
+  private boolean jj_3R_124() {
+    if (jj_3R_171()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_172()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_58() {
-    if (jj_3R_99()) return true;
+  private boolean jj_3R_66() {
+    if (jj_3R_124()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_125()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_131() {
-    if (jj_3R_166()) return true;
+  private boolean jj_3R_53() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(MATCHES)) return true;
+    if (jj_scan_token(STRING_LITERAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_129() {
-    if (jj_3R_164()) return true;
+  private boolean jj_3R_218() {
+    if (jj_scan_token(WHILE)) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
-  private boolean jj_3R_206() {
-    if (jj_3R_88()) return true;
+  private boolean jj_3R_170() {
+    if (jj_3R_167()) return true;
     return false;
   }
 
-  private boolean jj_3R_140() {
-    if (jj_3R_141()) return true;
+  private boolean jj_3R_139() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_128() {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_23()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_163()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACKET)) return true;
+  private boolean jj_3R_217() {
+    if (jj_3R_115()) return true;
     return false;
   }
 
-  private boolean jj_3R_136() {
+  private boolean jj_3R_52() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(CONTAINSTEXT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(30)) {
+    if (jj_scan_token(49)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(28)) return true;
+    if (jj_3R_109()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_185() {
+  private boolean jj_3R_168() {
+    if (jj_3R_169()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_212() {
     if (jj_scan_token(TRAVERSE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_206()) jj_scanpos = xsp;
+    if (jj_3R_217()) jj_scanpos = xsp;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_50()) return true;
+    if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_207()) jj_scanpos = xsp;
+    if (jj_3R_218()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_127() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3R_65() {
     return false;
   }
 
-  private boolean jj_3R_89() {
+  private boolean jj_3R_51() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(CONTAINSALL)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_121() {
+    if (jj_3R_169()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_127()) {
-    jj_scanpos = xsp;
-    if (jj_3R_128()) {
-    jj_scanpos = xsp;
-    if (jj_3R_129()) {
-    jj_scanpos = xsp;
-    if (jj_3R_130()) {
-    jj_scanpos = xsp;
-    if (jj_3R_131()) {
-    jj_scanpos = xsp;
-    if (jj_3R_132()) {
-    jj_scanpos = xsp;
-    if (jj_3R_133()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_170()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_171() {
+  private boolean jj_3R_120() {
+    if (jj_3R_167()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(30)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(28)) return true;
-    }
+    if (jj_3R_168()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_94() {
-    if (jj_3R_141()) return true;
+  private boolean jj_3R_62() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_142()) jj_scanpos = xsp;
+    if (jj_3R_120()) {
+    jj_scanpos = xsp;
+    if (jj_3R_121()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_50() {
-    if (jj_3R_89()) return true;
+  private boolean jj_3_36() {
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  private boolean jj_3R_54() {
+  private boolean jj_3R_103() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_56()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_93()) {
-    jj_scanpos = xsp;
-    if (jj_3R_94()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_140()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_93() {
-    if (jj_3R_139()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_140()) jj_scanpos = xsp;
+  private boolean jj_3R_104() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_24()) return true;
+    if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
   private boolean jj_3_33() {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  private boolean jj_3R_147() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_146()) return true;
+  private boolean jj_3R_28() {
+    if (jj_3R_65()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  private boolean jj_3R_26() {
-    if (jj_3R_57()) return true;
+  private boolean jj_3_32() {
+    if (jj_3R_33()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_46() {
+    if (jj_3R_56()) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_99()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
+    if (jj_3R_103()) {
+    jj_scanpos = xsp;
+    if (jj_3R_104()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3_32() {
-    if (jj_3R_31()) return true;
+  private boolean jj_3R_61() {
+    if (jj_3R_119()) return true;
     return false;
   }
 
-  private boolean jj_3R_53() {
-    if (jj_3R_92()) return true;
+  private boolean jj_3R_60() {
+    if (jj_3R_118()) return true;
     return false;
   }
 
-  private boolean jj_3R_52() {
-    if (jj_3R_91()) return true;
+  private boolean jj_3_31() {
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  private boolean jj_3_31() {
-    if (jj_3R_30()) return true;
+  private boolean jj_3R_102() {
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_51() {
+  private boolean jj_3R_59() {
     if (jj_scan_token(WHERE)) return true;
-    if (jj_3R_90()) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
   private boolean jj_3_35() {
     if (jj_scan_token(DOT)) return true;
-    if (jj_3R_29()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_22() {
+  private boolean jj_3R_81() {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_101() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_24()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_24() {
     if (jj_scan_token(SELECT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_49()) jj_scanpos = xsp;
+    if (jj_3R_57()) jj_scanpos = xsp;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_50()) return true;
+    if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_51()) jj_scanpos = xsp;
+    if (jj_3R_59()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_52()) jj_scanpos = xsp;
+    if (jj_3R_60()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_53()) jj_scanpos = xsp;
+    if (jj_3R_61()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_54()) jj_scanpos = xsp;
+    if (jj_3R_62()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_144() {
-    if (jj_3R_99()) return true;
+  private boolean jj_3R_57() {
+    if (jj_3R_115()) return true;
     return false;
   }
 
-  private boolean jj_3R_49() {
-    if (jj_3R_88()) return true;
+  private boolean jj_3_34() {
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  private boolean jj_3_34() {
-    if (jj_3R_33()) return true;
+  private boolean jj_3R_100() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_56()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_139()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_176() {
-    if (jj_3R_32()) return true;
+  private boolean jj_3R_136() {
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  private boolean jj_3R_85() {
-    if (jj_3R_26()) return true;
+  private boolean jj_3R_135() {
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  private boolean jj_3R_175() {
-    if (jj_3R_31()) return true;
+  private boolean jj_3_62() {
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_138() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_59()) return true;
+  private boolean jj_3R_45() {
+    if (jj_3R_56()) return true;
+    if (jj_3R_99()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_101()) {
+    jj_scanpos = xsp;
+    if (jj_3R_102()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_174() {
-    if (jj_3R_30()) return true;
+  private boolean jj_3R_134() {
+    if (jj_3R_32()) return true;
     return false;
   }
 
   private boolean jj_3_3() {
-    if (jj_3R_22()) return true;
+    if (jj_3R_24()) return true;
     return false;
   }
 
-  private boolean jj_3R_208() {
+  private boolean jj_3R_207() {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_135() {
-    if (jj_3R_23()) return true;
+  private boolean jj_3_37() {
+    if (jj_scan_token(0)) return true;
     return false;
   }
 
@@ -5764,7 +6124,7 @@ private boolean jj_3R_135() {
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[87];
+  final private int[] jj_la1 = new int[85];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -5776,18 +6136,18 @@ private boolean jj_3R_135() {
       jj_la1_init_3();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x8c08000,0x0,0x3e0,0x20000000,0x0,0x20000000,0x88d08000,0x800,0x400000,0x800000,0x2000000,0xc000000,0xe000000,0xe000000,0x88d08000,0x1000,0x800,0x8c08000,0x0,0x800,0x0,0x100000,0x0,0x0,0x0,0x0,0x8c08000,0x0,0x100000,0x0,0x0,0x0,0x0,0x100000,0x0,0x20000000,0x88d08000,0x0,0x8d08000,0x100000,0x0,0x0,0x0,0x0,0x0,0x88d08000,0x0,0x0,0x88d08000,0x80000000,0x8c08000,0x0,0x0,0x0,0x0,0x60,0x8c08000,0x0,0x80000,0x40000,0x0,0x88d08000,0x0,0x88d08000,0x0,0x88d08000,0x0,0x88d08000,0x0,0x88d08000,0x0,0x88d08000,0x0,0x0,0x0,0x0,0x88c08000,0x8c08000,0x50000000,0x50000000,0x0,0x8c08000,0x50000000,0x50000000,0x0,0xc000000,0x0,};
+      jj_la1_0 = new int[] {0x8c08000,0x0,0x3e0,0x20000000,0x0,0x20000000,0x88d08000,0x800,0x400000,0x800000,0x2000000,0xc000000,0xe000000,0xe000000,0x88d08000,0x1000,0x800,0x8c08000,0x0,0x800,0x0,0x100000,0x0,0x0,0x0,0x0,0x8c08000,0x0,0x100000,0x0,0x0,0x0,0x0,0x100000,0x0,0x20000000,0x88d08000,0x0,0x8d08000,0x100000,0x0,0x0,0x0,0x0,0x0,0x88d08000,0x0,0x0,0x88d08000,0x80000000,0x8c08000,0x0,0x0,0x0,0x0,0x0,0x0,0x60,0x8c08000,0x0,0x80000,0x40000,0x0,0x0,0x88d08000,0x0,0x88d08000,0x0,0x88d08000,0x0,0x0,0x0,0x0,0x0,0x88c08000,0x8c08000,0x50000000,0x50000000,0x0,0x8c08000,0x50000000,0x50000000,0x0,0xc000000,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x2000000,0x0,0x430881,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x430881,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x20000,0x410800,0x2000000,0x20000,0x410800,0x0,0x2000000,0x20000,0x800,0x410000,0x0,0x2000000,0x80,0x10800,0x0,0x430881,0x4400000,0x30880,0x0,0x30880,0x30880,0x2000000,0x4000000,0x2000000,0x430881,0x0,0x2000000,0x430881,0x400000,0x1,0x400000,0x4400000,0x4400000,0x2000000,0x0,0x440080,0x0,0x0,0x0,0x0,0x470881,0x70000000,0x470881,0x2000000,0x430881,0x2000000,0x430881,0x2000000,0x430881,0x70000000,0x470881,0x2000000,0x440000,0x2000000,0x440000,0x420001,0x81,0x0,0x0,0x2000000,0x81,0x0,0x0,0x2000000,0x0,0x2000000,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x2000000,0x0,0x470881,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x470881,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x20000,0x410800,0x2000000,0x20000,0x410800,0x0,0x2000000,0x20000,0x800,0x410000,0x0,0x2000000,0x80,0x10800,0x0,0x470881,0x4400000,0x30880,0x0,0x30880,0x30880,0x2000000,0x4000000,0x2000000,0x470881,0x0,0x2000000,0x470881,0x400000,0x1,0x400000,0x0,0x0,0x0,0x0,0x2000000,0x0,0x440080,0x0,0x0,0x0,0x70000000,0x2000000,0x470881,0x2000000,0x470881,0x2000000,0x470881,0x70000000,0x2000000,0x440000,0x2000000,0x440000,0x460001,0x81,0x0,0x0,0x2000000,0x81,0x0,0x0,0x2000000,0x0,0x2000000,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x1000,0x0,0x0,0x0,0x0,0x3006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x0,0x1000,0x0,0x0,0x3006,0x0,0x1006,0x0,0x0,0x0,0x0,0x0,0x0,0x1006,0x2000,0x0,0x1006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1006,0x78,0x1006,0x0,0x1006,0x0,0x1006,0x0,0x1006,0x78,0x1006,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x1000,0x0,0x0,0x0,0x0,0x3006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x0,0x1000,0x0,0x0,0x3006,0x0,0x1006,0x0,0x0,0x0,0x0,0x0,0x0,0x1006,0x2000,0x0,0x1006,0x0,0x0,0x0,0x1800,0x1800,0x6000,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x78,0x0,0x1006,0x0,0x1006,0x0,0x1006,0x78,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x2802,0x0,0x0,0x0,0x0,0x0,0x2802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2802,0x0,0x0,0x7e802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2802,0x0,0x2802,0x0,0x400000,0x400000,0x0,0x0,0x0,0x402802,0x0,0x0,0x402802,0x0,0x2802,0x0,0x0,0x0,0x0,0x0,0x4fe802,0x3c000,0x0,0x0,0x1,0x402802,0x84,0x402802,0x0,0x402802,0x0,0x402802,0x0,0x402802,0x94,0x402802,0x0,0x0,0x0,0x0,0x2802,0x402802,0x0,0x0,0x0,0x402802,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_3 = new int[] {0x2802,0x0,0x0,0x0,0x0,0x0,0x2802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2802,0x0,0x0,0x7e802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2802,0x0,0x2802,0x0,0x400000,0x400000,0x0,0x0,0x0,0x402802,0x0,0x0,0x402802,0x0,0x2802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4fe802,0x3c000,0x0,0x0,0x84,0x0,0x402802,0x0,0x402802,0x0,0x402802,0x94,0x0,0x0,0x0,0x0,0x2802,0x402802,0x0,0x0,0x0,0x402802,0x0,0x0,0x0,0x0,0x0,};
    }
-  final private JJCalls[] jj_2_rtns = new JJCalls[50];
+  final private JJCalls[] jj_2_rtns = new JJCalls[62];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -5802,7 +6162,7 @@ public OrientSql(java.io.InputStream stream, String encoding) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 85; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5818,7 +6178,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
     jj_ntk = -1;
     jjtree.reset();
     jj_gen = 0;
-    for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 85; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5829,7 +6189,7 @@ public OrientSql(java.io.Reader stream) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 85; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5841,7 +6201,7 @@ public void ReInit(java.io.Reader stream) {
     jj_ntk = -1;
     jjtree.reset();
     jj_gen = 0;
-    for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 85; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5851,7 +6211,7 @@ public OrientSql(OrientSqlTokenManager tm) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 85; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5862,7 +6222,7 @@ public void ReInit(OrientSqlTokenManager tm) {
     jj_ntk = -1;
     jjtree.reset();
     jj_gen = 0;
-    for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 85; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5979,7 +6339,7 @@ public ParseException generateParseException() {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 87; i++) {
+    for (int i = 0; i < 85; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -6024,7 +6384,7 @@ final public void disable_tracing() {
 
   private void jj_rescan_token() {
     jj_rescan = true;
-    for (int i = 0; i < 50; i++) {
+    for (int i = 0; i < 62; i++) {
     try {
       JJCalls p = jj_2_rtns[i];
       do {
@@ -6081,6 +6441,18 @@ private void jj_rescan_token() {
             case 47: jj_3_48(); break;
             case 48: jj_3_49(); break;
             case 49: jj_3_50(); break;
+            case 50: jj_3_51(); break;
+            case 51: jj_3_52(); break;
+            case 52: jj_3_53(); break;
+            case 53: jj_3_54(); break;
+            case 54: jj_3_55(); break;
+            case 55: jj_3_56(); break;
+            case 56: jj_3_57(); break;
+            case 57: jj_3_58(); break;
+            case 58: jj_3_59(); break;
+            case 59: jj_3_60(); break;
+            case 60: jj_3_61(); break;
+            case 61: jj_3_62(); break;
           }
         }
         p = p.next;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlTreeConstants.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlTreeConstants.java
index c33e5f6ed3a..5c8cff5e3b3 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlTreeConstants.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlTreeConstants.java
@@ -36,50 +36,55 @@ public interface OrientSqlTreeConstants
   public int JJTSUFFIXIDENTIFIER = 30;
   public int JJTBASEIDENTIFIER = 31;
   public int JJTMODIFIER = 32;
-  public int JJTOPERATIONCHAIN = 33;
-  public int JJTFROMCLAUSE = 34;
-  public int JJTFROMITEM = 35;
-  public int JJTCLUSTER = 36;
-  public int JJTMETADATAIDENTIFIER = 37;
-  public int JJTINDEXIDENTIFIER = 38;
-  public int JJTWHERECLAUSE = 39;
-  public int JJTORBLOCK = 40;
-  public int JJTANDBLOCK = 41;
-  public int JJTNOTBLOCK = 42;
-  public int JJTPARENTHESISBLOCK = 43;
-  public int JJTCONDITIONBLOCK = 44;
-  public int JJTCOMPAREOPERATOR = 45;
-  public int JJTLTOPERATOR = 46;
-  public int JJTGTOPERATOR = 47;
-  public int JJTNEOPERATOR = 48;
-  public int JJTNEQOPERATOR = 49;
-  public int JJTGEOPERATOR = 50;
-  public int JJTLEOPERATOR = 51;
-  public int JJTLIKEOPERATOR = 52;
-  public int JJTCONTAINSKEYOPERATOR = 53;
-  public int JJTCONTAINSVALUEOPERATOR = 54;
-  public int JJTEQUALSCOMPAREOPERATOR = 55;
-  public int JJTBINARYCONDITION = 56;
-  public int JJTCONTAINSVALUECONDITION = 57;
-  public int JJTINSTANCEOFCONDITION = 58;
-  public int JJTINDEXMATCHCONDITION = 59;
-  public int JJTBETWEENCONDITION = 60;
-  public int JJTISNULLCONDITION = 61;
-  public int JJTISNOTNULLCONDITION = 62;
-  public int JJTISDEFINEDCONDITION = 63;
-  public int JJTISNOTDEFINEDCONDITION = 64;
-  public int JJTCONTAINSCONDITION = 65;
-  public int JJTINOPERATOR = 66;
-  public int JJTINCONDITION = 67;
-  public int JJTNOTINCONDITION = 68;
-  public int JJTCONTAINSALLCONDITION = 69;
-  public int JJTCONTAINSTEXTCONDITION = 70;
-  public int JJTMATCHESCONDITION = 71;
-  public int JJTORDERBY = 72;
-  public int JJTGROUPBY = 73;
-  public int JJTLIMIT = 74;
-  public int JJTSKIP = 75;
-  public int JJTITEMSCOLLECTION = 76;
+  public int JJTEXPRESSION = 33;
+  public int JJTADDEXPRESSION = 34;
+  public int JJTMULTEXPRESSION = 35;
+  public int JJTFIRSTLEVELEXPRESSION = 36;
+  public int JJTPARENTHESISEXPRESSION = 37;
+  public int JJTBASEEXPRESSION = 38;
+  public int JJTFROMCLAUSE = 39;
+  public int JJTFROMITEM = 40;
+  public int JJTCLUSTER = 41;
+  public int JJTMETADATAIDENTIFIER = 42;
+  public int JJTINDEXIDENTIFIER = 43;
+  public int JJTWHERECLAUSE = 44;
+  public int JJTORBLOCK = 45;
+  public int JJTANDBLOCK = 46;
+  public int JJTNOTBLOCK = 47;
+  public int JJTPARENTHESISBLOCK = 48;
+  public int JJTCONDITIONBLOCK = 49;
+  public int JJTCOMPAREOPERATOR = 50;
+  public int JJTLTOPERATOR = 51;
+  public int JJTGTOPERATOR = 52;
+  public int JJTNEOPERATOR = 53;
+  public int JJTNEQOPERATOR = 54;
+  public int JJTGEOPERATOR = 55;
+  public int JJTLEOPERATOR = 56;
+  public int JJTLIKEOPERATOR = 57;
+  public int JJTCONTAINSKEYOPERATOR = 58;
+  public int JJTCONTAINSVALUEOPERATOR = 59;
+  public int JJTEQUALSCOMPAREOPERATOR = 60;
+  public int JJTBINARYCONDITION = 61;
+  public int JJTCONTAINSVALUECONDITION = 62;
+  public int JJTINSTANCEOFCONDITION = 63;
+  public int JJTINDEXMATCHCONDITION = 64;
+  public int JJTBETWEENCONDITION = 65;
+  public int JJTISNULLCONDITION = 66;
+  public int JJTISNOTNULLCONDITION = 67;
+  public int JJTISDEFINEDCONDITION = 68;
+  public int JJTISNOTDEFINEDCONDITION = 69;
+  public int JJTCONTAINSCONDITION = 70;
+  public int JJTINOPERATOR = 71;
+  public int JJTINCONDITION = 72;
+  public int JJTNOTINCONDITION = 73;
+  public int JJTCONTAINSALLCONDITION = 74;
+  public int JJTCONTAINSTEXTCONDITION = 75;
+  public int JJTMATCHESCONDITION = 76;
+  public int JJTORDERBY = 77;
+  public int JJTGROUPBY = 78;
+  public int JJTLIMIT = 79;
+  public int JJTSKIP = 80;
+  public int JJTITEMSCOLLECTION = 81;
 
 
   public String[] jjtNodeName = {
@@ -116,7 +121,12 @@ public interface OrientSqlTreeConstants
     ""SuffixIdentifier"",
     ""BaseIdentifier"",
     ""Modifier"",
-    ""OperationChain"",
+    ""Expression"",
+    ""AddExpression"",
+    ""MultExpression"",
+    ""FirstLevelExpression"",
+    ""ParenthesisExpression"",
+    ""BaseExpression"",
     ""FromClause"",
     ""FromItem"",
     ""Cluster"",
@@ -162,4 +172,4 @@ public interface OrientSqlTreeConstants
     ""ItemsCollection"",
   };
 }
-/* JavaCC - OriginalChecksum=e4a7b68957736371017b18d00849dd6b (do not edit this line) */
+/* JavaCC - OriginalChecksum=32bd5d04b0c5f09958ac6070e2fb1471 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlVisitor.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlVisitor.java
index 11bb2703496..f1232e1e3a5 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlVisitor.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OrientSqlVisitor.java
@@ -37,7 +37,12 @@ public interface OrientSqlVisitor
   public Object visit(OSuffixIdentifier node, Object data);
   public Object visit(OBaseIdentifier node, Object data);
   public Object visit(OModifier node, Object data);
-  public Object visit(OOperationChain node, Object data);
+  public Object visit(OExpression node, Object data);
+  public Object visit(OAddExpression node, Object data);
+  public Object visit(OMultExpression node, Object data);
+  public Object visit(OFirstLevelExpression node, Object data);
+  public Object visit(OParenthesisExpression node, Object data);
+  public Object visit(OBaseExpression node, Object data);
   public Object visit(OFromClause node, Object data);
   public Object visit(OFromItem node, Object data);
   public Object visit(OCluster node, Object data);
@@ -82,4 +87,4 @@ public interface OrientSqlVisitor
   public Object visit(OSkip node, Object data);
   public Object visit(OItemsCollection node, Object data);
 }
-/* JavaCC - OriginalChecksum=e2f9d1bcf3918bcf9c72fbcf31aad8ae (do not edit this line) */
+/* JavaCC - OriginalChecksum=44cf72d5aee82dcb49d4eb47c7f0a576 (do not edit this line) */"
6d6e2da437fe7857251c6fc0f2058655e04ed400,restlet-framework-java, - Fixed latest issues. Submitted by Thierry- Boileau.--,c,https://github.com/restlet/restlet-framework-java,"diff --git a/module/com.noelios.restlet.ext.jdbc_3.0/src/com/noelios/restlet/ext/jdbc/RowSetRepresentation.java b/module/com.noelios.restlet.ext.jdbc_3.0/src/com/noelios/restlet/ext/jdbc/RowSetRepresentation.java
index 12a99ac375..21bce52839 100644
--- a/module/com.noelios.restlet.ext.jdbc_3.0/src/com/noelios/restlet/ext/jdbc/RowSetRepresentation.java
+++ b/module/com.noelios.restlet.ext.jdbc_3.0/src/com/noelios/restlet/ext/jdbc/RowSetRepresentation.java
@@ -64,8 +64,6 @@ private static WebRowSet create(ResultSet resultSet) throws SQLException {
 			result.populate(resultSet);
 		}
 
-		result.release();
-
 		return result;
 	}"
fdca041d78e409a32454ea0afa94eacedfc30ef6,Mylyn Reviews,"322734: display review task without result in summary table
",a,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
index 9cd94ab5..2497d432 100644
--- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
@@ -27,8 +27,11 @@
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryModel;
 import org.eclipse.mylyn.reviews.core.model.review.Patch;
+import org.eclipse.mylyn.reviews.core.model.review.Rating;
 import org.eclipse.mylyn.reviews.core.model.review.Review;
+import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
 import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
+import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
 import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
 import org.eclipse.mylyn.tasks.core.IRepositoryModel;
 import org.eclipse.mylyn.tasks.core.ITask;
@@ -51,7 +54,7 @@ public static List<ReviewSubTask> getReviewSubTasksFor(
 			for (ITask subTask : taskContainer.getChildren()) {
 				if (!ReviewsUtil.hasReviewMarker(subTask)) {
 					TaskData taskData = taskDataManager.getTaskData(subTask);
-					if(getReviewAttachments(repositoryModel, taskData).size()>0){
+					if (getReviewAttachments(repositoryModel, taskData).size() > 0) {
 						ReviewsUtil.markAsReview(subTask);
 					}
 				}
@@ -61,14 +64,20 @@ public static List<ReviewSubTask> getReviewSubTasksFor(
 					for (Review review : getReviewAttachmentFromTask(
 							taskDataManager, repositoryModel, subTask)) {
 						// TODO change to latest etc
-						if (review.getResult() != null)
-							resultList.add(new ReviewSubTask(
-									getPatchFile(review.getScope()),
-									getPatchCreationDate(review.getScope()),
-									getAuthorString(review.getScope()), subTask
-											.getOwner(), review.getResult()
-											.getRating(), review.getResult()
-											.getText(), subTask));
+						ReviewResult result = review.getResult();
+						if (result == null) {
+							result = ReviewFactory.eINSTANCE
+									.createReviewResult();
+							result.setRating(Rating.NONE);
+							result.setText("""");
+						}
+						resultList.add(new ReviewSubTask(getPatchFile(review
+								.getScope()), getPatchCreationDate(review
+								.getScope()),
+								getAuthorString(review.getScope()), subTask
+										.getOwner(), result.getRating(), result
+										.getText(), subTask));
+
 					}
 				}
 			}
@@ -169,7 +178,7 @@ public static List<Review> getReviewAttachmentFromTask(
 				}
 
 			}
- 
+
 			if (lastReview != null) {
 				reviews.addAll(parseAttachments(lastReview.getTaskAttribute(),
 						new NullProgressMonitor()));
@@ -223,5 +232,5 @@ public static void markAsReview(ITask task) {
 	public static boolean hasReviewMarker(ITask task) {
 		return task.getAttribute(ReviewConstants.ATTR_REVIEW_FLAG) != null;
 	}
- 
+
 }"
327a21ef21e8806ea23ac346e02b084906977df5,arquillian$arquillian-graphene,"ARQGRA-207: Page Fragments: support initialization of Page Fragments
which are without @Root field, Exceptions for handling more than one
root refactored, unit tests for checcking that feature added, AbstractPageFragmentStub moved to tests
",a,https://github.com/arquillian/arquillian-graphene,"diff --git a/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializingPageFragments.java b/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializingPageFragments.java
index e6e56750f..2f02a872b 100644
--- a/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializingPageFragments.java
+++ b/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializingPageFragments.java
@@ -29,6 +29,7 @@
 
 import org.jboss.arquillian.drone.api.annotation.Drone;
 import org.jboss.arquillian.graphene.context.GrapheneContext;
+import org.jboss.arquillian.graphene.enricher.fragment.AbstractPageFragmentStub;
 import org.jboss.arquillian.graphene.enricher.page.EmbeddedPage;
 import org.jboss.arquillian.graphene.enricher.page.TestPage;
 import org.jboss.arquillian.graphene.spi.annotations.Page;
diff --git a/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage.java b/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage.java
index f65219d95..3b1464b60 100644
--- a/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage.java
+++ b/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage.java
@@ -21,7 +21,7 @@
  */
 package org.jboss.arquillian.graphene.enricher.page;
 
-import org.jboss.arquillian.graphene.enricher.AbstractPageFragmentStub;
+import org.jboss.arquillian.graphene.enricher.fragment.AbstractPageFragmentStub;
 import org.jboss.arquillian.graphene.spi.annotations.Page;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
diff --git a/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage2.java b/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage2.java
index 983db9112..4817060d7 100644
--- a/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage2.java
+++ b/graphene-webdriver/graphene-webdriver-ftest/src/test/java/org/jboss/arquillian/graphene/enricher/page/TestPage2.java
@@ -1,6 +1,6 @@
 package org.jboss.arquillian.graphene.enricher.page;
 
-import org.jboss.arquillian.graphene.enricher.AbstractPageFragmentStub;
+import org.jboss.arquillian.graphene.enricher.fragment.AbstractPageFragmentStub;
 import org.jboss.arquillian.graphene.spi.annotations.Page;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
diff --git a/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/Factory.java b/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/Factory.java
index ddc81492c..1819092f9 100644
--- a/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/Factory.java
+++ b/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/Factory.java
@@ -45,28 +45,31 @@ public class Factory {
      * Returns initialized Page Fragment of given type. It means that all fields annotated with <code>@FindBy</code> and
      * <code>@Page</code> annotations are initialized properly.
      * 
-     * @param clazz
-     * @param <T> the implementation of Page Fragment
-     * @param the root element to set to the initialized Page Fragment
+     * @param clazzOfPageFragment the class of concrete Page Fragment implementation which will be initialized
+     * @param rootOfPageFragment the root of the Page Fragment to reference its parts from it
+     * @return properly initialized page fragment
      */
-    public static <T> T initializePageFragment(Class<T> clazz, final WebElement root) {
-        if (clazz == null) {
-            throw new IllegalArgumentException(""Non of the parameters can be null!"");
+    public static <T> T initializePageFragment(Class<T> clazzOfPageFragment, final WebElement rootOfPageFragment) {
+        if (rootOfPageFragment == null || clazzOfPageFragment == null) {
+            throw new IllegalArgumentException(""Non of the parameters can be null! Your parameters: "" + clazzOfPageFragment
+                + "", "" + rootOfPageFragment);
         }
 
-        T pageFragment = instantiatePageFragment(clazz);
+        T pageFragment = instantiatePageFragment(clazzOfPageFragment);
 
-        List<Field> fields = ReflectionHelper.getFieldsWithAnnotation(clazz, Root.class);
+        List<Field> fields = ReflectionHelper.getFieldsWithAnnotation(clazzOfPageFragment, Root.class);
         int fieldSize = fields.size();
         if (fieldSize > 1) {
-            throw new IllegalArgumentException(""The Page Fragment"" + pageFragment.getClass()
-                + ""can not have more than one field annotated with Root annotation! Your fields with @Root annotation: ""
+            throw new IllegalArgumentException(""The Page Fragment "" + pageFragment.getClass()
+                + "" can not have more than one field annotated with Root annotation! Your fields with @Root annotation: ""
                 + fields);
         }
-        setObjectToField(fields.get(0), pageFragment, root);
+        if (fieldSize == 1) {
+            setObjectToField(fields.get(0), pageFragment, rootOfPageFragment);
+        }
 
-        fields = ReflectionHelper.getFieldsWithAnnotation(clazz, FindBy.class);
-        initNotPageFragmentsFields(fields, pageFragment, root);
+        fields = ReflectionHelper.getFieldsWithAnnotation(clazzOfPageFragment, FindBy.class);
+        initNotPageFragmentsFields(fields, pageFragment, rootOfPageFragment);
 
         return pageFragment;
     }
diff --git a/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/PageFragmentsEnricher.java b/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/PageFragmentsEnricher.java
index 0081c1c70..f087a70be 100644
--- a/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/PageFragmentsEnricher.java
+++ b/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/PageFragmentsEnricher.java
@@ -144,20 +144,34 @@ private TypeVariable<?>[] getSuperClassTypeParameters(Object testCase) {
         return typeParameters;
     }
 
-    private void initPageFragmentsFields(List<Field> fields, Object object) {
+    private void initPageFragmentsFields(List<Field> fields, Object objectToSetPageFragment) {
         for (Field pageFragmentField : fields) {
 
-            // sets the root of the Page Fragment, retrieved from annotation
+            Class<?> implementationClass = pageFragmentField.getType();
+
+            String errorMsgBegin = ""The Page Fragment: "" + implementationClass + "" declared in ""
+                + objectToSetPageFragment.getClass() + "" can not be initialized properly. The possible reason is: "";
+
             FindBy findBy = pageFragmentField.getAnnotation(FindBy.class);
             final By by = Factory.getReferencedBy(findBy);
 
+            if (by == null) {
+                throw new IllegalArgumentException(errorMsgBegin
+                    + ""Your declaration of Page Fragment in tests is annotated with @FindBy without any ""
+                    + ""parameters, in other words without reference to root of the particular Page Fragment on the page!"");
+            }
+
             WebElement rootElement = Factory.setUpTheProxyForWebElement(by, null);
 
-            // initialise Page Fragment
-            Class<?> implementationClass = pageFragmentField.getType();
-            Object pageFragment = Factory.initializePageFragment(implementationClass, rootElement);
+            Object pageFragment = null;
+            try {
+                pageFragment = Factory.initializePageFragment(implementationClass, rootElement);
+
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException(errorMsgBegin + ex.getMessage(), ex);
+            }
 
-            Factory.setObjectToField(pageFragmentField, object, pageFragment);
+            Factory.setObjectToField(pageFragmentField, objectToSetPageFragment, pageFragment);
         }
     }
 
diff --git a/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestFactoryClass.java b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializePageFragment.java
similarity index 94%
rename from graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestFactoryClass.java
rename to graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializePageFragment.java
index 8d68cecea..3fbd3235d 100644
--- a/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestFactoryClass.java
+++ b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestInitializePageFragment.java
@@ -5,13 +5,14 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Matchers.anyString;
 
+import org.jboss.arquillian.graphene.enricher.fragment.AbstractPageFragmentStub;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-public class TestFactoryClass {
+public class TestInitializePageFragment {
 
     private AbstractPageFragmentStub abstrPageFragmentStub;
 
diff --git a/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestSettingOfRootToPageFragment.java b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestSettingOfRootToPageFragment.java
new file mode 100644
index 000000000..6e6066d3a
--- /dev/null
+++ b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/TestSettingOfRootToPageFragment.java
@@ -0,0 +1,75 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.arquillian.graphene.enricher;
+
+import org.jboss.arquillian.graphene.enricher.fragment.AbstractPageFragmentStub;
+import org.jboss.arquillian.graphene.enricher.fragment.WrongPageFragmentTooManyRoots;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+/**
+ * @author Juraj Huska
+ */
+public class TestSettingOfRootToPageFragment {
+
+    @SuppressWarnings(""unused"")
+    @FindBy
+    private AbstractPageFragmentStub pageFragmentStub;
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private final String errorMsgTooMuchRoots = ""can not have more than one field annotated with Root annotation!"";
+    private final String errorMsgPassingNullRoot = ""Non of the parameters can be null!"";
+    private final String errorMsgDeclaringPageFragmentWithoutRootReference = ""in other words without reference to root of the particular Page Fragment on the page!"";
+
+    @Test
+    public void testWrongFragmentDeclaredWithTooManyRoots() {
+        thrown.expect(IllegalArgumentException.class);
+        thrown.expectMessage(errorMsgTooMuchRoots);
+
+        WebElement root = Mockito.mock(WebElement.class);
+        Factory.initializePageFragment(WrongPageFragmentTooManyRoots.class, root);
+    }
+
+    @Test
+    public void testInitPageFragmentWithNullRoot() {
+        thrown.expect(IllegalArgumentException.class);
+        thrown.expectMessage(errorMsgPassingNullRoot);
+
+        Factory.initializePageFragment(AbstractPageFragmentStub.class, null);
+    }
+
+    @Test
+    public void testInitPageFragment() {
+        thrown.expect(IllegalArgumentException.class);
+        thrown.expectMessage(errorMsgDeclaringPageFragmentWithoutRootReference);
+
+        PageFragmentsEnricher enricher = new PageFragmentsEnricher();
+
+        enricher.enrich(this);
+    }
+}
diff --git a/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/AbstractPageFragmentStub.java b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/fragment/AbstractPageFragmentStub.java
similarity index 98%
rename from graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/AbstractPageFragmentStub.java
rename to graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/fragment/AbstractPageFragmentStub.java
index 2ea318171..1386f6ee2 100644
--- a/graphene-webdriver/graphene-webdriver-impl/src/main/java/org/jboss/arquillian/graphene/enricher/AbstractPageFragmentStub.java
+++ b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/fragment/AbstractPageFragmentStub.java
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.arquillian.graphene.enricher;
+package org.jboss.arquillian.graphene.enricher.fragment;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ public class AbstractPageFragmentStub {
 
     @Root
     private WebElement root;
-
+    
     @FindBy(className = ""classNameRef"")
     private WebElement locatorRefByClassName;
 
diff --git a/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/fragment/WrongPageFragmentTooManyRoots.java b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/fragment/WrongPageFragmentTooManyRoots.java
new file mode 100644
index 000000000..1c51c67b6
--- /dev/null
+++ b/graphene-webdriver/graphene-webdriver-impl/src/test/java/org/jboss/arquillian/graphene/enricher/fragment/WrongPageFragmentTooManyRoots.java
@@ -0,0 +1,17 @@
+package org.jboss.arquillian.graphene.enricher.fragment;
+
+import org.jboss.arquillian.graphene.spi.annotations.Root;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+public class WrongPageFragmentTooManyRoots {
+
+    @Root
+    private WebElement root1;
+    
+    @Root
+    private WebElement root2;
+    
+    @FindBy(className=""randomClassName"")
+    private WebElement foo;
+}"
b016ab3c37483aa42e0fb1831b5015da9ebd18f0,incf$eeg-database,"Added Transactional to all services.
Added repeateble stimulus to addScenarioForm (but i cant tested it).
Added functionality for Group set as default checkbox.
Added functionality for Private experiment checkbox.
Error messages in validator are now from properties file.
",p,https://github.com/incf/eeg-database,"diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Stimulus.java b/src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Stimulus.java
index a93ac90f..87182f1d 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Stimulus.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Stimulus.java
@@ -4,6 +4,7 @@
 import cz.zcu.kiv.eegdatabase.data.annotation.SolrId;
 import cz.zcu.kiv.eegdatabase.data.indexing.IndexField;
 import cz.zcu.kiv.eegdatabase.wui.core.common.StimulusFacade;
+import org.apache.wicket.extensions.ajax.markup.html.autocomplete.IAutoCompletable;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.persistence.*;
@@ -20,7 +21,7 @@
  */
 @Entity
 @javax.persistence.Table(name=""STIMULUS"")
-public class Stimulus implements Serializable {
+public class Stimulus implements Serializable, IAutoCompletable {
 
     @SolrId
     @Id
@@ -65,4 +66,9 @@ public Set<StimulusRel> getStimulusRels() {
     public void setStimulusRels(Set<StimulusRel> stimulusRels) {
         this.stimulusRels = stimulusRels;
     }
+
+    @Override
+    public String getAutoCompleteData() {
+        return description;
+    }
 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.java
index b90fa6dc..ef884f03 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.java
@@ -77,6 +77,9 @@ public class EEGDataBaseApplication extends AuthenticatedWebApplication implemen
     private SoftwareFacade softwareFacade;
     @Autowired
     private WeatherFacade weatherFacade;
+    @Autowired
+    private StimulusFacade stimulusFacade;
+
 
     public java.lang.Class<? extends Page> getHomePage() {
 
@@ -182,6 +185,7 @@ protected IConverterLocator newConverterLocator() {
         locator.set(Hardware.class, new HardwareConverter(hardwareFacade));
         locator.set(Software.class, new SoftwareConverter(softwareFacade));
         locator.set(Weather.class, new WeatherConverter(weatherFacade));
+        locator.set(Stimulus.class, new StimulusConverter(stimulusFacade));
 
         return locator;
     }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentEnvironmentForm.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentEnvironmentForm.java
index 076d5409..feb1870b 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentEnvironmentForm.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentEnvironmentForm.java
@@ -12,6 +12,7 @@
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
@@ -34,10 +35,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class AddExperimentEnvironmentForm extends Form<Experiment> {
 
@@ -62,12 +60,16 @@ public class AddExperimentEnvironmentForm extends Form<Experiment> {
 
     private List<Hardware> hwListForModel;
     private List<Software> swListForModel;
+    private List<Hardware> hwChoices;
+    private List<Software> swChoices;
+    private List<Weather> weatherChoices;
     private Weather weatherForModel;
     private Integer integerForModel;
     private String environmentNoteForModel;
     private GenericModel<Weather> weatherModel;
     private List<GenericModel<Disease>> diseases;
     private List<GenericModel<Pharmaceutical>> pharmaceuticals;
+    RepeatableInputPanel<Disease> repeatableD;
 
     public AddExperimentEnvironmentForm(String id, Experiment experiment){
         super(id);
@@ -86,7 +88,8 @@ public AddExperimentEnvironmentForm(String id, Experiment experiment){
 
     private void addHardware(){
         hwListForModel = new ArrayList<Hardware>();
-        hw = new ListMultipleChoice(""hardwares"", new GenericModel(hwListForModel), getHardwares()).setMaxRows(SELECT_ROWS);
+        hwChoices = getHardwares();
+        hw = new ListMultipleChoice(""hardwares"", new GenericModel(hwListForModel), hwChoices).setMaxRows(SELECT_ROWS);
         hw.setLabel(ResourceUtils.getModel(""label.hardware""));
         hw.setRequired(true);
 
@@ -101,7 +104,8 @@ private void addHardware(){
 
     private void addSoftware(){
         swListForModel = new ArrayList<Software>();
-        sw = new ListMultipleChoice(""softwares"", new GenericModel(swListForModel), getSoftwares()).setMaxRows(SELECT_ROWS);
+        swChoices = getSoftwares();
+        sw = new ListMultipleChoice(""softwares"", new GenericModel(swListForModel), swChoices).setMaxRows(SELECT_ROWS);
         sw.setLabel(ResourceUtils.getModel(""label.software""));
         sw.setRequired(true);
 
@@ -116,8 +120,9 @@ private void addSoftware(){
 
     private void addWeather(){
         weatherForModel = new Weather();
+        weatherChoices = getWeathers();
         weatherModel = new GenericModel<Weather>(weatherForModel);
-        weather = new DropDownChoice(""weather"", weatherModel, getWeathers());
+        weather = new DropDownChoice(""weather"", weatherModel, weatherChoices);
         weather.setRequired(true);
         weather.setLabel(ResourceUtils.getModel(""label.weather""));
         weather.setNullValid(true);
@@ -168,11 +173,11 @@ private void addDisease() {
         GenericFactory<Disease> factory = new GenericFactory<Disease>(Disease.class);
         GenericValidator<Disease> validator = new GenericValidator<Disease>(diseaseFacade);
 
-        RepeatableInputPanel<Disease> repeatable =
+        repeatableD =
                 new RepeatableInputPanel<Disease>(""diseases"", factory,
                         validator, diseaseFacade);
-        diseases = repeatable.getData();
-        add(repeatable);
+        diseases = repeatableD.getData();
+        add(repeatableD);
     }
 
     private void addPharmaceutical() {
@@ -203,6 +208,11 @@ private void createModalWindows(){
                 ""addWeather"", AddWeatherPage.class.getName());
     }
 
+    public void resetComponentModels(){
+        this.sw.setEnabled(false);
+        this.sw.setEnabled(true);
+    }
+
     public void validateForm(){
         validate();
     }
@@ -220,6 +230,19 @@ private List<Software> getSoftwares(){
         return softwareFacade.getAllRecords();
     }
 
+    public void updateSoftwares(){
+        this.sw.updateModel();
+        this.add(sw);
+    }
+
+    public void updateHardwares(){
+        hw.setChoices(getHardwares());
+    }
+
+    public void updateWeathers(){
+        //weather.setChoices(getWeathers());
+    }
+
     private List<Hardware> getHardwares(){
         return hardwareFacade.getAllRecords();
     }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentScenarioForm.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentScenarioForm.java
index fa14fa08..f09be1bc 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentScenarioForm.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentScenarioForm.java
@@ -2,6 +2,7 @@
 
 import cz.zcu.kiv.eegdatabase.data.pojo.*;
 import cz.zcu.kiv.eegdatabase.logic.Util;
+import cz.zcu.kiv.eegdatabase.wui.app.session.EEGDataBaseSession;
 import cz.zcu.kiv.eegdatabase.wui.components.utils.ResourceUtils;
 import cz.zcu.kiv.eegdatabase.wui.core.common.ProjectTypeFacade;
 import cz.zcu.kiv.eegdatabase.wui.core.group.ResearchGroupFacade;
@@ -25,6 +26,8 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponentLabel;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
 import java.sql.Timestamp;
@@ -58,21 +61,41 @@ public class AddExperimentScenarioForm extends Form<Experiment> {
     private GenericModel<Person> testedSubject;
     private List<GenericModel<Person>> coExperimenters;
 
+    private CheckBox isPrivateExperiment;
+    private boolean privateExperiment = false;
+
+    private CheckBox isDefaultGroup;
+    private boolean defaultGroup = false;
+
     public AddExperimentScenarioForm(String id, Experiment experiment) {
         super(id);
         this.experiment = experiment;
 
         addScenario();
         addResearchGroup();
+        addPrivateExperimentCheckBox();
         addProject();
         addStartDate();
         addEndDate();
         addTestedSubject();
         addCoExperimenters();
-
         createModalWindows();
     }
 
+    private void addPrivateExperimentCheckBox() {
+        isPrivateExperiment = new CheckBox(""isPrivateExperiment"", new Model(privateExperiment));
+        isPrivateExperiment.add(new AjaxFormComponentUpdatingBehavior(""onchange"") {
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                if (privateExperiment) privateExperiment = false;
+                else privateExperiment = true;
+                isPrivateExperiment.setModelObject(privateExperiment);
+                target.add(isPrivateExperiment);
+            }
+        });
+        add(isPrivateExperiment);
+    }
+
     private void addEndDate() {
         Date now = new Date();
         if(scenarioEntity != null){
@@ -136,7 +159,16 @@ private void addResearchGroup() {
         add(researchGroup);
         add(repeatableFeedback);
 
-        CheckBox isDefaultGroup = new CheckBox(""isDefaultGroup"");
+        isDefaultGroup = new CheckBox(""isDefaultGroup"", new Model(defaultGroup));
+        isDefaultGroup.add(new AjaxFormComponentUpdatingBehavior(""onchange"") {
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                if (defaultGroup) defaultGroup = false;
+                else defaultGroup = true;
+                isDefaultGroup.setModelObject(defaultGroup);
+                target.add(isDefaultGroup);
+            }
+        });
         add(isDefaultGroup);
     }
 
@@ -334,10 +366,17 @@ public void save() {
             experiment.setEndTime(new Timestamp(this.endDate.getObject().getTime()));
             experiment.setStartTime(new Timestamp(this.startDate.getObject().getTime()));
             experiment.setProjectTypes(getSet(this.projectType));
-            experiment.setResearchGroup(this.researchGroup.getObject());
+            ResearchGroup group = this.researchGroup.getObject();
+            if (this.isDefaultGroup.getModelObject()){
+                Person loggedUser = EEGDataBaseSession.get().getLoggedUser();
+                loggedUser.setDefaultGroup(group);
+                personFacade.update(loggedUser);
+            }
+            experiment.setResearchGroup(group);
             experiment.setScenario(this.scenario.getObject());
             experiment.setPersonBySubjectPersonId(this.testedSubject.getObject());
             experiment.setPersons(getSet(this.coExperimenters));
+            experiment.setPrivateExperiment(this.isPrivateExperiment.getModelObject());
         }
     }
 
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage$TabPanel1.html b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage$TabPanel1.html
index 8529319c..25da8d6a 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage$TabPanel1.html
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage$TabPanel1.html
@@ -27,6 +27,13 @@
             <input type=""checkbox"" name=""defaultGroup"" wicket:id=""isDefaultGroup"" value=""isDefault"">Set as default
         </div>
 
+        <div class=""form-item"">
+            <label for=""isPrivateExperiment"">
+                <wicket:message key=""label.private"">Private</wicket:message>
+            </label>
+            <input type=""checkbox"" name=""isPrivateExperiment"" wicket:id=""isPrivateExperiment"" value=""isPrivate"">Set as private
+        </div>
+
         <div class=""form-item"">
             <label for=""project"">
                 <wicket:message key=""label.projectType"">Project type</wicket:message>
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage.java
index 154b98df..129d4f2a 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage.java
@@ -145,6 +145,18 @@ public AddExperimentResultsForm getResultsForm(){
         return resultsForm;
     }
 
+    public void updateSw(){
+        this.environmentForm.updateSoftwares();
+    }
+
+    public void updateHw(){
+        this.environmentForm.updateHardwares();
+    }
+
+    public void updateWeather(){
+        this.environmentForm.updateWeathers();
+    }
+
 
     @Override
     public void renderHead(IHeaderResponse response) {
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/converters/StimulusConverter.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/converters/StimulusConverter.java
new file mode 100644
index 00000000..e649da19
--- /dev/null
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/converters/StimulusConverter.java
@@ -0,0 +1,32 @@
+package cz.zcu.kiv.eegdatabase.wui.ui.experiments.converters;
+
+import cz.zcu.kiv.eegdatabase.data.pojo.Stimulus;
+import cz.zcu.kiv.eegdatabase.wui.core.common.StimulusFacade;
+import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.string.Strings;
+
+import java.util.List;
+import java.util.Locale;
+
+public class StimulusConverter implements IConverter<Stimulus> {
+    private StimulusFacade stimulusFacade;
+
+    public StimulusConverter(StimulusFacade stimulusFacade){
+        this.stimulusFacade = stimulusFacade;
+    }
+
+    @Override
+    public Stimulus convertToObject(String s, Locale locale) {
+        if(Strings.isEmpty(s)){
+            return null;
+        }
+
+        List<Stimulus> stimuluses = stimulusFacade.readByParameter(""description"", s);
+        return (stimuluses != null && stimuluses.size() > 0) ? stimuluses.get(0) : null;
+    }
+
+    @Override
+    public String convertToString(Stimulus stimulus, Locale locale) {
+        return stimulus.getAutoCompleteData();
+    }
+}
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/HardwareForm.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/HardwareForm.java
index fdab610a..951a0be2 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/HardwareForm.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/HardwareForm.java
@@ -3,6 +3,7 @@
 import cz.zcu.kiv.eegdatabase.data.pojo.Hardware;
 import cz.zcu.kiv.eegdatabase.wui.components.utils.ResourceUtils;
 import cz.zcu.kiv.eegdatabase.wui.core.common.HardwareFacade;
+import cz.zcu.kiv.eegdatabase.wui.ui.experiments.WizardTabbedPanelPage;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -73,6 +74,10 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                             else {
                                 hardwareFacade.createDefaultRecord(newHw);
                             }
+                            WizardTabbedPanelPage parent = (WizardTabbedPanelPage)window.getParent().getPage();
+                            if (parent != null){
+                                parent.updateHw();
+                            }
                             window.close(target);
                         }
                     }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/ScenarioForm.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/ScenarioForm.java
index 8a41ccec..ec7abdce 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/ScenarioForm.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/ScenarioForm.java
@@ -1,9 +1,8 @@
 package cz.zcu.kiv.eegdatabase.wui.ui.experiments.forms;
 
-import cz.zcu.kiv.eegdatabase.data.pojo.ResearchGroup;
-import cz.zcu.kiv.eegdatabase.data.pojo.Scenario;
-import cz.zcu.kiv.eegdatabase.data.pojo.ScenarioTypeNonXml;
+import cz.zcu.kiv.eegdatabase.data.pojo.*;
 import cz.zcu.kiv.eegdatabase.wui.app.session.EEGDataBaseSession;
+import cz.zcu.kiv.eegdatabase.wui.core.common.StimulusFacade;
 import cz.zcu.kiv.eegdatabase.wui.core.group.ResearchGroupFacade;
 import cz.zcu.kiv.eegdatabase.wui.core.scenarios.ScenariosFacade;
 import cz.zcu.kiv.eegdatabase.wui.core.scenarios.type.ScenarioTypeFacade;
@@ -12,7 +11,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
+import org.apache.wicket.extensions.ajax.markup.html.autocomplete.*;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
@@ -32,10 +31,7 @@
 import org.apache.wicket.validation.IValidator;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by IntelliJ IDEA.
@@ -53,6 +49,12 @@ public class ScenarioForm extends Form<Scenario> {
     @SpringBean
     private ResearchGroupFacade researchGroupFacade;
 
+    @SpringBean
+    private StimulusFacade stimulusFacade;
+
+    private List<GenericModel<Stimulus>> stimuluses;
+
+
 
     public ScenarioForm(String id, final ModalWindow window) {
         super(id, new CompoundPropertyModel<Scenario>(new Scenario()));
@@ -101,6 +103,15 @@ protected Iterator<String> getChoices(String input)
         add(new TextArea<String>(""description"").setRequired(true));
         add(new CheckBox(""availableFile""));
 
+        GenericFactory<Stimulus> factory = new GenericFactory<Stimulus>(Stimulus.class);
+        GenericValidator<Stimulus> validator = new GenericValidator<Stimulus>(stimulusFacade);
+
+        RepeatableInputPanel repeatable =
+                new RepeatableInputPanel<Stimulus>(""stimuluses"", factory,
+                        validator, stimulusFacade);
+        stimuluses = repeatable.getData();
+        add(repeatable);
+
         setMultiPart(true);
         final FileUploadField fileUpload = new FileUploadField(""dataFile"");
         add(fileUpload);
@@ -144,11 +155,28 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                             scenario.setPerson(EEGDataBaseSession.get().getLoggedUser());
                             Integer scenarioID = scenariosFacade.create(scenario);
                             scenario.setScenarioId(scenarioID);
-
+                            Set<Stimulus> ss = getSet(stimuluses);
+                            Set<StimulusRel> sr = new HashSet<StimulusRel>(ss.size());
+                            for (Stimulus s : ss){
+                                StimulusRel str = new StimulusRel();
+                                str.setScenario(scenario);
+                                str.setStimulus(s);
+                                sr.add(str);
+                            }
+                            scenario.setStimulusRels(sr);
+                            scenariosFacade.update(scenario);
                             scenarioTypeFacade.create(scenarioTypeNonXml);
                             window.close(target);
                         }
                     }
+
+                    private Set getSet(List objects) {
+                        Set result = new HashSet();
+                        for(Object object: objects) {
+                            result.add(((GenericModel) object).getObject());
+                        }
+                        return result;
+                    }
                 }.add(new AjaxEventBehavior(""onclick"") {
                     @Override
                     protected void onEvent(AjaxRequestTarget target) {
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/SoftwareForm.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/SoftwareForm.java
index c47e9f44..8fb56742 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/SoftwareForm.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/SoftwareForm.java
@@ -4,6 +4,7 @@
 import cz.zcu.kiv.eegdatabase.wui.components.utils.ResourceUtils;
 import cz.zcu.kiv.eegdatabase.wui.core.common.SoftwareFacade;
 import cz.zcu.kiv.eegdatabase.wui.ui.experiments.AddExperimentEnvironmentForm;
+import cz.zcu.kiv.eegdatabase.wui.ui.experiments.WizardTabbedPanelPage;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -67,10 +68,14 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     target.add(feedback);
                     if(!hasError()){
                         if (newSw.getDefaultNumber() == 0){
-                            facade.create(newSw);
+                            //facade.create(newSw);
                         }
                         else {
-                            facade.createDefaultRecord(newSw);
+                            //facade.createDefaultRecord(newSw);
+                        }
+                        WizardTabbedPanelPage parent = (WizardTabbedPanelPage)window.getParent().getPage();
+                        if (parent != null){
+                            parent.updateSw();
                         }
                         window.close(target);
                     }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/WeatherForm.java b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/WeatherForm.java
index f4d1ea53..bf3067d0 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/WeatherForm.java
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/forms/WeatherForm.java
@@ -3,6 +3,7 @@
 import cz.zcu.kiv.eegdatabase.data.pojo.Weather;
 import cz.zcu.kiv.eegdatabase.wui.components.utils.ResourceUtils;
 import cz.zcu.kiv.eegdatabase.wui.core.common.WeatherFacade;
+import cz.zcu.kiv.eegdatabase.wui.ui.experiments.WizardTabbedPanelPage;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -62,6 +63,10 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     target.add(feedback);
                     if(!hasError()){
                         facade.create(newW);
+                        WizardTabbedPanelPage parent = (WizardTabbedPanelPage)window.getParent().getPage();
+                        if (parent != null){
+                            parent.updateWeather();
+                        }
                         window.close(target);
                     }
                 }
diff --git a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/modals/AddScenarioPage.html b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/modals/AddScenarioPage.html
index a3d303ab..24e0a8cf 100644
--- a/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/modals/AddScenarioPage.html
+++ b/src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/modals/AddScenarioPage.html
@@ -39,6 +39,13 @@ <h1 wicket:id=""addScenarioHeader""></h1>
                  <textarea wicket:id=""description"" rows=""3"" cols=""40""></textarea>
             </div>
 
+            <div class=""form-sub-item"">
+                <label for=""stimulusesLabel"">
+                    <wicket:message key=""label.stimuluses"">Stimuluses</wicket:message>
+                </label>
+                <div wicket:id=""stimuluses""></div>
+            </div>
+
             <div class=""form-sub-item"">
                 <label for=""availableFile"">
                     <wicket:message key=""label.availableDataFile"">Available data file</wicket:message>
diff --git a/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/GenericValidator.java b/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/GenericValidator.java
index c95354dd..cef4c264 100644
--- a/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/GenericValidator.java
+++ b/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/GenericValidator.java
@@ -1,5 +1,6 @@
 package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
 
+import cz.zcu.kiv.eegdatabase.wui.components.utils.ResourceUtils;
 import cz.zcu.kiv.eegdatabase.wui.core.GenericFacade;
 import org.apache.wicket.validation.INullAcceptingValidator;
 import org.apache.wicket.validation.IValidatable;
@@ -25,16 +26,16 @@ public GenericValidator(GenericFacade<T, Integer> service){
     public void validate(IValidatable<T> validatable) {
         T validatableEntity = validatable.getValue();
         if(validatableEntity == null) {
-            error(validatable, ""You are trying to add nonexisting Entity."");
+            error(validatable, ResourceUtils.getString(""error.YouAreTryingToAddNonexistingEntity""));
             return;
         }
         List<T> resultEntitites = service.getUnique(validatableEntity);
         if(resultEntitites.size() == 1) {
             // It is valid
         } else if(resultEntitites.size() > 1) {
-            error(validatable, ""There are more entities with same name."");
+            error(validatable, ResourceUtils.getString(""error.ThereAreMoreEntitiesWithSameName""));
         } else {
-            error(validatable, ""You are trying to add nonexisting Entity."");
+            error(validatable, ResourceUtils.getString(""error.YouAreTryingToAddNonexistingEntity""));
         }
     }
 
diff --git a/src/main/resources/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.properties b/src/main/resources/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.properties
index b5f7bfeb..293999c8 100644
--- a/src/main/resources/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.properties
+++ b/src/main/resources/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.properties
@@ -291,6 +291,8 @@ error.generalError.message=An application error occured.
 error.generalError.title=Application error
 error.notSuitable=This experiment is not suitable for EEG processing services because this experiment does not contain .vhdr and .eeg or .avg file type.
 error.outOfMemory=The binary data size is too high for used method.
+error.YouAreTryingToAddNonexistingEntity=You are trying to add nonexisting entity
+error.ThereAreMoreEntitiesWithSameName=There are more entities with same name.
 form.note.dateFormatDDMMYYYY=Date format DD/MM/YYYY.
 form.note.dateFormatDDMMYYYYHHMM=Date format for field Start time and End time is DD/MM/YYYY HH:mm or DD/MM/YYYY.
 form.note.timeFormatHHMM=Time format HH:MM.
@@ -451,6 +453,7 @@ label.selectResearchGroup=Select research group
 label.startDate=Start date
 label.startDateTime=Start date and time
 label.stimulus=Stimulus
+label.stimuluses=Stimuluses
 label.atom=Count of atoms
 label.wavelets=Wavelets
 label.subjectPerson=Subject person"
59b8a139d72463fbf324e851a9e6daf918fe1b22,spring-framework,JndiObjectFactoryBean explicitly only chooses- public interfaces as default proxy interfaces (SPR-5869)--,c,https://github.com/spring-projects/spring-framework,"diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
index 9914e0dbdae3..504a96ad8c64 100644
--- a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
+++ b/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.jndi;
 
 import java.lang.reflect.Method;
-
+import java.lang.reflect.Modifier;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
@@ -295,7 +295,12 @@ private static Object createJndiObjectProxy(JndiObjectFactoryBean jof) throws Na
 					throw new IllegalStateException(
 							""Cannot deactivate 'lookupOnStartup' without specifying a 'proxyInterface' or 'expectedType'"");
 				}
-				proxyFactory.setInterfaces(ClassUtils.getAllInterfacesForClass(targetClass, jof.beanClassLoader));
+				Class[] ifcs = ClassUtils.getAllInterfacesForClass(targetClass, jof.beanClassLoader);
+				for (Class ifc : ifcs) {
+					if (Modifier.isPublic(ifc.getModifiers())) {
+						proxyFactory.addInterface(ifc);
+					}
+				}
 			}
 			if (jof.exposeAccessContext) {
 				proxyFactory.addAdvice(new JndiContextExposingInterceptor(jof.getJndiTemplate()));"
2d6a57d5727d4db527caffd7827d60bb2e303846,camel,CAMEL-3014 camel-josql should have SQL language- META-INF which can be found automatically by camel-core--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@980675 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/camel,"diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index a7eed13eef4b4..72ddef0a64ca6 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -64,7 +64,13 @@
 
     <dependency>
       <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
+      <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java b/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java
new file mode 100644
index 0000000000000..99d458286d71f
--- /dev/null
+++ b/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.sql;
+
+import javax.xml.namespace.QName;
+
+import org.apache.camel.Expression;
+import org.apache.camel.IsSingleton;
+import org.apache.camel.Predicate;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.sql.SqlBuilder;
+import org.apache.camel.builder.xml.XPathBuilder;
+import org.apache.camel.spi.Language;
+import org.josql.QueryParseException;
+
+/**
+ * XPath language.
+ *
+ * @version $Revision$
+ */
+public class SqlLanguage implements Language, IsSingleton {
+   
+    public Predicate createPredicate(String expression) {
+        try {
+            SqlBuilder builder = SqlBuilder.sql(expression);
+            return builder;
+        } catch (QueryParseException e) {
+            RuntimeException exception = new RuntimeCamelException(""Canont create the SqlBuilder."", e);
+            throw exception;
+        }
+        
+    }
+
+    public Expression createExpression(String expression) {
+        try {
+            SqlBuilder builder = SqlBuilder.sql(expression);
+            return builder;
+        } catch (QueryParseException e) {
+            RuntimeException exception = new RuntimeCamelException(""Canont create the SqlBuilder."", e);
+            throw exception;
+        }
+    }
+    
+    public boolean isSingleton() {
+        return false;
+    }
+}
diff --git a/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/sql b/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/sql
new file mode 100644
index 0000000000000..dce8f091373f0
--- /dev/null
+++ b/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/sql
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the ""License""); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an ""AS IS"" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class=org.apache.camel.language.sql.SqlLanguage
diff --git a/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java b/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
index 96a6785b7004f..ef9bc1927c30b 100644
--- a/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
+++ b/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
@@ -24,6 +24,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.test.junit4.TestSupport;
 import org.junit.Before;
 import org.junit.Test;
@@ -33,9 +34,9 @@
 /**
  * @version $Revision$
  */
-public class SqlTest extends TestSupport {
+public class SqlTest extends CamelTestSupport {
 
-    protected CamelContext context = new DefaultCamelContext();
+    //protected CamelContext context = new DefaultCamelContext();
     protected Exchange exchange;
 
     @Test
@@ -79,7 +80,8 @@ public void testPredicateWithHeaderVariable() throws Exception {
     }
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() throws Exception {        
+        super.setUp();
         exchange = createExchange();
     }
 
diff --git a/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java b/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java
new file mode 100644
index 0000000000000..3058dd1c68d0d
--- /dev/null
+++ b/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.lanaguage.sql;
+
+import java.util.List;
+
+import org.apache.camel.Expression;
+import org.apache.camel.builder.sql.Person;
+import org.apache.camel.builder.sql.SqlTest;
+import org.apache.camel.spi.Language;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class SqlLanguageTest extends SqlTest {
+
+    @Test
+    public void testExpression() throws Exception {
+        Language language = assertResolveLanguage(getLanguageName());
+
+        Expression expression = language.createExpression(""SELECT * FROM org.apache.camel.builder.sql.Person where city = 'London'"");        
+        List value = expression.evaluate(exchange, List.class);
+
+        List list = (List)value;
+        assertEquals(""List size"", 2, list.size());
+
+        for (Object person : list) {
+            log.info(""Found: "" + person);
+        }
+    }
+
+    @SuppressWarnings(""unchecked"")
+    @Test
+    public void testExpressionWithHeaderVariable() throws Exception {
+        Language language = assertResolveLanguage(getLanguageName());
+
+        Expression expression = language.createExpression(""SELECT * FROM org.apache.camel.builder.sql.Person where name = :fooHeader"");
+        List value = expression.evaluate(exchange, List.class);
+
+        List<Person> list = (List<Person>)value;
+        assertEquals(""List size"", 1, list.size());
+
+        for (Person person : list) {
+            log.info(""Found: "" + person);
+
+            assertEquals(""name"", ""James"", person.getName());
+        }
+    }
+
+    @Test
+    public void testPredicates() throws Exception {
+        Language language = assertResolveLanguage(getLanguageName());
+        assertPredicate(language.createPredicate(""SELECT * FROM org.apache.camel.builder.sql.Person where city = 'London'""), exchange, true);
+        assertPredicate(language.createPredicate(""SELECT * FROM org.apache.camel.builder.sql.Person where city = 'Manchester'""), exchange, false);
+    }
+
+    @Test
+    public void testPredicateWithHeaderVariable() throws Exception {
+        Language language = assertResolveLanguage(getLanguageName());
+        assertPredicate(language.createPredicate(""SELECT * FROM org.apache.camel.builder.sql.Person where name = :fooHeader""), exchange, true);
+    }
+
+    protected String getLanguageName() {
+        return ""sql"";
+    }
+    
+}"
589edc7aec4e95e8249f99dc703bb799203ac89f,Vala,"Copy default_expression in FormalParameter.copy
",c,https://github.com/GNOME/vala/,"diff --git a/vala/valaformalparameter.vala b/vala/valaformalparameter.vala
index 6212b6c836..e01ad49faf 100644
--- a/vala/valaformalparameter.vala
+++ b/vala/valaformalparameter.vala
@@ -207,6 +207,7 @@ public class Vala.FormalParameter : Symbol {
 			var result = new FormalParameter (name, parameter_type, source_reference);
 			result.params_array = params_array;
 			result.direction = this.direction;
+			result.default_expression = this.default_expression;
 			return result;
 		} else {
 			return new FormalParameter.with_ellipsis ();"
c3a1bbd206678a74f06a2ee2320b3547e26c3d43,drools,JBRULES-1520: moving test to correct test file--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@19375 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,p,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
index 6faeee4fdc9..0f4aa59cbbc 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
@@ -82,6 +82,34 @@ public void testCollect() throws Exception {
                              results.get( 0 ).getClass().getName() );
     }
 
+    public void testCollectNodeSharing() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_collectNodeSharing.drl"" ) ) );
+        final Package pkg = builder.getPackage();
+
+        RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        ruleBase    = SerializationHelper.serializeObject(ruleBase);
+        final WorkingMemory workingMemory = ruleBase.newStatefulSession();
+
+        final List list = new ArrayList();
+        workingMemory.setGlobal( ""results"",
+                                 list );
+
+        workingMemory.insert( new Cheese( ""stilton"",
+                                          10 ) );
+        workingMemory.insert( new Cheese( ""brie"",
+                                          15 ) );
+
+        workingMemory.fireAllRules();
+
+        assertEquals( 1,
+                      list.size() );
+
+        assertEquals( 2,
+                      ((List) list.get( 0 )).size() );
+    }
+
     public void testCollectModify() throws Exception {
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( ""test_Collect.drl"" ) );
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
index 7e8b54a5575..74a51f95268 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
@@ -3065,34 +3065,6 @@ public void testContainsInArray() throws Exception {
                       list.get( 1 ) );
     }
 
-    public void testCollectNodeSharing() throws Exception {
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_collectNodeSharing.drl"" ) ) );
-        final Package pkg = builder.getPackage();
-
-        RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        ruleBase    = SerializationHelper.serializeObject(ruleBase);
-        final WorkingMemory workingMemory = ruleBase.newStatefulSession();
-
-        final List list = new ArrayList();
-        workingMemory.setGlobal( ""results"",
-                                 list );
-
-        workingMemory.insert( new Cheese( ""stilton"",
-                                          10 ) );
-        workingMemory.insert( new Cheese( ""brie"",
-                                          15 ) );
-
-        workingMemory.fireAllRules();
-
-        assertEquals( 1,
-                      list.size() );
-
-        assertEquals( 2,
-                      ((List) list.get( 0 )).size() );
-    }
-
     public void testNodeSharingNotExists() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_nodeSharingNotExists.drl"" ) ) );"
abccb450e65d2f38188911c4470a29240bb9292e,Delta Spike,"ignore log files
",p,https://github.com/apache/deltaspike,"diff --git a/.gitignore b/.gitignore
index c05fd79e9..6e0d613b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ atlassian-ide-plugin.xml
 deltaspike/core/impl/data
 deltaspike/modules/jsf/impl/data
 deltaspike/modules/security/impl/data
+*.log"
8f9979da7a75cb91a46e47e61bf35a41c8ff8083,Vala,"gtkmodule: Ensure child gtypes are initialized before creating the template

Fixes bug 720282
",a,https://github.com/GNOME/vala/,"diff --git a/codegen/valagtkmodule.vala b/codegen/valagtkmodule.vala
index 603ec6076f..b6c9c300e5 100644
--- a/codegen/valagtkmodule.vala
+++ b/codegen/valagtkmodule.vala
@@ -1,4 +1,3 @@
-
 /* valagtkmodule.vala
  *
  * Copyright (C) 2013  Jürg Billeter
@@ -32,6 +31,8 @@ public class Vala.GtkModule : GSignalModule {
 	private HashMap<string, Signal> current_handler_to_signal_map = new HashMap<string, Signal>(str_hash, str_equal);
 	/* GtkBuilder xml child to Vala class mapping */
 	private HashMap<string, Class> current_child_to_class_map = new HashMap<string, Class>(str_hash, str_equal);
+	/* Required custom application-specific gtype classes to be ref'd before initializing the template */
+	private HashSet<Class> current_required_app_classes = new HashSet<Class>();
 
 	private void ensure_cclass_to_vala_map () {
 		// map C name of gtypeinstance classes to Vala classes
@@ -199,6 +200,8 @@ public class Vala.GtkModule : GSignalModule {
 		call.add_argument (new CCodeIdentifier (""GTK_WIDGET_CLASS (klass)""));
 		call.add_argument (new CCodeConstant (""\""""+cl.get_attribute_string (""GtkTemplate"", ""ui"")+""\""""));
 		ccode.add_expression (call);
+
+		current_required_app_classes.clear ();
 	}
 
 	public override void visit_field (Field f) {
@@ -261,6 +264,10 @@ public class Vala.GtkModule : GSignalModule {
 		ccode.add_expression (call);
 
 		pop_context ();
+		
+		if (!field_class.external && !field_class.external_package) {
+			current_required_app_classes.add (field_class);
+		}
 	}
 
 	public override void visit_method (Method m) {
@@ -307,11 +314,18 @@ public class Vala.GtkModule : GSignalModule {
 	}
 
 
-	public override void generate_instance_init (Class cl) {
+	public override void end_instance_init (Class cl) {
 		if (cl == null || cl.error || !is_gtk_template (cl)) {
 			return;
 		}
 
+		foreach (var req in current_required_app_classes) {
+			/* ensure custom application widgets are initialized */
+			var call = new CCodeFunctionCall (new CCodeIdentifier (""g_type_ensure""));
+			call.add_argument (get_type_id_expression (SemanticAnalyzer.get_data_type_for_symbol (req)));
+			ccode.add_expression (call);
+		}
+		
 		var call = new CCodeFunctionCall (new CCodeIdentifier (""gtk_widget_init_template""));
 		call.add_argument (new CCodeIdentifier (""GTK_WIDGET (self)""));
 		ccode.add_expression (call);
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 5fd74a05a7..26778eba4e 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1166,7 +1166,7 @@ public class Vala.GTypeModule : GErrorModule {
 	public virtual void generate_class_init (Class cl) {
 	}
 
-	public virtual void generate_instance_init (Class cl) {
+	public virtual void end_instance_init (Class cl) {
 	}
 
 	private void begin_class_init_function (Class cl) {
@@ -1573,12 +1573,14 @@ public class Vala.GTypeModule : GErrorModule {
 			func.add_assignment (new CCodeMemberAccess.pointer (new CCodeIdentifier (""self""), ""priv""), ccall);
 		}
 
-		generate_instance_init (cl);
-
 		pop_context ();
 	}
 
 	private void add_instance_init_function (Class cl) {
+		push_context (instance_init_context);
+		end_instance_init (cl);
+		pop_context ();
+		
 		cfile.add_function (instance_init_context.ccode);
 	}"
077278fa9e61890e3ebb9f833ecee0e3c4655202,hadoop,YARN-2158. Improved assertion messages of- TestRMWebServicesAppsModification. Contributed by Varun Vasudev. svn merge- --ignore-ancestry -c 1608667 ../../trunk/--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608668 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f0317eda28be0..34ab9db165b2e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -340,6 +340,9 @@ Release 2.5.0 - UNRELEASED
     YARN-2250. FairScheduler.findLowestCommonAncestorQueue returns null when
     queues not identical (Krisztian Horvath via Sandy Ryza)
 
+    YARN-2158. Improved assertion messages of TestRMWebServicesAppsModification.
+    (Varun Vasudev via zjshen)
+
 Release 2.4.1 - 2014-06-23 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java
index 4c8eeb306b8ea..12c5686e3eefd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java
@@ -411,13 +411,15 @@ protected static void verifyAppStateJson(ClientResponse response,
     assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
     JSONObject json = response.getEntity(JSONObject.class);
     assertEquals(""incorrect number of elements"", 1, json.length());
+    String responseState = json.getString(""state"");
     boolean valid = false;
     for (RMAppState state : states) {
-      if (state.toString().equals(json.getString(""state""))) {
+      if (state.toString().equals(responseState)) {
         valid = true;
       }
     }
-    assertTrue(""app state incorrect"", valid);
+    String msg = ""app state incorrect, got "" + responseState;
+    assertTrue(msg, valid);
     return;
   }
 
@@ -441,7 +443,8 @@ protected static void verifyAppStateXML(ClientResponse response,
         valid = true;
       }
     }
-    assertTrue(""app state incorrect"", valid);
+    String msg = ""app state incorrect, got "" + state;
+    assertTrue(msg, valid);
     return;
   }"
9c3fba564ca4c860c1d6783458fb988883ef4f8c,hbase,HBASE-563   TestRowFilterAfterWrite erroneously- sets master address to 0.0.0.0:60100 rather than relying on conf--git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@644948 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hbase,"diff --git a/CHANGES.txt b/CHANGES.txt
index 13021466b4e9..7f510efb8cb7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ Hbase Change Log
                havoc of reassignments because open processing is done in series
    HBASE-547   UI shows hadoop version, not hbase version
    HBASE-561   HBase package does not include LICENSE.txt nor build.xml
+   HBASE-563   TestRowFilterAfterWrite erroneously sets master address to
+               0.0.0.0:60100 rather than relying on conf
 
   NEW FEATURES
    HBASE-548   Tool to online single region
diff --git a/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java b/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java
index 480dd52c964f..2a3d4331752b 100644
--- a/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java
+++ b/src/test/org/apache/hadoop/hbase/filter/TestRowFilterAfterWrite.java
@@ -88,19 +88,6 @@ public TestRowFilterAfterWrite() {
     conf.setInt(""ipc.client.timeout"", 20 * 60 * 1000);
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void setUp() throws Exception {
-    // this.conf.set(HConstants.HBASE_DIR, ""file:///opt/benchmark/hadoop/hbase"");
-    this.conf.set(HConstants.MASTER_ADDRESS, ""0.0.0.0:60100"");
-    // Must call super.setup() after starting mini dfs cluster. Otherwise
-    // we get a local file system instead of hdfs
-
-    super.setUp();
-  }
-
   /**
    * {@inheritDoc}
    */"
90e32db5350223d59e68ae252a5580c40b926477,Vala,"sqlite3: add many missing bindings
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/sqlite3.vapi b/vapi/sqlite3.vapi
index 43d71e0907..3b680e6707 100644
--- a/vapi/sqlite3.vapi
+++ b/vapi/sqlite3.vapi
@@ -29,8 +29,8 @@ namespace Sqlite {
 		public int busy_timeout (int ms);
 		public int changes ();
 		[CCode (cname = ""sqlite3_exec"")]
-		private int _exec (string sql, Callback? sqlite3_callback = null, out unowned string errmsg = null);
-		[CCode (cname = ""_vala_sqlite3_exec"")]
+		public int _exec (string sql, Callback? sqlite3_callback = null, out unowned string errmsg = null);
+		[CCode (cname = ""_sqlite3_exec"")]
 		public int exec (string sql, Callback? sqlite3_callback = null, out string errmsg = null) {
 			unowned string sqlite_errmsg;
 			var ec = this._exec (sql, sqlite3_callback, out sqlite_errmsg);
@@ -44,12 +44,13 @@ namespace Sqlite {
 		public int get_autocommit ();
 		public void interrupt ();
 		public int64 last_insert_rowid ();
+		public int limit (Sqlite.Limit id, int new_val);
 		public int total_changes ();
 		public int complete (string sql);
 		[CCode (cname = ""sqlite3_get_table"")]
-		private int _get_table (string sql, [CCode (array_length = false)] out unowned string[] resultp, out int nrow, out int ncolumn, out unowned string? errmsg = null);
+		public int _get_table (string sql, [CCode (array_length = false)] out unowned string[] resultp, out int nrow, out int ncolumn, out unowned string? errmsg = null);
 		private static void free_table ([CCode (array_length = false)] string[] result);
-		[CCode (cname = ""_vala_sqlite3_get_table"")]
+		[CCode (cname = ""_sqlite3_get_table"")]
 		public int get_table (string sql, out string[] resultp, out int nrow, out int ncolumn, out string? errmsg = null) {
 			unowned string sqlite_errmsg;
 			unowned string[] sqlite_resultp;
@@ -72,17 +73,23 @@ namespace Sqlite {
 		public static int open_v2 (string filename, out Database db, int flags = OPEN_READWRITE | OPEN_CREATE, string? zVfs = null);
 		public int errcode ();
 		public unowned string errmsg ();
+		public unowned Sqlite.Statement next_stmt (Sqlite.Statement? current);
 		public int prepare (string sql, int n_bytes, out Statement stmt, out unowned string tail = null);
 		public int prepare_v2 (string sql, int n_bytes, out Statement stmt, out unowned string tail = null);
+		public int set_authorizer (AuthorizeCallback? auth);
+		[CCode (cname = ""sqlite3_db_status"")]
+		public int status (Sqlite.DatabaseStatus op, out int pCurrent, out int pHighwater, int resetFlag = 0);
+		public int table_column_metadata (string db_name, string table_name, string column_name, out string? data_type, out string? collation_sequence, out int? not_null, out int? primary_key, out int? auto_increment);
 		public void trace (TraceCallback? xtrace);
 		public void profile (ProfileCallback? xprofile);
 		public void progress_handler (int n_opcodes, Sqlite.ProgressCallback? progress_handler);
 		public void commit_hook (CommitCallback? commit_hook);
 		public void rollback_hook (RollbackCallback? rollback_hook);
-		[CCode (simple_generics = true)]
 		public int create_function (string zFunctionName, int nArg, int eTextRep, void * user_data, UserFuncCallback? xFunc, UserFuncCallback? xStep, UserFuncFinishCallback? xFinal);
 	}
 
+	[CCode (instance_pos = 0)]
+	public delegate int AuthorizeCallback (Sqlite.Action action, string? p1, string? p2, string db_name, string? responsible);
 	[CCode (instance_pos = 0)]
 	public delegate void TraceCallback (string message);
 	[CCode (instance_pos = 0)]
@@ -95,6 +102,26 @@ namespace Sqlite {
 	[CCode (has_target = false)]
 	public delegate void UserFuncFinishCallback (Sqlite.Context context);
 
+	public unowned string? compileoption_get (int n);
+	public int compileoption_used (string option_name);
+	public static int complete (string sql);
+	[CCode (sentinel = """")]
+	public static int config (Sqlite.Config op, ...);
+	public unowned string libversion ();
+	public int libversion_number ();
+	[PrintfFormat]
+	public void log (int error_code, string format, ...);
+	public unowned string sourceid ();
+	public static int status (Sqlite.Status op, out int pCurrent, out int pHighwater, int resetFlag = 0);
+	public static int threadsafe ();
+
+	[CCode (cname = ""SQLITE_VERSION"")]
+	public const string VERSION;
+	[CCode (cname = ""SQLITE_VERSION_NUMBER"")]
+	public const int VERSION_NUMBER;
+	[CCode (cname = ""SQLITE_SOURCE_ID"")]
+	public const string SOURCE_ID;
+
 	/* Dynamically Typed Value Object */
 	[Compact]
 	[CCode (cname = ""sqlite3_value"")]
@@ -211,6 +238,88 @@ namespace Sqlite {
 	[CCode (cname = ""SQLITE_UTF16_ALIGNED"")]
 	public const int UTF16_ALIGNED;
 
+	[CCode (cname = ""int"", cprefix = ""SQLITE_"")]
+	public enum Action {
+		CREATE_INDEX,
+		CREATE_TABLE,
+		CREATE_TEMP_INDEX,
+		CREATE_TEMP_TABLE,
+		CREATE_TEMP_TRIGGER,
+		CREATE_TEMP_VIEW,
+		CREATE_TRIGGER,
+		CREATE_VIEW,
+		DELETE,
+		DROP_INDEX,
+		DROP_TABLE,
+		DROP_TEMP_INDEX,
+		DROP_TEMP_TABLE,
+		DROP_TEMP_TRIGGER,
+		DROP_TEMP_VIEW,
+		DROP_TRIGGER,
+		DROP_VIEW,
+		INSERT,
+		PRAGMA,
+		READ,
+		SELECT,
+		TRANSACTION,
+		UPDATE,
+		ATTACH,
+		DETACH,
+		ALTER_TABLE,
+		REINDEX,
+		ANALYZE,
+		CREATE_VTABLE,
+		DROP_VTABLE,
+		FUNCTION,
+		SAVEPOINT,
+		COPY
+	}
+
+	[CCode (cname = ""int"", cprefix = ""SQLITE_CONFIG_"")]
+	public enum Config {
+		SINGLETHREAD,
+		MULTITHREAD,
+		SERIALIZED,
+		MALLOC,
+		GETMALLOC,
+		SCRATCH,
+		PAGECACHE,
+		HEAP,
+		MEMSTATUS,
+		MUTEX,
+		GETMUTEX,
+		LOOKASIDE,
+		PCACHE,
+		GETPCACHE,
+		LOG,
+	}
+
+	[CCode (cname = ""int"", cprefix = ""SQLITE_DBSTATUS_"")]
+	public enum DatabaseStatus {
+		LOOKASIDE_USED
+	}
+
+	[CCode (cname = ""int"", cprefix = ""SQLITE_LIMIT_"")]
+	public enum Limit {
+		LENGTH,
+		SQL_LENGTH,
+		COLUMN,
+		EXPR_DEPTH,
+		COMPOUND_SELECT,
+		VDBE_OP,
+		FUNCTION_ARG,
+		ATTACHED,
+		LIKE_PATTERN_LENGTH,
+		VARIABLE_NUMBER,
+		TRIGGER_DEPTH
+	}
+
+	[CCode (cname = ""int"", cprefix = ""SQLITE_STMTSTATUS_"")]
+	public enum StatementStatus {
+		FULLSCAN_STEP,
+		SORT
+	}
+
 	[CCode (cname = ""int"", cprefix = ""SQLITE_STATUS_"")]
 	public enum Status {
 		MEMORY_USED,
@@ -221,12 +330,7 @@ namespace Sqlite {
 		MALLOC_SIZE,
 		PARSER_STACK,
 		PAGECACHE_SIZE,
-		SCRATCH_SIZE,
-
-		[CCode (cname = ""SQLITE_STMTSTATUS_FULLSCAN_STEP"")]
-		STMT_FULLSCAN_STEP,
-		[CCode (cname = ""SQLITE_STMTSTATUS_SORT"")]
-		STMT_SORT
+		SCRATCH_SIZE
 	}
 
 	/* SQL Statement Object */
@@ -242,7 +346,7 @@ namespace Sqlite {
 		public unowned Database db_handle ();
 		public int reset ();
 		[CCode (cname = ""sqlite3_stmt_status"")]
-		public int status (Sqlite.Status op, int resetFlg);
+		public int status (Sqlite.StatementStatus op, int resetFlg = 0);
 		public int step ();
 		public int bind_blob (int index, void* value, int n, GLib.DestroyNotify destroy_notify);
 		public int bind_double (int index, double value);
@@ -271,6 +375,14 @@ namespace Sqlite {
 		public static void* realloc (void* mem, int n_bytes);
 		[CCode (cname = ""sqlite3_free"")]
 		public static void free (void* mem);
+		[CCode (cname = ""sqlite3_release_memory"")]
+		public static int release (int bytes);
+		[CCode (cname = ""sqlite3_memory_used"")]
+		public static int64 used ();
+		[CCode (cname = ""sqlite3_memory_highwater"")]
+		public static int64 highwater (int reset = 0);
+		[CCode (cname = ""sqlite3_soft_heap_limit"")]
+		public static void soft_heap_limit (int limit);
 	}
 
 	[Compact]
@@ -279,6 +391,8 @@ namespace Sqlite {
 		[CCode (cname = ""sqlite3_mutex_alloc"")]
 		public Mutex (int mutex_type = MUTEX_RECURSIVE);
 		public void enter ();
+		public int held ();
+		public int notheld ();
 		public int @try ();
 		public void leave ();
 	}
@@ -309,5 +423,14 @@ namespace Sqlite {
 		[CCode (cname = ""sqlite3_aggregate_context"")]
 		public void * aggregate (int n_bytes);
 	}
+
+	[Compact, CCode (cname = ""sqlite3_backup"", free_function = ""sqlite3_backup_finish"", cprefix = ""sqlite3_backup_"")]
+	public class Backup {
+		[CCode (cname = ""sqlite3_backup_init"")]
+		public Backup (Database dest, string dest_name, Database source, string source_name);
+		public int step (int nPage);
+		public int remaining ();
+		public int pagecount ();
+	}
 }"
45529d30d41b8de338dfc2d26b61d1a79113c766,drools,JBRULES-2934 Add NewRegisterWorkItemHandlerCommand- to CommandFactory with unit test--,a,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/test/java/org/drools/command/RegisterWorkItemHandlerTest.java b/drools-compiler/src/test/java/org/drools/command/RegisterWorkItemHandlerTest.java
new file mode 100644
index 00000000000..ec51784363d
--- /dev/null
+++ b/drools-compiler/src/test/java/org/drools/command/RegisterWorkItemHandlerTest.java
@@ -0,0 +1,64 @@
+package org.drools.command;
+
+import static org.junit.Assert.*;
+
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseFactory;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.ResourceType;
+import org.drools.io.ResourceFactory;
+import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.impl.DefaultWorkItemManager;
+import org.drools.process.instance.impl.WorkItemImpl;
+import org.drools.runtime.StatelessKnowledgeSession;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
+import org.junit.Test;
+
+public class RegisterWorkItemHandlerTest {
+    
+    @Test
+    public void testRegisterWorkItemHandlerWithStatelessSession() {
+        String str = 
+                ""package org.drools.workitem.test \n"" +
+                ""import "" + DefaultWorkItemManager.class.getCanonicalName() + ""\n"" +
+                ""import "" + WorkItem.class.getCanonicalName() + ""\n"" +
+                ""import "" + WorkItemImpl.class.getCanonicalName() + ""\n"" + 
+                ""rule r1 when \n"" + 
+                ""then \n"" +
+                ""  WorkItem wi = new WorkItemImpl(); \n"" +
+                ""  wi.setName( \""wihandler\"" ); \n"" +
+                ""  DefaultWorkItemManager wim = ( DefaultWorkItemManager ) kcontext.getKnowledgeRuntime().getWorkItemManager(); \n"" +
+                ""  wim.internalExecuteWorkItem(wi); \n"" +
+                ""end \n"";
+     
+        KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+        kbuilder.add(  ResourceFactory.newByteArrayResource( str.getBytes() ), ResourceType.DRL );
+        
+        if ( kbuilder.hasErrors() ) {
+            fail( kbuilder.getErrors().toString() );
+        }
+        
+        KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+        
+        final boolean[] answer = new boolean[] { false };
+        StatelessKnowledgeSession ks = kbase.newStatelessKnowledgeSession();
+        ks.execute( CommandFactory.newRegisterWorkItemHandlerCommand( new WorkItemHandler() {
+            
+            public void executeWorkItem(org.drools.runtime.process.WorkItem workItem,
+                                        WorkItemManager manager) {
+                answer[0] = true;
+            }
+            
+            public void abortWorkItem(org.drools.runtime.process.WorkItem workItem,
+                                      WorkItemManager manager) {
+                // TODO Auto-generated method stub
+                
+            }
+        },  ""wihandler"" ) );
+        
+        assertTrue( answer[0] );
+    }
+}
diff --git a/drools-core/src/main/java/org/drools/command/impl/CommandFactoryServiceImpl.java b/drools-core/src/main/java/org/drools/command/impl/CommandFactoryServiceImpl.java
index a3ab9b350db..d21b72a90bc 100644
--- a/drools-core/src/main/java/org/drools/command/impl/CommandFactoryServiceImpl.java
+++ b/drools-core/src/main/java/org/drools/command/impl/CommandFactoryServiceImpl.java
@@ -32,6 +32,7 @@
 import org.drools.command.runtime.KBuilderSetPropertyCommand;
 import org.drools.command.runtime.process.AbortWorkItemCommand;
 import org.drools.command.runtime.process.CompleteWorkItemCommand;
+import org.drools.command.runtime.process.RegisterWorkItemHandlerCommand;
 import org.drools.command.runtime.process.SignalEventCommand;
 import org.drools.command.runtime.process.StartProcessCommand;
 import org.drools.command.runtime.rule.FireAllRulesCommand;
@@ -45,6 +46,7 @@
 import org.drools.command.runtime.rule.RetractCommand;
 import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
 import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.process.WorkItemHandler;
 import org.drools.runtime.rule.FactHandle;
 
 public class CommandFactoryServiceImpl implements CommandFactoryService {
@@ -186,6 +188,11 @@ public Command newAbortWorkItem(long workItemId) {
         return new AbortWorkItemCommand( workItemId);
     }
 
+    public Command newRegisterWorkItemHandlerCommand(WorkItemHandler handler,
+                                                     String workItemName) {
+        return new RegisterWorkItemHandlerCommand( workItemName, handler );
+    }    
+    
     public Command newQuery(String identifier, String name) {
         return new QueryCommand(identifier, name, null);
     }
@@ -198,10 +205,15 @@ public BatchExecutionCommand newBatchExecution(List<? extends Command> commands,
         return new BatchExecutionCommandImpl((List<GenericCommand<?>>) commands, lookup);
     }
 
+    @Deprecated
     public Command newKBuilderSetPropertyCommand(String id, String name, String value) {
         return new KBuilderSetPropertyCommand(id, name, value);
     }
     
+    public Command newKnowledgeBuilderSetPropertyCommand(String id, String name, String value) {
+        return new KBuilderSetPropertyCommand(id, name, value);
+    }    
+    
     public Command newNewKnowledgeBuilderConfigurationCommand(String localId){
         return new NewKnowledgeBuilderConfigurationCommand(localId);
     }
@@ -214,4 +226,6 @@ public Command<FactHandle> fromExternalFactHandleCommand(String factHandleExtern
             boolean disconnected) {
         return new FromExternalFactHandleCommand(factHandleExternalForm, disconnected);
     }
+
+
 }"
985c5ddb6b28fa38cabe82581e7c47a51b62f79a,Valadoc,"gtkdoc: Document implicit struct functions
",a,https://github.com/GNOME/vala/,"diff --git a/src/doclets/gtkdoc/generator.vala b/src/doclets/gtkdoc/generator.vala
index 845167c962..8829ce7283 100644
--- a/src/doclets/gtkdoc/generator.vala
+++ b/src/doclets/gtkdoc/generator.vala
@@ -560,6 +560,17 @@ It is important that your <link linkend=\""GValue\""><type>GValue</type></link> ho
 		current_dbus_interface = old_dbus_interface;
 	}
 
+	private string[]? create_see_function_array (string?[] functions) {
+		string[] arr = new string[] {};
+		foreach (string? func in functions) {
+			if (func != null) {
+				arr += func + ""()"";
+			}
+		}
+
+		return (arr.length > 0)? arr : null;
+	}
+
 	public override void visit_struct (Api.Struct st) {
 		var old_cname = current_cname;
 		var old_headers = current_headers;
@@ -575,14 +586,53 @@ It is important that your <link linkend=\""GValue\""><type>GValue</type></link> ho
 		current_cname = old_cname;
 		current_headers = old_headers;
 
-		add_symbol (st.get_filename(), st.get_dup_function_cname ());
-		add_symbol (st.get_filename(), st.get_free_function_cname ());
-
-
 		var file_data = get_file_data (st.get_filename ());
 
 		file_data.register_standard_section_line (st.get_type_macro_name ());
 		file_data.register_standard_section_line (st.get_type_function_name ());
+
+		string? dup_function_cname = st.get_dup_function_cname ();
+		string? free_function_cname = st.get_free_function_cname ();
+		string? copy_function_cname = st.get_copy_function_cname ();
+		string? destroy_function_cname = st.get_destroy_function_cname ();
+		if (dup_function_cname != null) {
+			var dup_gcomment = add_symbol (st.get_filename (), dup_function_cname);
+			dup_gcomment.headers.add (new Header (""self"", ""the instance to duplicate""));
+			if (free_function_cname != null) {
+				dup_gcomment.returns = ""a copy of @self, free with %s()"".printf (free_function_cname);
+			} else {
+				dup_gcomment.returns = ""a copy of @self"";
+			}
+
+			dup_gcomment.brief_comment = ""Creates a copy of self."";
+			dup_gcomment.see_also = create_see_function_array ({copy_function_cname, destroy_function_cname, free_function_cname});
+		}
+
+		if (free_function_cname != null) {
+			var free_gcomment = add_symbol (st.get_filename (), free_function_cname);
+			free_gcomment.headers.add (new Header (""self"", ""the struct to free""));
+			free_gcomment.brief_comment = ""Frees the heap-allocated struct."";
+			free_gcomment.see_also = create_see_function_array ({dup_function_cname, copy_function_cname, destroy_function_cname});
+		}
+
+		if (copy_function_cname != null) {
+			var copy_gcomment = add_symbol (st.get_filename (), copy_function_cname);
+			copy_gcomment.headers.add (new Header (""self"", ""the struct to copy""));
+			if (destroy_function_cname != null) {
+				copy_gcomment.headers.add (new Header (""dest"", ""a unused struct. Use %s() to free the content."".printf (destroy_function_cname)));
+			} else {
+				copy_gcomment.headers.add (new Header (""dest"", ""a unused struct.""));
+			}
+			copy_gcomment.brief_comment = ""Creates a copy of self."";
+			copy_gcomment.see_also = create_see_function_array ({dup_function_cname, destroy_function_cname, free_function_cname});
+		}
+
+		if (destroy_function_cname != null) {
+			var destroy_gcomment = add_symbol (st.get_filename (), destroy_function_cname);
+			destroy_gcomment.headers.add (new Header (""self"", ""the struct to destroy""));
+			destroy_gcomment.brief_comment = ""Frees the content of the struct pointed by @self."";
+			destroy_gcomment.see_also = create_see_function_array ({dup_function_cname, copy_function_cname, free_function_cname});
+		}
 	}
 
 	/**"
45beae1dac0ee69bffc6c3d8029e2c11c9fecf09,Mylyn Reviews,"Include TBR and Versions in build
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/pom.xml b/pom.xml
index b88db86a..b34da4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,12 +9,11 @@
 
   <modules>
     <module>releng/reviews-target-definition</module>
+    <module>tbr</module>
+    <module>versions</module>
     <module>gerrit</module>
-    <!--
-       <module>tbr</module>
-    -->
-    <module>framework</module>
     <module>r4e</module>
+    <module>framework</module>
     <module>releng/reviews-site</module>
   </modules>"
afa206e4841e5fb564911cc635862415f53243dd,duracloud$duracloud,"This update closes https://jira.duraspace.org/browse/DURACLOUD-310 , along with svn -r [849, 850, 852].
It provides the full functionality of the auditor.
The auditor listens for content events and writes them to the admin space with the primary content store.
git-svn-id: https://svn.duraspace.org/duracloud/trunk@856 1005ed41-97cd-4a8f-848c-be5b5fe45bcb
",p,https://github.com/duracloud/duracloud,"diff --git a/auditor/pom.xml b/auditor/pom.xml
index a3aaa22f2..a82a87a9c 100644
--- a/auditor/pom.xml
+++ b/auditor/pom.xml
@@ -31,11 +31,21 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!--utilities-->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
     <!-- ActiveMQ -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-all</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+    </dependency>
 
   </dependencies>
 
diff --git a/auditor/src/main/java/org/duracloud/audit/AuditListener.java b/auditor/src/main/java/org/duracloud/audit/AuditListener.java
new file mode 100644
index 000000000..dc82b5020
--- /dev/null
+++ b/auditor/src/main/java/org/duracloud/audit/AuditListener.java
@@ -0,0 +1,46 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit;
+
+import org.duracloud.storage.aop.ContentMessage;
+
+/**
+ * This class defines the contract for the listener of system storage events.
+ *
+ * @author Andrew Woods
+ *         Date: 3/19/12
+ */
+public interface AuditListener {
+
+    /**
+     * This method initializes the listener.
+     */
+    public void initialize();
+
+    /**
+     * This method is called by upon receipt of new events.
+     *
+     * @param message of event
+     */
+    public void onContentEvent(ContentMessage message);
+
+    /**
+     * This method notifies the listener to either stop or start writing events
+     * for the arg spaceId.
+     *
+     * @param spaceId over which logging of audit events will be stopped/started
+     * @param flag    indicating start or stop logging (true=start)
+     */
+    public void waitToWrite(String spaceId, boolean flag);
+
+    /**
+     * This method notifies the listener to stop logging audit events.
+     */
+    public void stop();
+
+}
diff --git a/auditor/src/main/java/org/duracloud/audit/AuditLogStore.java b/auditor/src/main/java/org/duracloud/audit/AuditLogStore.java
new file mode 100644
index 000000000..38add6143
--- /dev/null
+++ b/auditor/src/main/java/org/duracloud/audit/AuditLogStore.java
@@ -0,0 +1,57 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit;
+
+import org.duracloud.client.ContentStore;
+import org.duracloud.storage.aop.ContentMessage;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * This interface defines the contract provided by content stores that manage
+ * audit logs.
+ *
+ * @author Andrew Woods
+ *         Date: 3/19/12
+ */
+public interface AuditLogStore {
+
+    /**
+     * This method ingests the underlying ContentStore
+     *
+     * @param contentStore of auditor
+     */
+    public void initialize(ContentStore contentStore);
+
+    /**
+     * This method returns the contentIds of all audit logs associated with
+     * the arg spaceId.
+     *
+     * @param spaceId of space that was audited
+     * @return iterator of contentIds
+     */
+    public Iterator<String> logs(String spaceId);
+
+    /**
+     * This method removes the log with the arg contentId
+     *
+     * @param logContentId of log to remove
+     */
+    public void removeLog(String logContentId);
+
+    /**
+     * This method writes the arg events to the audit log. The spaceId of the
+     * audit log is determined by the arg events. All storage providers that
+     * with the same spaceId will be written to the same audit log.
+     * If not all arg events are on the same spaceId, an exception is thrown.
+     *
+     * @param events to be logged
+     */
+    public void write(List<ContentMessage> events);
+}
diff --git a/auditor/src/main/java/org/duracloud/audit/Auditor.java b/auditor/src/main/java/org/duracloud/audit/Auditor.java
index cc2a32a2b..95ee8993d 100644
--- a/auditor/src/main/java/org/duracloud/audit/Auditor.java
+++ b/auditor/src/main/java/org/duracloud/audit/Auditor.java
@@ -10,6 +10,9 @@
 import org.duracloud.audit.error.AuditLogNotFoundException;
 import org.duracloud.client.ContentStoreManager;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * The Auditor is responsible for collecting audit logs over all spaces for
  * content-related events.
@@ -19,6 +22,14 @@
  */
 public interface Auditor {
 
+    /**
+     * This structure defines the system managed spaces.
+     */
+    public static final List<String> systemSpaces = Arrays.asList(
+        ""x-duracloud-admin"",
+        ""x-service-out"",
+        ""x-service-work"");
+
     /**
      * This method initializes the Auditor by providing a handle to the content
      * store.
@@ -30,16 +41,19 @@ public interface Auditor {
     /**
      * This method creates an initial audit log, and removes any existing audit
      * log for each space.
+     *
+     * @param async true if executing asynchronously
      */
-    public void createInitialAuditLogs();
+    public void createInitialAuditLogs(boolean async);
 
     /**
      * This method returns the list of audit logs for the arg space.
      *
      * @param spaceId of the space over which auditing is requested
-     * @return list of audit logs for the arg space
+     * @return set of audit logs for the arg space
      */
-    public String getAuditLogs(String spaceId) throws AuditLogNotFoundException;
+    public List<String> getAuditLogs(String spaceId)
+        throws AuditLogNotFoundException;
 
     /**
      * This method stops the work of the Auditor.
diff --git a/auditor/src/main/java/org/duracloud/audit/impl/AuditListenerImpl.java b/auditor/src/main/java/org/duracloud/audit/impl/AuditListenerImpl.java
new file mode 100644
index 000000000..49e7f8a84
--- /dev/null
+++ b/auditor/src/main/java/org/duracloud/audit/impl/AuditListenerImpl.java
@@ -0,0 +1,167 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit.impl;
+
+import org.duracloud.audit.AuditListener;
+import org.duracloud.audit.AuditLogStore;
+import org.duracloud.audit.Auditor;
+import org.duracloud.storage.aop.ContentMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Andrew Woods
+ *         Date: 3/19/12
+ */
+public class AuditListenerImpl implements AuditListener {
+
+    private final Logger log = LoggerFactory.getLogger(AuditListenerImpl.class);
+
+    private AuditLogStore logStore;
+
+    private List<ContentMessage> events;
+    private Set<String> writeWait;
+    private Set<String> writeScheduled;
+
+    private long delay;
+    private boolean isStopped;
+
+
+    public AuditListenerImpl(AuditLogStore logStore, long delay) {
+        this.logStore = logStore;
+        this.delay = delay;
+        initialize();
+    }
+
+    public void initialize() {
+        this.events =
+            Collections.synchronizedList(new LinkedList<ContentMessage>());
+        this.writeWait = new HashSet<String>();
+        this.writeScheduled =
+            Collections.synchronizedSet(new HashSet<String>());
+        this.isStopped = false;
+    }
+
+    @Override
+    public void onContentEvent(ContentMessage message) {
+        log.info(""AuditListenerImpl.onContentEvent({})"", message);
+
+        if (isStopped) {
+            log.debug(""Not logging event, auditor is stopped"");
+            return;
+        }
+
+        if (null == message) {
+            String error = ""Arg ContentMessage is null!"";
+            log.error(error);
+            throw new IllegalArgumentException(error);
+        }
+
+        // Ignore system events.
+        if (isSystemEvent(message)) {
+            log.debug(""Not logging internal system event."");
+            return;
+        }
+
+        events.add(message);
+        scheduleWrite(message.getSpaceId());
+    }
+
+    private boolean isSystemEvent(ContentMessage message) {
+        String spaceId = message.getSpaceId();
+        return Auditor.systemSpaces.contains(spaceId);
+    }
+
+    private void scheduleWrite(String spaceId) {
+        if (!writeScheduled.contains(spaceId)) {
+            writeScheduled.add(spaceId);
+
+            EventWriter eventWriter = new EventWriter(spaceId);
+            new Thread(eventWriter).start();
+        }
+    }
+
+    @Override
+    public void waitToWrite(String spaceId, boolean flag) {
+        if (flag) {
+            writeWait.add(spaceId);
+        } else {
+            writeWait.remove(spaceId);
+        }
+    }
+
+    @Override
+    public void stop() {
+        isStopped = true;
+    }
+
+    /**
+     * This class is a helper for writing audit log events.
+     */
+    private class EventWriter implements Runnable {
+
+        private String spaceId;
+
+        public EventWriter(String spaceId) {
+            this.spaceId = spaceId;
+        }
+
+        @Override
+        public void run() {
+            long start = System.currentTimeMillis();
+            while (waitingToWrite(start)) {
+                sleep();
+            }
+            write();
+        }
+
+        private boolean waitingToWrite(long start) {
+            long now = System.currentTimeMillis();
+            boolean wait = writeWait.contains(spaceId) || (start + delay) > now;
+            log.debug(""waiting on {}? {}"", spaceId, wait);
+            return wait;
+        }
+
+        private synchronized void write() {
+            log.debug(""writing events for space: {}"", spaceId);
+
+            List<ContentMessage> msgs = new LinkedList<ContentMessage>();
+            synchronized (events) {
+
+                Iterator<ContentMessage> itr = events.iterator();
+                while (itr.hasNext()) {
+
+                    ContentMessage event = itr.next();
+                    if (spaceId.equals(event.getSpaceId())) {
+                        msgs.add(event);
+                        itr.remove();
+                    }
+                }
+            }
+
+            logStore.write(msgs);
+            writeScheduled.remove(spaceId);
+        }
+
+        private void sleep() {
+            try {
+                Thread.sleep(delay);
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+}
diff --git a/auditor/src/main/java/org/duracloud/audit/impl/AuditLogStoreImpl.java b/auditor/src/main/java/org/duracloud/audit/impl/AuditLogStoreImpl.java
new file mode 100644
index 000000000..becfa61ae
--- /dev/null
+++ b/auditor/src/main/java/org/duracloud/audit/impl/AuditLogStoreImpl.java
@@ -0,0 +1,469 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit.impl;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.duracloud.audit.AuditLogStore;
+import org.duracloud.client.ContentStore;
+import org.duracloud.common.error.DuraCloudRuntimeException;
+import org.duracloud.common.util.ChecksumUtil;
+import org.duracloud.common.util.DateUtil;
+import org.duracloud.domain.Content;
+import org.duracloud.error.ContentStoreException;
+import org.duracloud.storage.aop.ContentMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author Andrew Woods
+ *         Date: 3/19/12
+ */
+public class AuditLogStoreImpl implements AuditLogStore {
+
+    private final Logger log = LoggerFactory.getLogger(AuditLogStoreImpl.class);
+
+    private static final String newline = System.getProperty(""line.separator"");
+
+    private ContentStore contentStore;
+    private String auditLogSpaceId;
+    private String auditLogPrefix;
+    private long auditLogSizeLimit;
+
+    public AuditLogStoreImpl(String auditLogSpaceId,
+                             String auditLogPrefix,
+                             long auditLogSizeLimit) {
+        this.auditLogSpaceId = auditLogSpaceId;
+        this.auditLogPrefix = auditLogPrefix;
+        this.auditLogSizeLimit = auditLogSizeLimit;
+    }
+
+    @Override
+    public void initialize(ContentStore contentStore) {
+        this.contentStore = contentStore;
+    }
+
+    @Override
+    public Iterator<String> logs(String spaceId) {
+        checkInitialized();
+
+        List<String> logs = new ArrayList<String>();
+        Iterator<String> logsItr;
+        try {
+            logsItr = contentStore.getSpaceContents(auditLogSpaceId,
+                                                    auditLogPrefix + spaceId);
+
+        } catch (ContentStoreException e) {
+            return logs.iterator();
+        }
+
+        while (logsItr.hasNext()) {
+            String contentId = logsItr.next();
+            if (matches(contentId, spaceId)) {
+                logs.add(contentId);
+            }
+        }
+        return logs.iterator();
+    }
+
+    @Override
+    public void removeLog(String logContentId) {
+        removeLogFromLocal(logContentId);
+        removeLogFromStore(logContentId);
+    }
+
+    private void removeLogFromLocal(String logContentId) {
+        File logFile = new File(getTmpDir(), logContentId);
+        if (!logFile.exists()) {
+            log.info(""Log file !exist: {}"", logFile.getAbsolutePath());
+
+        } else {
+            log.info(""Deleting log file: {}"", logFile.getAbsolutePath());
+            FileUtils.deleteQuietly(logFile);
+        }
+    }
+
+    private void removeLogFromStore(String logContentId) {
+        boolean done = false;
+        int tries = 0;
+        final int maxTries = 3;
+        while (!done && tries++ < maxTries) {
+            try {
+                doRemoveLog(logContentId);
+                done = true;
+            } catch (ContentStoreException e) {
+                // do nothing
+            }
+        }
+
+        if (!done) {
+            StringBuilder err = new StringBuilder(""Unable to delete log, "");
+            err.append(auditLogSpaceId);
+            err.append(""/"");
+            err.append(logContentId);
+            err.append("", after "");
+            err.append(tries);
+            err.append("" tries"");
+            log.error(err.toString());
+            throw new DuraCloudRuntimeException(err.toString());
+        }
+    }
+
+    private void doRemoveLog(String logContentId) throws ContentStoreException {
+        try {
+            contentStore.deleteContent(auditLogSpaceId, logContentId);
+
+        } catch (ContentStoreException e) {
+            log.warn(""Error deleting log file: {}!"", logContentId, e);
+            throw e;
+        }
+    }
+
+    @Override
+    public void write(List<ContentMessage> events) {
+        checkInitialized();
+
+        if (null == events || events.size() == 0) {
+            log.info(""arg events are empty, nothing to write!"");
+        }
+
+        String spaceId = events.get(0).getSpaceId();
+
+        // Verify all events relate to a single space.
+        for (ContentMessage event : events) {
+            if (!spaceId.equals(event.getSpaceId())) {
+                StringBuilder err = new StringBuilder(""All arg events "");
+                err.append(""must be of the same spaceId: "");
+                err.append(spaceId);
+                err.append("" != "");
+                err.append(event.getSpaceId());
+                log.error(err.toString());
+                throw new IllegalArgumentException(err.toString());
+            }
+        }
+
+        // Get locally cached log file, or create a new file.
+        File logFile = getLogFile(spaceId);
+        boolean isNewFile = !logFile.exists();
+
+        // Write header, if necessary.
+        FileWriter fileWriter = getFileWriter(logFile);
+        if (isNewFile) {
+            write(fileWriter, ContentMessage.tsvHeader());
+        }
+
+        // Write events to log.
+        for (ContentMessage event : events) {
+            write(fileWriter, event.asTSV());
+        }
+
+        IOUtils.closeQuietly(fileWriter);
+
+        // Push log to content store.
+        addContent(logFile);
+    }
+
+    private FileWriter getFileWriter(File logFile) {
+        boolean append = true;
+        try {
+            return new FileWriter(logFile, append);
+        } catch (IOException e) {
+            throw new DuraCloudRuntimeException(e);
+        }
+    }
+
+    private void addContent(File logFile) {
+        boolean done = false;
+        int tries = 0;
+        final int maxTries = 3;
+        while (!done && tries++ < maxTries) {
+            try {
+                doAddContent(logFile);
+                done = true;
+            } catch (ContentStoreException e) {
+                // do nothing
+            }
+        }
+
+        if (!done) {
+            StringBuilder err = new StringBuilder(""Unable to add audit log, "");
+            err.append(logFile.getAbsolutePath());
+            err.append("", after "");
+            err.append(tries);
+            err.append("" tries"");
+            log.error(err.toString());
+            throw new DuraCloudRuntimeException(err.toString());
+        }
+    }
+
+    private void doAddContent(File logFile) throws ContentStoreException {
+        String auditLogContentId = getContentId(logFile);
+        InputStream auditLogInputStream = getInputStream(logFile);
+        long auditLogSize = FileUtils.sizeOf(logFile);
+        String auditLogMimeType = ""text/tab-separated-values"";
+        String auditLogChecksum = getChecksum(logFile);
+
+        try {
+            contentStore.addContent(auditLogSpaceId,
+                                    auditLogContentId,
+                                    auditLogInputStream,
+                                    auditLogSize,
+                                    auditLogMimeType,
+                                    auditLogChecksum,
+                                    null);
+        } catch (ContentStoreException e) {
+            log.warn(""Error adding log file!"", e);
+            throw e;
+        } finally {
+            IOUtils.closeQuietly(auditLogInputStream);
+        }
+    }
+
+    private void write(FileWriter fileWriter, String text) {
+        try {
+            fileWriter.append(text);
+            fileWriter.append(newline);
+
+        } catch (IOException e) {
+            log.error(""Error writing audit log!"", e);
+        }
+    }
+
+    private String getContentId(File file) {
+        String tmpDirPath = getTmpDir().getPath();
+        String logPath = file.getPath();
+        String contentId = logPath.substring(tmpDirPath.length());
+
+        while (contentId.startsWith(File.separator)) {
+            contentId = contentId.substring(1);
+        }
+
+        return contentId;
+    }
+
+    private InputStream getInputStream(File logFile) {
+        try {
+            return FileUtils.openInputStream(logFile);
+
+        } catch (IOException e) {
+            log.error(""Error getting input stream for log file: {}"",
+                      logFile.getAbsolutePath(),
+                      e);
+        }
+        return null;
+    }
+
+    private String getChecksum(File logFile) {
+        ChecksumUtil util = new ChecksumUtil(ChecksumUtil.Algorithm.MD5);
+        try {
+            return util.generateChecksum(logFile);
+
+        } catch (IOException e) {
+            log.error(""Error generating checksum for logfile: {}"",
+                      logFile.getAbsolutePath(),
+                      e);
+        }
+        return null;
+    }
+
+    /**
+     * This method is 'protected' for testing access.
+     *
+     * @param spaceId of with audit events
+     * @return local audit log file
+     */
+    protected File getLogFile(String spaceId) {
+        File logFile = null;
+        String logContentId = null;
+
+        File tmpDir = getTmpDir();
+        String[] exts = new String[]{""tsv""};
+        Iterator<File> fileItr = FileUtils.iterateFiles(tmpDir, exts, true);
+
+        // Search for locally cached log file.
+        while (fileItr.hasNext()) {
+            File file = fileItr.next();
+            String contentId = getContentId(file);
+            if (matches(contentId, spaceId)) {
+
+                if (null == logFile) {
+                    logFile = file;
+                    logContentId = contentId;
+
+                } else if (logContentId.compareTo(contentId) < 0) {
+                    logFile = file;
+                    logContentId = contentId;
+                }
+            }
+        }
+
+        // Search for existing log file in store.
+        if (null == logFile) {
+            logFile = getLogFileFromStore(spaceId);
+        }
+
+        // Apparently no log file exists, create one.
+        if (null == logFile || logFile.length() > auditLogSizeLimit) {
+            logFile = newLogFile(spaceId);
+        }
+
+        return logFile;
+    }
+
+    private File getLogFileFromStore(String spaceId) {
+        List<String> logContentIds = new ArrayList<String>();
+
+        Iterator<String> contents = logs(spaceId);
+        while (contents.hasNext()) {
+            logContentIds.add(contents.next());
+        }
+
+        if (logContentIds.size() == 0) {
+            return null;
+        }
+
+        // Select the most current log.
+        String currentLog = logContentIds.get(0);
+        for (String contentId : logContentIds) {
+            if (currentLog.compareTo(contentId) < 0) {
+                currentLog = contentId;
+            }
+        }
+
+        Content content = getContent(currentLog);
+
+        File logFile = new File(getTmpDir(), currentLog);
+        mkdir(logFile);
+
+        OutputStream logFileOutputStream = getOutputStream(logFile);
+
+        InputStream contentInputStream = content.getStream();
+        copy(logFileOutputStream, contentInputStream);
+
+        return logFile;
+    }
+
+    private boolean matches(String contentId, String spaceId) {
+        if (null == contentId) {
+            return false;
+        }
+
+        String prefix = auditLogPrefix + spaceId;
+        return contentId.matches(
+            prefix + ""-\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}.tsv"");
+    }
+
+    private void copy(OutputStream logFileOutputStream,
+                      InputStream contentInputStream) {
+        try {
+            IOUtils.copy(contentInputStream, logFileOutputStream);
+
+        } catch (IOException e) {
+            StringBuilder err = new StringBuilder(""Error copying streams."");
+            log.error(err.toString(), e);
+            throw new DuraCloudRuntimeException(err.toString(), e);
+        } finally {
+            IOUtils.closeQuietly(contentInputStream);
+            IOUtils.closeQuietly(logFileOutputStream);
+        }
+    }
+
+    private OutputStream getOutputStream(File logFile) {
+        try {
+            return FileUtils.openOutputStream(logFile);
+
+        } catch (IOException e) {
+            StringBuilder err = new StringBuilder(""Error outputStream: "");
+            err.append(logFile.getAbsolutePath());
+            log.error(err.toString(), e);
+            throw new DuraCloudRuntimeException(err.toString(), e);
+        }
+    }
+
+    private Content getContent(String currentLog) {
+        Content content = null;
+
+        boolean done = false;
+        int tries = 0;
+        final int maxTries = 3;
+        while (!done && tries++ < maxTries) {
+            try {
+                content = doGetContent(currentLog);
+                done = true;
+            } catch (ContentStoreException e) {
+                // do nothing
+            }
+        }
+
+        if (!done) {
+            StringBuilder err = new StringBuilder(""Unable to get log, "");
+            err.append(currentLog);
+            err.append("", after "");
+            err.append(tries);
+            err.append("" tries"");
+            log.error(err.toString());
+            throw new DuraCloudRuntimeException(err.toString());
+        }
+
+        return content;
+    }
+
+    private Content doGetContent(String currentLog)
+        throws ContentStoreException {
+        Content content;
+        try {
+            content = contentStore.getContent(auditLogSpaceId, currentLog);
+        } catch (ContentStoreException e) {
+            log.warn(""Error getting: {}/{}"", auditLogSpaceId, currentLog);
+            throw e;
+        }
+        return content;
+    }
+
+    private File newLogFile(String spaceId) {
+        String prefix = auditLogPrefix + spaceId;
+        String fullName = prefix + ""-"" + DateUtil.now() + "".tsv"";
+
+        File logFile = new File(getTmpDir(), fullName);
+        mkdir(logFile);
+
+        return logFile;
+    }
+
+    private void mkdir(File file) {
+        try {
+            FileUtils.forceMkdir(file.getParentFile());
+        } catch (IOException e) {
+            // do nothing
+        }
+    }
+
+    private File getTmpDir() {
+        String tmpDir = System.getProperty(""java.io.tmpdir"");
+        return new File(tmpDir);
+    }
+
+    private void checkInitialized() {
+        if (null == contentStore) {
+            StringBuilder err = new StringBuilder(""AuditLogStore must be "");
+            err.append(""initialized!"");
+            log.error(err.toString());
+            throw new DuraCloudRuntimeException(err.toString());
+        }
+    }
+
+}
diff --git a/auditor/src/main/java/org/duracloud/audit/impl/AuditorImpl.java b/auditor/src/main/java/org/duracloud/audit/impl/AuditorImpl.java
index 91fe12b13..560cb1443 100644
--- a/auditor/src/main/java/org/duracloud/audit/impl/AuditorImpl.java
+++ b/auditor/src/main/java/org/duracloud/audit/impl/AuditorImpl.java
@@ -7,18 +7,36 @@
  */
 package org.duracloud.audit.impl;
 
+import org.duracloud.audit.AuditListener;
+import org.duracloud.audit.AuditLogStore;
 import org.duracloud.audit.Auditor;
 import org.duracloud.audit.error.AuditLogNotFoundException;
 import org.duracloud.client.ContentStore;
 import org.duracloud.client.ContentStoreManager;
+import org.duracloud.client.HttpHeaders;
 import org.duracloud.common.error.DuraCloudRuntimeException;
 import org.duracloud.error.ContentStoreException;
+import org.duracloud.storage.aop.ContentMessage;
+import org.duracloud.error.NotFoundException;
+import org.duracloud.storage.aop.IngestMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_CHECKSUM;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_MD5;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_MIMETYPE;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_MODIFIED;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_SIZE;
 
 /**
  * @author Andrew Woods
@@ -28,57 +46,313 @@ public class AuditorImpl implements Auditor {
 
     private final Logger log = LoggerFactory.getLogger(AuditorImpl.class);
 
-    private ContentStore contentStore;
-    private String auditLogSpaceId;
-    private String auditLogPrefix;
+    private ContentStoreManager storeManager;
+
+    private AuditListener listener;
+    private AuditLogStore logStore;
+
+    private boolean isStopped;
 
-    public AuditorImpl(String auditLogSpaceId, String auditLogPrefix) {
-        this.auditLogSpaceId = auditLogSpaceId;
-        this.auditLogPrefix = auditLogPrefix;
+    public AuditorImpl(AuditListener listener, AuditLogStore logStore) {
+        this.listener = listener;
+        this.logStore = logStore;
+        this.isStopped = false;
     }
 
     @Override
-    public void initialize(ContentStoreManager storeMgr) {
+    public void initialize(ContentStoreManager storeManager) {
         log.debug(""initialize() the Auditor"");
 
-        try {
-            this.contentStore = storeMgr.getPrimaryContentStore();
+        this.storeManager = storeManager;
+        this.logStore.initialize(getPrimaryStore());
+        this.listener.initialize();
+        this.isStopped = false;
+    }
 
-        } catch (ContentStoreException e) {
-            throw new DuraCloudRuntimeException(
-                ""Error getting primary content store: "" + e.getMessage(),
-                e);
+    /**
+     * This methods puts all stores in a single audit log. However, each space
+     * has its own log.
+     *
+     * @param async true if executing asynchronously
+     */
+    @Override
+    public void createInitialAuditLogs(boolean async) {
+        AuditLogRunner runner = new AuditLogRunner();
+        if (async) {
+            new Thread(runner).start();
+
+        } else {
+            runner.run();
         }
+    }
 
-        start();
+    /**
+     * This private class run the auditor.
+     */
+    private class AuditLogRunner implements Runnable {
+        @Override
+        public void run() {
+            doCreateInitialAuditLogs();
+        }
     }
 
-    private void start() {
+    private void doCreateInitialAuditLogs() {
+        log.debug(""creating initial audit log"");
         checkInitialized();
 
-        // listen for content messages
+        // Collect all spaces across all stores.
+        Map<String, Set<ContentStore>> spaceStores =
+            new HashMap<String, Set<ContentStore>>();
+
+        for (ContentStore store : allStores()) {
+            for (String space : spaces(store)) {
+                if (!isSystemEvent(space)) {
+                    addToSpaceStore(space, store, spaceStores);
+                }
+            }
+        }
+
+        for (String space : spaceStores.keySet()) {
+            // Pause current audit logging.
+            listener.waitToWrite(space, true);
 
-        // temporarily store message in-memory
+            // Remove existing logs.
+            Iterator<String> logs = logStore.logs(space);
+            while (logs.hasNext()) {
+                remove(logs.next());
+            }
+        }
 
-        // if message received, start writer thread.
-        //  writer, pushes to contentStore after x-seconds
+        // Build initial logs from existing content.
+        for (String space : spaceStores.keySet()) {
+            for (ContentStore store : spaceStores.get(space)) {
+                createLog(store, space);
+            }
 
+            // Un-pause audit logging.
+            listener.waitToWrite(space, false);
+        }
     }
 
-    @Override
-    public void createInitialAuditLogs() {
-        log.debug(""creating initial audit log"");
-        checkInitialized();
+    private boolean isSystemEvent(String spaceId) {
+        return Auditor.systemSpaces.contains(spaceId);
+    }
 
-        for (String space : allSpaces()) {
-            // create audit log
+    private void addToSpaceStore(String space,
+                                 ContentStore store,
+                                 Map<String, Set<ContentStore>> spaceStores) {
+        Set<ContentStore> stores = spaceStores.get(space);
+        if (null == stores) {
+            stores = new HashSet<ContentStore>();
         }
 
+        stores.add(store);
+        spaceStores.put(space, stores);
     }
 
-    private List<String> allSpaces() {
+    private void createLog(ContentStore store, String space) {
         try {
-            return contentStore.getSpaces();
+            if (!isStopped) {
+                doCreateLog(store, space);
+
+            } else {
+                log.info(""Not creating log, auditor is stopping, {}:{}"",
+                         store.getStoreId(),
+                         space);
+            }
+
+        } catch (Exception e) {
+            log.error(""Error creating log: store:{}, space:{}"",
+                      store.getStoreId(),
+                      space);
+        }
+    }
+
+    private void doCreateLog(ContentStore store, String space) {
+        List<ContentMessage> events = new ArrayList<ContentMessage>();
+
+        Iterator<String> contents = getSpaceContents(store, space);
+        while (contents.hasNext() && !isStopped) {
+            String contentId = contents.next();
+            ContentMessage event = buildEvent(store, space, contentId);
+            events.add(event);
+
+            if (events.size() % 499 == 0) {
+                logStore.write(events);
+                events.clear();
+            }
+        }
+
+        // Write final set of events.
+        if (events.size() > 0) {
+            logStore.write(events);
+        }
+    }
+
+    private ContentMessage buildEvent(ContentStore store,
+                                      String space,
+                                      String contentId) {
+        try {
+            return doBuildEvent(store, space, contentId);
+
+        } catch (Exception e) {
+            String storeId = store.getStoreId();
+            log.error(""Error building event for, {}:{}//{}"",
+                      new Object[]{storeId, space, contentId},
+                      e);
+            ContentMessage msg = new ContentMessage();
+            msg.setStoreId(storeId);
+            msg.setSpaceId(space);
+            msg.setContentId(contentId);
+            msg.setAction(ContentMessage.ACTION.ERROR.name());
+            return msg;
+        }
+    }
+
+    /**
+     * This method creates the ContentMessage structure.
+     *
+     * @param store     of event
+     * @param spaceId   of event
+     * @param contentId of event
+     * @return {@link ContentMessage}
+     */
+    private ContentMessage doBuildEvent(ContentStore store,
+                                        String spaceId,
+                                        String contentId) {
+        Map<String, String> props = getContentProperties(store,
+                                                         spaceId,
+                                                         contentId);
+
+        IngestMessage event = new IngestMessage();
+        String storeId = store.getStoreId();
+        String username = null;
+        String action = ContentMessage.ACTION.INGEST.name();
+        String datetime = props.get(HttpHeaders.LAST_MODIFIED);
+        String contentMimeType = props.get(HttpHeaders.CONTENT_TYPE);
+        String contentMd5 = props.get(HttpHeaders.CONTENT_MD5);
+        String contentSize = props.get(HttpHeaders.CONTENT_LENGTH);
+
+        if (null == datetime) {
+            datetime = props.get(PROPERTIES_CONTENT_MODIFIED);
+        }
+        if (null == contentMimeType) {
+            contentMimeType = props.get(PROPERTIES_CONTENT_MIMETYPE);
+        }
+        if (null == contentMd5) {
+            contentMd5 = props.get(PROPERTIES_CONTENT_MD5);
+        }
+        if (null == contentMd5) {
+            contentMd5 = props.get(PROPERTIES_CONTENT_CHECKSUM);
+        }
+        if (null == contentSize) {
+            contentSize = props.get(PROPERTIES_CONTENT_SIZE);
+        }
+
+        event.setStoreId(storeId);
+        event.setSpaceId(spaceId);
+        event.setContentId(contentId);
+        event.setUsername(username);
+        event.setAction(action);
+        event.setDatetime(datetime);
+        event.setContentMimeType(contentMimeType);
+        event.setContentMd5(contentMd5);
+        event.setContentSize(Long.valueOf(contentSize));
+
+        return event;
+    }
+
+    private Map<String, String> getContentProperties(ContentStore store,
+                                                     String space,
+                                                     String contentId) {
+        Map<String, String> props = null;
+        boolean done = false;
+        int tries = 0;
+        final int maxTries = 3;
+        while (!done && tries++ < maxTries) {
+            try {
+                props = doGetContentProperties(store, space, contentId);
+                done = true;
+            } catch (Exception e) {
+                // do nothing
+            }
+        }
+
+        if (!done) {
+            StringBuilder err = new StringBuilder(""Unable to get content "");
+            err.append(""properties: "");
+            err.append(store.getStoreId());
+            err.append("", "");
+            err.append(space);
+            err.append(""//"");
+            err.append(contentId);
+            err.append("", after "");
+            err.append(tries);
+            err.append("" tries"");
+            log.error(err.toString());
+            throw new DuraCloudRuntimeException(err.toString());
+        }
+        return props;
+    }
+
+    private Map<String, String> doGetContentProperties(ContentStore store,
+                                                       String space,
+                                                       String contentId)
+        throws ContentStoreException {
+        try {
+            return store.getContentProperties(space, contentId);
+
+        } catch (ContentStoreException e) {
+            StringBuilder err = new StringBuilder(""Error "");
+            err.append(""getting content properties: "");
+            err.append(store.getStoreId());
+            err.append("", "");
+            err.append(space);
+            err.append(""//"");
+            err.append(contentId);
+            log.warn(err.toString(), e);
+            throw e;
+        }
+    }
+
+    private Iterator<String> getSpaceContents(ContentStore store,
+                                              String space) {
+        try {
+            return store.getSpaceContents(space);
+
+        } catch (NotFoundException nfe) {
+            log.info(""space: {} not found for store: {}"",
+                     space,
+                     store.getStoreId());
+        } catch (ContentStoreException e) {
+            log.warn(""Error get space: {} contents for store: {}"",
+                     new Object[]{space, store.getStoreId(), e});
+        }
+        return new ArrayList<String>().iterator();
+    }
+
+    private void remove(String logContentId) {
+        try {
+            logStore.removeLog(logContentId);
+        } catch (Exception e) {
+            log.warn(""Error removing log: {}"", logContentId);
+        }
+    }
+
+    private Collection<ContentStore> allStores() {
+        try {
+            return storeManager.getContentStores().values();
+
+        } catch (ContentStoreException e) {
+            String err = ""Error getting content stores."";
+            log.error(err, e);
+            throw new DuraCloudRuntimeException(err, e);
+        }
+    }
+
+    private List<String> spaces(ContentStore store) {
+        try {
+            return store.getSpaces();
 
         } catch (ContentStoreException e) {
             throw new DuraCloudRuntimeException(
@@ -89,40 +363,42 @@ private List<String> allSpaces() {
     @Override
     public void stop() {
         log.debug(""stop() the Auditor"");
-        checkInitialized();
+        isStopped = true;
+        listener.stop();
     }
 
     @Override
-    public String getAuditLogs(String spaceId)
+    public List<String> getAuditLogs(String spaceId)
         throws AuditLogNotFoundException {
-        StringBuilder logs = new StringBuilder();
+        List<String> logs = new ArrayList<String>();
 
-        Iterator itr = logIterator(spaceId);
+        Iterator<String> itr = logStore.logs(spaceId);
         while (itr.hasNext()) {
-            logs.append(itr.next());
-            logs.append('\n');
+            logs.add(itr.next());
         }
 
-        if (0 == logs.length()) {
+        if (0 == logs.size()) {
             throw new AuditLogNotFoundException(spaceId);
         }
 
-        return logs.toString();
+        Collections.sort(logs);
+        return logs;
     }
 
-    private Iterator<String> logIterator(String spaceId) {
-        try {
-            return contentStore.getSpaceContents(auditLogSpaceId,
-                                                 auditLogPrefix + spaceId);
-
-        } catch (ContentStoreException e) {
-            return new ArrayList<String>().iterator();
+    private void checkInitialized() {
+        if (null == storeManager) {
+            throw new DuraCloudRuntimeException(""Auditor must be initialized!"");
         }
     }
 
-    private void checkInitialized() {
-        if (null == contentStore) {
-            throw new DuraCloudRuntimeException(""Auditor must be initialized!"");
+    private ContentStore getPrimaryStore() {
+        try {
+            return storeManager.getPrimaryContentStore();
+
+        } catch (ContentStoreException e) {
+            throw new DuraCloudRuntimeException(
+                ""Error getting primary content store: "" + e.getMessage(),
+                e);
         }
     }
 
diff --git a/auditor/src/test/java/org/duracloud/audit/impl/AuditListenerImplTest.java b/auditor/src/test/java/org/duracloud/audit/impl/AuditListenerImplTest.java
new file mode 100644
index 000000000..1d054142f
--- /dev/null
+++ b/auditor/src/test/java/org/duracloud/audit/impl/AuditListenerImplTest.java
@@ -0,0 +1,170 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit.impl;
+
+import org.duracloud.audit.AuditLogStore;
+import org.duracloud.storage.aop.ContentMessage;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.duracloud.storage.aop.ContentMessage.ACTION.*;
+
+/**
+ * @author Andrew Woods
+ *         Date: 3/21/12
+ */
+public class AuditListenerImplTest {
+
+    private AuditListenerImpl listener;
+    private AuditLogStore logStore;
+
+    private static final long delay = 200;
+
+    @Before
+    public void setUp() throws Exception {
+        logStore = EasyMock.createMock(""AuditLogStore"", AuditLogStore.class);
+        listener = new AuditListenerImpl(logStore, delay);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        EasyMock.verify(logStore);
+    }
+
+    private void replayMocks() {
+        EasyMock.makeThreadSafe(logStore, true);
+        EasyMock.replay(logStore);
+    }
+
+    @Test
+    public void testOnContentEvent() throws Exception {
+        String spaceId = ""space-id"";
+        ContentMessage msg0 = createMessage(INGEST, spaceId);
+        ContentMessage msg1 = createMessage(COPY, spaceId);
+
+        List<ContentMessage> messagesA = new ArrayList<ContentMessage>();
+        messagesA.add(msg0);
+        messagesA.add(msg1);
+
+        ContentMessage msg2 = createMessage(DELETE, spaceId);
+        ContentMessage msg3 = createMessage(UPDATE, spaceId);
+
+        List<ContentMessage> messagesB = new ArrayList<ContentMessage>();
+        messagesB.add(msg2);
+        messagesB.add(msg3);
+
+        logStore.write(messagesA);
+        EasyMock.expectLastCall();
+
+        logStore.write(messagesB);
+        EasyMock.expectLastCall();
+
+        replayMocks();
+
+        listener.onContentEvent(msg0);
+        listener.onContentEvent(msg1);
+
+        sleep(delay * 2);
+
+        listener.onContentEvent(msg2);
+        listener.onContentEvent(msg3);
+
+        sleep(delay * 2);
+    }
+
+    private ContentMessage createMessage(ContentMessage.ACTION action,
+                                         String spaceId) {
+        ContentMessage msg = new ContentMessage();
+        msg.setAction(action.name());
+        msg.setSpaceId(spaceId);
+        return msg;
+    }
+
+    private void sleep(long wait) {
+        try {
+            Thread.sleep(wait);
+        } catch (InterruptedException e) {
+
+        }
+    }
+
+    @Test
+    public void testWaitToWrite() throws Exception {
+        String spaceIdA = ""space-id-a"";
+        String spaceIdB = ""space-id-b"";
+
+        ContentMessage msg0 = createMessage(INGEST, spaceIdA);
+        ContentMessage msg1 = createMessage(COPY, spaceIdA);
+
+        List<ContentMessage> messagesA = new ArrayList<ContentMessage>();
+        messagesA.add(msg0);
+        messagesA.add(msg1);
+
+        ContentMessage msg2 = createMessage(DELETE, spaceIdB);
+        ContentMessage msg3 = createMessage(UPDATE, spaceIdB);
+
+        List<ContentMessage> messagesB = new ArrayList<ContentMessage>();
+        messagesB.add(msg2);
+        messagesB.add(msg3);
+
+        logStore.write(messagesB);
+        EasyMock.expectLastCall();
+
+        replayMocks();
+
+        listener.waitToWrite(spaceIdA, true);
+        listener.waitToWrite(spaceIdB, true);
+
+        listener.onContentEvent(msg0);
+        listener.onContentEvent(msg1);
+
+        listener.onContentEvent(msg2);
+        listener.onContentEvent(msg3);
+
+        listener.waitToWrite(spaceIdB, false);
+
+        sleep(delay * 2);
+    }
+
+    @Test
+    public void testStop() {
+        String spaceId = ""space-id"";
+        ContentMessage msg0 = createMessage(INGEST, spaceId);
+        ContentMessage msg1 = createMessage(COPY, spaceId);
+
+        List<ContentMessage> messagesA = new ArrayList<ContentMessage>();
+        messagesA.add(msg0);
+        messagesA.add(msg1);
+
+        ContentMessage msg2 = createMessage(DELETE, spaceId);
+        ContentMessage msg3 = createMessage(UPDATE, spaceId);
+
+        logStore.write(messagesA);
+        EasyMock.expectLastCall();
+
+        replayMocks();
+
+        listener.onContentEvent(msg0);
+        listener.onContentEvent(msg1);
+
+        sleep(delay * 2);
+
+        listener.stop();
+
+        listener.onContentEvent(msg2);
+        listener.onContentEvent(msg3);
+
+        sleep(delay * 2);
+    }
+
+}
diff --git a/auditor/src/test/java/org/duracloud/audit/impl/AuditLogStoreImplTest.java b/auditor/src/test/java/org/duracloud/audit/impl/AuditLogStoreImplTest.java
new file mode 100644
index 000000000..a94cd8645
--- /dev/null
+++ b/auditor/src/test/java/org/duracloud/audit/impl/AuditLogStoreImplTest.java
@@ -0,0 +1,446 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit.impl;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.input.AutoCloseInputStream;
+import org.duracloud.client.ContentStore;
+import org.duracloud.common.util.DateUtil;
+import org.duracloud.domain.Content;
+import org.duracloud.error.ContentStoreException;
+import org.duracloud.storage.aop.ContentMessage;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static org.duracloud.storage.aop.ContentMessage.ACTION.*;
+
+/**
+ * @author Andrew Woods
+ *         Date: 3/21/12
+ */
+public class AuditLogStoreImplTest {
+
+    private AuditLogStoreImpl logStore;
+
+    private ContentStore contentStore;
+    private static final String auditLogSpaceId = ""x-admin"";
+    private static final String auditLogPrefixBase = ""audit/audit-log-"";
+    private static final long auditLogSizeLimit = 100;
+
+    private int idCounter = 0;
+
+    @Before
+    public void setUp() throws Exception {
+        contentStore = EasyMock.createMock(""ContentStore"", ContentStore.class);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        EasyMock.verify(contentStore);
+
+        File tmpDir = getTmpDir();
+        String path = FilenameUtils.getPath(auditLogPrefixBase);
+        FileUtils.deleteDirectory(new File(tmpDir, path));
+    }
+
+    private void replayMocks() {
+        EasyMock.replay(contentStore);
+    }
+
+    @Test
+    public void testWrite() throws Exception {
+        String spaceId = ""space-id"";
+        String auditLogPrefix = logPrefix(""test0"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId);
+        String newestContentId = contentIds.get(0);
+
+        EasyMock.expect(contentStore.getSpaceContents(auditLogSpaceId,
+                                                      auditLogPrefix + spaceId))
+                .andReturn(contentIds.iterator());
+
+        Content content = new Content();
+        String text = ""log text\n"";
+        content.setStream(asStream(text));
+        EasyMock.expect(contentStore.getContent(auditLogSpaceId,
+                                                newestContentId)).andReturn(
+            content);
+
+
+        List<ContentMessage> events = new ArrayList<ContentMessage>();
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, COPY));
+
+        long contentSize = getSize(events, text);
+        expectAddContent(newestContentId, contentSize);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+        logStore.write(events);
+    }
+
+    @Test
+    public void testWriteNoneInExists() throws Exception {
+        String spaceId = ""space-id"";
+        String auditLogPrefix = logPrefix(""test1"");
+
+        EasyMock.expect(contentStore.getSpaceContents(auditLogSpaceId,
+                                                      auditLogPrefix + spaceId))
+                .andReturn(new ArrayList<String>().iterator());
+
+        List<ContentMessage> events = new ArrayList<ContentMessage>();
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, COPY));
+
+        String text = ContentMessage.tsvHeader() + ""\n"";
+        long contentSize = getSize(events, text);
+        expectAddContent(auditLogPrefix + "".*.tsv"", contentSize);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+        logStore.write(events);
+    }
+
+    @Test
+    public void testWriteLocalExists() throws Exception {
+        String spaceId = ""space-id"";
+        String auditLogPrefix = logPrefix(""test2"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId);
+        String newestContentId = contentIds.get(0);
+        String text = ""some text\n"";
+        writeFiles(contentIds, text);
+
+        List<ContentMessage> events = new ArrayList<ContentMessage>();
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, COPY));
+
+        long contentSize = getSize(events, text);
+        expectAddContent(newestContentId, contentSize);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+        logStore.write(events);
+    }
+
+    @Test
+    public void testWriteEventSpacesMismatch() throws Exception {
+        String spaceId = ""space-id"";
+        String spaceIdMismatch = ""space-id-mismatch"";
+        String auditLogPrefix = logPrefix(""test3"");
+
+        List<ContentMessage> events = new ArrayList<ContentMessage>();
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, INGEST));
+        events.add(createEvent(spaceId, COPY));
+        ContentMessage event = createEvent(spaceIdMismatch, INGEST);
+        events.add(event);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+
+        try {
+            logStore.write(events);
+            Assert.fail(""exception expected"");
+
+        } catch (IllegalArgumentException e) {
+            Assert.assertTrue(e.getMessage().contains(spaceIdMismatch));
+        }
+    }
+
+    @Test
+    public void testWriteLogRollover() throws Exception {
+        String spaceId = ""space-id"";
+        String auditLogPrefix = logPrefix(""test4"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId);
+        String newestContentId = contentIds.get(0);
+        String text = ""some text\n"";
+        writeFiles(contentIds, text);
+
+        List<ContentMessage> events0 = new ArrayList<ContentMessage>();
+        events0.add(createEvent(spaceId, INGEST));
+        events0.add(createEvent(spaceId, INGEST));
+        events0.add(createEvent(spaceId, COPY));
+
+        List<ContentMessage> events1 = new ArrayList<ContentMessage>();
+        events1.add(createEvent(spaceId, DELETE));
+        events1.add(createEvent(spaceId, UPDATE));
+        events1.add(createEvent(spaceId, UPDATE));
+
+        long contentSize0 = getSize(events0, text);
+        expectAddContent(newestContentId, contentSize0);
+
+        long contentSize1 = getSize(events1, ContentMessage.tsvHeader() + ""\n"");
+        expectAddContent(auditLogPrefix + "".*.tsv"", contentSize1);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+        logStore.write(events0);
+        logStore.write(events1);
+    }
+
+    private void writeFiles(List<String> contentIds, String text)
+        throws IOException {
+        File tmpDir = getTmpDir();
+        for (String contentId : contentIds) {
+            FileUtils.writeStringToFile(new File(tmpDir, contentId), text);
+        }
+    }
+
+    private File getTmpDir() {
+        return new File(System.getProperty(""java.io.tmpdir""));
+    }
+
+    private void expectAddContent(String contentIdPattern, long contentSize)
+        throws ContentStoreException {
+        EasyMock.expect(contentStore.addContent(EasyMock.eq(auditLogSpaceId),
+                                                EasyMock.matches(
+                                                    contentIdPattern),
+                                                EasyMock.<InputStream>anyObject(),
+                                                EasyMock.eq(contentSize),
+                                                EasyMock.eq(
+                                                    ""text/tab-separated-values""),
+                                                EasyMock.<String>notNull(),
+                                                EasyMock.<Map<String, String>>isNull()))
+                .andReturn(""md5"");
+    }
+
+    private List<String> createLogContentIds(String auditLogPrefix,
+                                             String spaceId) {
+        List<String> contentIds = new ArrayList<String>();
+
+        long now = System.currentTimeMillis() - 50000;
+        String time3 = DateUtil.convertToString(now);
+        String time2 = DateUtil.convertToString(now - 10000);
+        String time1 = DateUtil.convertToString(now - 20000);
+        String time0 = DateUtil.convertToString(now - 30000);
+
+        String contentId3 = auditLogPrefix + spaceId + ""-"" + time3 + "".tsv"";
+        String contentId2 = auditLogPrefix + spaceId + ""-"" + time2 + "".tsv"";
+        String contentId1 = auditLogPrefix + spaceId + ""-"" + time1 + "".tsv"";
+        String contentId0 = auditLogPrefix + spaceId + ""-"" + time0 + "".tsv"";
+
+        contentIds.add(contentId3);
+        contentIds.add(contentId2);
+        contentIds.add(contentId1);
+        contentIds.add(contentId0);
+        return contentIds;
+    }
+
+    private long getSize(List<ContentMessage> events, String text) {
+        long size = text.length();
+        for (ContentMessage event : events) {
+            size += event.asTSV().length() + 1;
+        }
+        return size;
+    }
+
+    private InputStream asStream(String text) {
+        return new AutoCloseInputStream(new ByteArrayInputStream(text.getBytes()));
+    }
+
+    private ContentMessage createEvent(String spaceId,
+                                       ContentMessage.ACTION action) {
+        ContentMessage msg = new ContentMessage();
+        msg.setStoreId(""store-id"");
+        msg.setSpaceId(spaceId);
+        msg.setContentId(""content-"" + idCounter++);
+        msg.setAction(action.name());
+        return msg;
+    }
+
+    @Test
+    public void testLogs() throws Exception {
+        String spaceId = ""space-id"";
+        String auditLogPrefix = logPrefix(""test5"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId);
+
+        Iterator<String> contentsItr = contentIds.iterator();
+        EasyMock.expect(contentStore.getSpaceContents(auditLogSpaceId,
+                                                      auditLogPrefix + spaceId))
+                .andReturn(contentsItr);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+
+        Iterator<String> logs = logStore.logs(spaceId);
+        Assert.assertNotNull(logs);
+
+        while (logs.hasNext()) {
+            Assert.assertTrue(contentIds.remove(logs.next()));
+        }
+        Assert.assertEquals(0, contentIds.size());
+    }
+
+    @Test
+    public void testRemove() throws Exception {
+        String spaceId = ""space-id"";
+        String auditLogPrefix = logPrefix(""test6"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId);
+        String text = ContentMessage.tsvHeader() + ""\n"";
+        writeFiles(contentIds, text);
+
+        for (String contentId : contentIds) {
+            contentStore.deleteContent(auditLogSpaceId, contentId);
+            EasyMock.expectLastCall();
+        }
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+
+        logStore.initialize(contentStore);
+
+        for (String contentId : contentIds) {
+            File logFile = new File(getTmpDir(), contentId);
+            Assert.assertTrue(logFile.exists());
+
+            logStore.removeLog(contentId);
+            Assert.assertTrue(!logFile.exists());
+        }
+    }
+
+    @Test
+    public void testGetLogFile() throws Exception {
+        String spaceId0 = ""space-id"";
+        String spaceId1 = ""space-id-another"";
+
+        String auditLogPrefix = logPrefix(""test7"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId1);
+        File expectedFile = new File(getTmpDir(), contentIds.get(0));
+        String text = ""text"";
+        writeFiles(contentIds, text);
+
+        // for spaceId0 case (not found case)
+        EasyMock.expect(contentStore.getSpaceContents(auditLogSpaceId,
+                                                      auditLogPrefix +
+                                                          spaceId0)).andReturn(
+            new ArrayList<String>().iterator());
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+        logStore.initialize(contentStore);
+
+        File logFile0 = logStore.getLogFile(spaceId0);
+        File logFile1 = logStore.getLogFile(spaceId1);
+
+        verifyLogFile(expectedFile, logFile0, false);
+        verifyLogFile(expectedFile, logFile1, true);
+    }
+
+    @Test
+    public void testGetLogFileFromStore() throws Exception {
+        String spaceId0 = ""space-id"";
+        String spaceId1 = ""space-id-another"";
+
+        String auditLogPrefix = logPrefix(""test8"");
+
+        List<String> contentIds = createLogContentIds(auditLogPrefix, spaceId1);
+        String newestContentId = contentIds.get(0);
+        File expectedFile = new File(getTmpDir(), newestContentId);
+
+        expectGetSpaceContents(spaceId0, auditLogPrefix, contentIds);
+        expectGetSpaceContents(spaceId1, auditLogPrefix, contentIds);
+
+        Content content = new Content();
+        String text = ""log text\n"";
+        content.setStream(asStream(text));
+        EasyMock.expect(contentStore.getContent(auditLogSpaceId,
+                                                newestContentId)).andReturn(
+            content);
+
+        replayMocks();
+
+        logStore = new AuditLogStoreImpl(auditLogSpaceId,
+                                         auditLogPrefix,
+                                         auditLogSizeLimit);
+        logStore.initialize(contentStore);
+
+        File logFile0 = logStore.getLogFile(spaceId0);
+        File logFile1 = logStore.getLogFile(spaceId1);
+
+        verifyLogFile(expectedFile, logFile0, false);
+        verifyLogFile(expectedFile, logFile1, true);
+    }
+
+    private void expectGetSpaceContents(String spaceId,
+                                        String auditLogPrefix,
+                                        List<String> contentIds)
+        throws ContentStoreException {
+        EasyMock.expect(contentStore.getSpaceContents(auditLogSpaceId,
+                                                      auditLogPrefix + spaceId))
+                .andReturn(contentIds.iterator());
+    }
+
+    private void verifyLogFile(File expected, File logFile, boolean valid) {
+        Assert.assertNotNull(logFile);
+
+        boolean matches =
+            expected.getAbsolutePath().equals(logFile.getAbsolutePath());
+        Assert.assertEquals(valid, matches);
+    }
+
+    private String logPrefix(String suffix) {
+        return auditLogPrefixBase + suffix + ""-"";
+    }
+}
diff --git a/auditor/src/test/java/org/duracloud/audit/impl/AuditorImplTest.java b/auditor/src/test/java/org/duracloud/audit/impl/AuditorImplTest.java
new file mode 100644
index 000000000..5df200a06
--- /dev/null
+++ b/auditor/src/test/java/org/duracloud/audit/impl/AuditorImplTest.java
@@ -0,0 +1,318 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.audit.impl;
+
+import org.duracloud.audit.AuditListener;
+import org.duracloud.audit.AuditLogStore;
+import org.duracloud.audit.error.AuditLogNotFoundException;
+import org.duracloud.client.ContentStore;
+import org.duracloud.client.ContentStoreManager;
+import org.duracloud.error.ContentStoreException;
+import org.duracloud.storage.aop.ContentMessage;
+import org.duracloud.storage.aop.IngestMessage;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_MD5;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_MIMETYPE;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_MODIFIED;
+import static org.duracloud.storage.provider.StorageProvider.PROPERTIES_CONTENT_SIZE;
+
+/**
+ * @author Andrew Woods
+ *         Date: 3/22/12
+ */
+public class AuditorImplTest {
+
+    private AuditorImpl auditor;
+
+    private AuditListener listener;
+    private AuditLogStore logStore;
+    private ContentStoreManager storeManager;
+
+    private ContentStore storeP;
+    private ContentStore storeS;
+
+    private static final int NUM_ITEMS = 4;
+
+    @Before
+    public void setUp() throws Exception {
+        listener = EasyMock.createMock(""AuditListener"", AuditListener.class);
+        logStore = EasyMock.createMock(""AuditLogStore"", AuditLogStore.class);
+        storeManager = EasyMock.createMock(""ContentStoreManager"",
+                                           ContentStoreManager.class);
+
+        storeP = EasyMock.createMock(""ContentStoreP"", ContentStore.class);
+        storeS = EasyMock.createMock(""ContentStoreS"", ContentStore.class);
+
+        auditor = new AuditorImpl(listener, logStore);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        EasyMock.verify(listener, logStore, storeManager, storeP, storeS);
+    }
+
+    private void replayMocks() {
+        EasyMock.replay(listener, logStore, storeManager, storeP, storeS);
+    }
+
+    @Test
+    public void testCreateInitialAuditLogs() throws Exception {
+        String spaceId = ""space-id"";
+
+        // 2 stores
+        // 3 spaces each, 2 overlap
+        // 4 items in each space
+
+        logStore.initialize(storeP);
+        EasyMock.expectLastCall();
+
+        listener.initialize();
+        EasyMock.expectLastCall();
+
+        EasyMock.expect(storeManager.getPrimaryContentStore())
+                .andReturn(storeP);
+
+        Map<String, ContentStore> storeMap =
+            new HashMap<String, ContentStore>();
+        storeMap.put(""p"", storeP);
+        storeMap.put(""s"", storeS);
+        EasyMock.expect(storeManager.getContentStores()).andReturn(storeMap);
+
+        List<String> spacesP = new ArrayList<String>();
+        List<String> spacesS = new ArrayList<String>();
+
+        final int numSpaces = 3;
+        for (int s = 0; s < numSpaces; ++s) {
+            if (0 == s) {
+                spacesP.add(spaceId + s + ""p"");
+                spacesS.add(spaceId + s + ""s"");
+            } else {
+                spacesP.add(spaceId + s);
+                spacesS.add(spaceId + s);
+            }
+        }
+
+        EasyMock.expect(storeP.getSpaces()).andReturn(spacesP);
+        EasyMock.expect(storeS.getSpaces()).andReturn(spacesS);
+
+        List<String> logs = new ArrayList<String>();
+        logs.add(""audit-log.tsv"");
+
+        Set<String> allSpaces = new HashSet<String>();
+        allSpaces.addAll(spacesP);
+        allSpaces.addAll(spacesS);
+        for (String space : allSpaces) {
+            listener.waitToWrite(space, true);
+            EasyMock.expectLastCall();
+
+            EasyMock.expect(logStore.logs(space)).andReturn(logs.iterator());
+            logStore.removeLog(logs.get(0));
+            EasyMock.expectLastCall();
+        }
+
+        int count = 0;
+        Map<String, List<String>> spaceContents =
+            new HashMap<String, List<String>>();
+        for (String space : allSpaces) {
+            spaceContents.put(space, getContents(space, count++));
+        }
+
+        for (String space : allSpaces) {
+            setGetSpaceContentsExpectation(storeP,
+                                           spacesP,
+                                           space,
+                                           spaceContents);
+            setGetSpaceContentsExpectation(storeS,
+                                           spacesS,
+                                           space,
+                                           spaceContents);
+        }
+
+        for (String space : allSpaces) {
+            setGetContentPropertiesExpectation(storeP,
+                                               spacesP,
+                                               space,
+                                               spaceContents);
+            setGetContentPropertiesExpectation(storeS,
+                                               spacesS,
+                                               space,
+                                               spaceContents);
+
+            setWriteEventExpectation(storeP,
+                                     ""p"",
+                                     spacesP,
+                                     space,
+                                     spaceContents);
+            setWriteEventExpectation(storeS,
+                                     ""s"",
+                                     spacesS,
+                                     space,
+                                     spaceContents);
+        }
+
+        for (String space : allSpaces) {
+            listener.waitToWrite(space, false);
+            EasyMock.expectLastCall();
+        }
+
+        replayMocks();
+
+        auditor.initialize(storeManager);
+        auditor.createInitialAuditLogs(false);
+    }
+
+    private void setGetSpaceContentsExpectation(ContentStore store,
+                                                List<String> spaces,
+                                                String space,
+                                                Map<String, List<String>> spaceContents)
+        throws ContentStoreException {
+        if (spaces.contains(space)) {
+            EasyMock.expect(store.getSpaceContents(space)).andReturn(
+                spaceContents.get(space).iterator());
+        }
+    }
+
+    private void setGetContentPropertiesExpectation(ContentStore store,
+                                                    List<String> spaces,
+                                                    String space,
+                                                    Map<String, List<String>> spaceContents)
+        throws ContentStoreException {
+        if (spaces.contains(space)) {
+            for (String contentId : spaceContents.get(space)) {
+                Map<String, String> props = createProps(contentId);
+                EasyMock.expect(store.getContentProperties(space, contentId))
+                        .andReturn(props);
+            }
+        }
+    }
+
+    private void setWriteEventExpectation(ContentStore store,
+                                          String storeId,
+                                          List<String> spaces,
+                                          String space,
+                                          Map<String, List<String>> spaceContents)
+        throws ContentStoreException {
+        if (spaces.contains(space)) {
+            List<ContentMessage> events = new ArrayList<ContentMessage>();
+            for (String contentId : spaceContents.get(space)) {
+                EasyMock.expect(store.getStoreId()).andReturn(storeId);
+                ContentMessage event = createEvent(storeId, space, contentId);
+                events.add(event);
+            }
+            logStore.write(events);
+            EasyMock.expectLastCall();
+        }
+    }
+
+    private ContentMessage createEvent(String storeId,
+                                       String spaceId,
+                                       String contentId) {
+        IngestMessage event = new IngestMessage();
+        String username = null;
+        String action = ContentMessage.ACTION.INGEST.name();
+        String datetime = ""date-"" + contentId;
+        String contentMimeType = ""mime-"" + contentId;
+        String contentMd5 = ""md5-"" + contentId;
+        long contentSize = 10;
+
+        event.setStoreId(storeId);
+        event.setSpaceId(spaceId);
+        event.setContentId(contentId);
+        event.setUsername(username);
+        event.setAction(action);
+        event.setDatetime(datetime);
+        event.setContentMimeType(contentMimeType);
+        event.setContentMd5(contentMd5);
+        event.setContentSize(contentSize);
+        return event;
+    }
+
+    private Map<String, String> createProps(String contentId) {
+        String contentMimeType = ""mime-"" + contentId;
+        String contentMd5 = ""md5-"" + contentId;
+        long contentSize = 10;
+        String creationDate = ""date-"" + contentId;
+
+        Map<String, String> props = new HashMap<String, String>();
+        props.put(PROPERTIES_CONTENT_MODIFIED, creationDate);
+        props.put(PROPERTIES_CONTENT_MIMETYPE, contentMimeType);
+        props.put(PROPERTIES_CONTENT_MD5, contentMd5);
+        props.put(PROPERTIES_CONTENT_SIZE, Long.toString(contentSize));
+
+        return props;
+    }
+
+    private List<String> getContents(String space, int i) {
+        List<String> contents = new ArrayList<String>();
+        for (int x = 0; x < NUM_ITEMS; ++x) {
+            contents.add(space + ""-content-"" + i + ""-"" + x);
+        }
+        return contents;
+    }
+
+    @Test
+    public void testStop() throws Exception {
+        listener.stop();
+        EasyMock.expectLastCall();
+
+        replayMocks();
+
+        auditor.stop();
+    }
+
+    @Test
+    public void testGetAuditLogs() throws Exception {
+        String spaceId = ""space-id"";
+
+        List<String> contentIds = new ArrayList<String>();
+        final int numIds = 5;
+        for (int id = 0; id < numIds; ++id) {
+            contentIds.add(""audit/audit-log-"" + id + "".tsv"");
+        }
+
+        EasyMock.expect(logStore.logs(spaceId))
+                .andReturn(contentIds.iterator());
+
+        replayMocks();
+
+        List<String> logs = auditor.getAuditLogs(spaceId);
+        Assert.assertNotNull(logs);
+        Assert.assertEquals(numIds, logs.size());
+    }
+
+    @Test
+    public void testGetAuditLogsEmpty() throws Exception {
+        String spaceId = ""space-id"";
+
+        List<String> contentIds = new ArrayList<String>();
+        EasyMock.expect(logStore.logs(spaceId))
+                .andReturn(contentIds.iterator());
+
+        replayMocks();
+
+        try {
+            auditor.getAuditLogs(spaceId);
+            Assert.fail(""exception expected"");
+
+        } catch (AuditLogNotFoundException e) {
+            Assert.assertTrue(e.getMessage().contains(spaceId));
+        }
+    }
+}
diff --git a/auditor/src/test/resources/logback-test.xml b/auditor/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..37f5467d3
--- /dev/null
+++ b/auditor/src/test/resources/logback-test.xml
@@ -0,0 +1,10 @@
+<configuration> 
+  <appender name=""STDOUT"" class=""ch.qos.logback.core.ConsoleAppender"">
+    <encoder>
+      <pattern>%-14p %d{yyyy/MM/dd HH:mm:ss} [%t] (%F:%L\\) [%M(\\)] - %m%n</pattern>
+    </encoder>
+  </appender>
+  <root level=""DEBUG"">
+    <appender-ref ref=""STDOUT""/>
+  </root>  
+</configuration>
\ No newline at end of file
diff --git a/duraboss/pom.xml b/duraboss/pom.xml
index 401c7ea57..be3c993dd 100644
--- a/duraboss/pom.xml
+++ b/duraboss/pom.xml
@@ -52,6 +52,12 @@
             <groupId>org.duracloud</groupId>
             <artifactId>common-rest</artifactId>
             <version>${project.version}</version>
+          <exclusions>
+            <exclusion>
+              <groupId>org.apache.commons</groupId>
+              <artifactId>com.springsource.org.apache.commons.io</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
 
         <dependency>
diff --git a/duraboss/src/main/java/org/duracloud/duraboss/rest/audit/AuditResource.java b/duraboss/src/main/java/org/duracloud/duraboss/rest/audit/AuditResource.java
index c07cd817d..64d03b235 100644
--- a/duraboss/src/main/java/org/duracloud/duraboss/rest/audit/AuditResource.java
+++ b/duraboss/src/main/java/org/duracloud/duraboss/rest/audit/AuditResource.java
@@ -12,8 +12,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.InputStream;
-
 /**
  * @author Andrew Woods
  *         Date: 3/17/12
@@ -34,7 +32,7 @@ public AuditResource(Auditor auditor) {
      * @return URL of newly created audit log
      */
     public void createInitialAuditLogs() {
-        auditor.createInitialAuditLogs();
+        auditor.createInitialAuditLogs(true); // true=async
     }
 
     /**
@@ -52,6 +50,11 @@ public void shutdownAuditor() {
      */
     public String getAuditLogs(String spaceId)
         throws AuditLogNotFoundException {
-        return auditor.getAuditLogs(spaceId);
+        StringBuilder logs = new StringBuilder();
+        for (String log : auditor.getAuditLogs(spaceId)) {
+            logs.append(log);
+            logs.append(""\n"");
+        }
+        return logs.toString();
     }
 }
diff --git a/duraboss/src/main/webapp/WEB-INF/config/messaging-config.xml b/duraboss/src/main/webapp/WEB-INF/config/messaging-config.xml
index 328367f91..41b06bc6b 100644
--- a/duraboss/src/main/webapp/WEB-INF/config/messaging-config.xml
+++ b/duraboss/src/main/webapp/WEB-INF/config/messaging-config.xml
@@ -10,6 +10,10 @@
     <property name=""brokerURL"" value=""tcp://localhost:61618"" />
   </bean>
 
+  <bean id=""contentConnFactory"" class=""org.apache.activemq.ActiveMQConnectionFactory"">
+    <property name=""brokerURL"" value=""tcp://localhost:61617"" />
+  </bean>
+
   <bean id=""deployDestination"" class=""org.apache.activemq.command.ActiveMQTopic"">
     <constructor-arg index=""0"" value=""org.duracloud.topic.service.deploy"" />
   </bean>
@@ -22,10 +26,16 @@
     <constructor-arg index=""0"" value=""org.duracloud.topic.service.updateConfig"" />
   </bean>
 
+  <bean id=""auditDestination"" class=""org.apache.activemq.command.ActiveMQTopic"">
+    <constructor-arg index=""0"" value=""org.duracloud.topic.change.content.ingest,org.duracloud.topic.change.content.copy,org.duracloud.topic.change.content.delete""/>
+  </bean>
+
   <bean id=""deployMsgConverter"" class=""org.duracloud.serviceapi.aop.DeployMessageConverter"" />
 
   <bean id=""serviceMsgConverter"" class=""org.duracloud.serviceapi.aop.ServiceMessageConverter"" />
 
+  <bean id=""auditMsgConverter"" class=""org.duracloud.storage.aop.AllContentEventsMessageConverter"" />
+
   <!-- Message Consumers -->
   <!-- This serviceMonitor listens for duraservice events -->
   <bean class=""org.springframework.jms.listener.DefaultMessageListenerContainer"">
@@ -64,4 +74,17 @@
     <property name=""messageConverter"" ref=""serviceMsgConverter""/>
   </bean>
 
+  <!--Content event listeners-->
+  <bean class=""org.springframework.jms.listener.DefaultMessageListenerContainer"">
+    <property name=""connectionFactory"" ref=""contentConnFactory""/>
+    <property name=""destination"" ref=""auditDestination""/>
+    <property name=""messageListener"" ref=""auditAdapter""/>
+  </bean>
+
+  <bean id=""auditAdapter"" class=""org.springframework.jms.listener.adapter.MessageListenerAdapter"">
+    <property name=""delegate"" ref=""auditListener""/>
+    <property name=""defaultListenerMethod"" value=""onContentEvent""/>
+    <property name=""messageConverter"" ref=""auditMsgConverter""/>
+  </bean>
+
  </beans>
\ No newline at end of file
diff --git a/duraboss/src/main/webapp/WEB-INF/config/restapi-config.xml b/duraboss/src/main/webapp/WEB-INF/config/restapi-config.xml
index 255862a50..70dc7d6b9 100644
--- a/duraboss/src/main/webapp/WEB-INF/config/restapi-config.xml
+++ b/duraboss/src/main/webapp/WEB-INF/config/restapi-config.xml
@@ -74,8 +74,19 @@
   </bean>
 
   <bean id=""auditor"" class=""org.duracloud.audit.impl.AuditorImpl"">
+    <constructor-arg ref=""auditListener""/>
+    <constructor-arg ref=""auditLogStore""/>
+  </bean>
+
+  <bean id=""auditLogStore"" class=""org.duracloud.audit.impl.AuditLogStoreImpl"">
     <constructor-arg value=""x-duracloud-admin""/>
     <constructor-arg value=""audit/storage-audit-log-""/>
+    <constructor-arg value=""10000000""/> <!-- 10-MB -->
+  </bean>
+
+  <bean id=""auditListener"" class=""org.duracloud.audit.impl.AuditListenerImpl"">
+    <constructor-arg ref=""auditLogStore""/>
+    <constructor-arg value=""60000""/> <!-- 1 minute delay -->
   </bean>
 
   <bean id=""summaryDirectory"" class=""org.duracloud.servicemonitor.impl.ServiceSummaryDirectoryImpl"">
diff --git a/duraboss/src/test/java/org/duracloud/duraboss/rest/audit/AuditResourceTest.java b/duraboss/src/test/java/org/duracloud/duraboss/rest/audit/AuditResourceTest.java
new file mode 100644
index 000000000..276a640ef
--- /dev/null
+++ b/duraboss/src/test/java/org/duracloud/duraboss/rest/audit/AuditResourceTest.java
@@ -0,0 +1,81 @@
+/*
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ *     http://duracloud.org/license/
+ */
+package org.duracloud.duraboss.rest.audit;
+
+import org.duracloud.audit.Auditor;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Andrew Woods
+ *         Date: 3/19/12
+ */
+public class AuditResourceTest {
+
+    private AuditResource resource;
+    private Auditor auditor;
+
+    @Before
+    public void setUp() throws Exception {
+        auditor = EasyMock.createMock(""Auditor"", Auditor.class);
+        resource = new AuditResource(auditor);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        EasyMock.verify(auditor);
+    }
+
+    private void replayMocks() {
+        EasyMock.replay(auditor);
+    }
+
+    @Test
+    public void testCreateInitialAuditLogs() throws Exception {
+        auditor.createInitialAuditLogs(true);
+        EasyMock.expectLastCall();
+        replayMocks();
+
+        resource.createInitialAuditLogs();
+    }
+
+    @Test
+    public void testShutdownAuditor() throws Exception {
+        auditor.stop();
+        EasyMock.expectLastCall();
+        replayMocks();
+
+        resource.shutdownAuditor();
+    }
+
+    @Test
+    public void testGetAuditLogs() throws Exception {
+        String spaceId = ""space-id"";
+        List<String> logs = new ArrayList<String>();
+        String log0 = ""log-0"";
+        String log1 = ""log-1"";
+        logs.add(log0);
+        logs.add(log1);
+        EasyMock.expect(auditor.getAuditLogs(spaceId)).andReturn(logs);
+        replayMocks();
+
+        String result = resource.getAuditLogs(spaceId);
+        Assert.assertNotNull(result);
+
+        int size = log0.length() + log1.length() + 2;
+        Assert.assertEquals(size, result.length());
+        Assert.assertTrue(result.contains(log0));
+        Assert.assertTrue(result.contains(log1));
+    }
+}
diff --git a/durastore/src/main/java/org/duracloud/durastore/aop/ContentCopyAdvice.java b/durastore/src/main/java/org/duracloud/durastore/aop/ContentCopyAdvice.java
index 11b16601e..0130f1c99 100644
--- a/durastore/src/main/java/org/duracloud/durastore/aop/ContentCopyAdvice.java
+++ b/durastore/src/main/java/org/duracloud/durastore/aop/ContentCopyAdvice.java
@@ -40,10 +40,10 @@ protected ContentMessage createMessage(Object[] methodArgs) {
 
         ContentCopyMessage msg = new ContentCopyMessage();
         msg.setStoreId(storeId);
-        msg.setSpaceId(sourceSpaceId);
-        msg.setContentId(sourceContentId);
-        msg.setDestSpaceId(destSpaceId);
-        msg.setDestContentId(destContentId);
+        msg.setSrcSpaceId(sourceSpaceId);
+        msg.setSrcContentId(sourceContentId);
+        msg.setSpaceId(destSpaceId);
+        msg.setContentId(destContentId);
         msg.setUsername(username);
         msg.setContentMd5(contentMd5);
         msg.setAction(ContentMessage.ACTION.COPY.name());
diff --git a/durastore/src/main/java/org/duracloud/durastore/aop/MessageConsumer.java b/durastore/src/main/java/org/duracloud/durastore/aop/MessageConsumer.java
index 5079a7e75..e611ee039 100644
--- a/durastore/src/main/java/org/duracloud/durastore/aop/MessageConsumer.java
+++ b/durastore/src/main/java/org/duracloud/durastore/aop/MessageConsumer.java
@@ -25,7 +25,7 @@ public class MessageConsumer {
     private JmsTemplate jmsTemplate;
 
     public void onIngest(IngestMessage ingestMsg) {
-        log.info(""message consumed from topic: "" + ingestMsg);
+        log.debug(""message consumed from topic: "" + ingestMsg);
     }
 
     public JmsTemplate getJmsTemplate() {
diff --git a/durastore/src/main/java/org/duracloud/durastore/rest/SpaceRest.java b/durastore/src/main/java/org/duracloud/durastore/rest/SpaceRest.java
index fa48eeacd..e6d3ebce7 100644
--- a/durastore/src/main/java/org/duracloud/durastore/rest/SpaceRest.java
+++ b/durastore/src/main/java/org/duracloud/durastore/rest/SpaceRest.java
@@ -402,7 +402,7 @@ private Response responseBad(String msg,
                                  Response.Status status) {
         String text = e.getMessage() == null ? ""null"" : e.getMessage();
         log.error(""Error while "" + msg + "": "" + text);
-        log.info(""Error details: {}"", ExceptionUtil.getStackTraceAsString(e));
+        log.debug(""Error details: {}"", ExceptionUtil.getStackTraceAsString(e));
         return Response.status(status).entity(text).build();
     }
 
diff --git a/durastore/src/test/java/org/duracloud/durastore/aop/ContentCopyAdviceTest.java b/durastore/src/test/java/org/duracloud/durastore/aop/ContentCopyAdviceTest.java
index e267584e4..8904b1120 100644
--- a/durastore/src/test/java/org/duracloud/durastore/aop/ContentCopyAdviceTest.java
+++ b/durastore/src/test/java/org/duracloud/durastore/aop/ContentCopyAdviceTest.java
@@ -54,15 +54,17 @@ public void testEmptyParam() throws Throwable {
 
     @Test
     public void testNullDestination() throws Throwable {
+        String username = ""username"";
+        
         ContentCopyMessage msg = new ContentCopyMessage();
         msg.setStoreId(null);
+        msg.setSrcSpaceId(null);
+        msg.setSrcContentId(null);
         msg.setSpaceId(null);
         msg.setContentId(null);
-        msg.setDestSpaceId(null);
-        msg.setDestContentId(null);
-        msg.setUsername(null);
+        msg.setUsername(username);
         msg.setContentMd5(null);
-        msg.setAction(null);
+        msg.setAction(ContentMessage.ACTION.COPY.name());
 
         JmsTemplate jmsTemplate = EasyMock.createMock(""JmsTemplate"",
                                                       JmsTemplate.class);
@@ -96,16 +98,17 @@ public void testNullDestination() throws Throwable {
     @Test
     public void testMessage() throws Throwable {
         String id = ""1"";
+        String username = ""username"";
 
         ContentCopyMessage msg = new ContentCopyMessage();
         msg.setStoreId(id);
+        msg.setSrcSpaceId(id);
+        msg.setSrcContentId(id);
         msg.setSpaceId(id);
         msg.setContentId(id);
-        msg.setDestSpaceId(id);
-        msg.setDestContentId(id);
-        msg.setUsername(id);
+        msg.setUsername(username);
         msg.setContentMd5(id);
-        msg.setAction(ContentMessage.ACTION.INGEST.name());
+        msg.setAction(ContentMessage.ACTION.COPY.name());
 
         JmsTemplate jmsTemplate = EasyMock.createMock(""JmsTemplate"",
                                                       JmsTemplate.class);
diff --git a/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessage.java b/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessage.java
index 8790314b4..a680ab84a 100644
--- a/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessage.java
+++ b/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessage.java
@@ -9,38 +9,56 @@
 
 public class ContentCopyMessage extends ContentMessage {
 
-    private String destSpaceId;
-    private String destContentId;
+    private String srcSpaceId;
+    private String srcContentId;
     private String contentMd5;
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(""ContentCopyMessage["");
         sb.append(""storeId:'"" + getStoreId() + ""'"");
-        sb.append(""|sourceSpaceId:'"" + getSpaceId() + ""'"");
-        sb.append(""|sourceContentId:'"" + getContentId() + ""'"");
-        sb.append(""|destSpaceId:'"" + destSpaceId + ""'"");
-        sb.append(""|destContentId:'"" + destContentId + ""'"");
+        sb.append(""|sourceSpaceId:'"" + srcSpaceId + ""'"");
+        sb.append(""|sourceContentId:'"" + srcContentId + ""'"");
+        sb.append(""|destSpaceId:'"" + getSpaceId() + ""'"");
+        sb.append(""|destContentId:'"" + getContentId() + ""'"");
         sb.append(""|username:'"" + getUsername() + ""'"");
         sb.append(""|contentMd5:'"" + contentMd5 + ""'"");
+        sb.append(""|action:'"" + getAction() + ""'"");
+        sb.append(""|datetime:'"" + getDatetime() + ""'"");
         sb.append(""]\n"");
         return sb.toString();
     }
 
-    public String getDestSpaceId() {
-        return destSpaceId;
+    @Override
+    public String asTSV() {
+        StringBuilder sb = new StringBuilder(super.asTSV());
+        sb.append(DELIM);
+        sb.append(contentMd5);
+        sb.append(DELIM);
+        sb.append(""tbd"");
+        sb.append(DELIM);
+        sb.append(""tbd"");
+        sb.append(DELIM);
+        sb.append(srcSpaceId);
+        sb.append(DELIM);
+        sb.append(srcContentId);
+        return sb.toString();
+    }
+
+    public String getSrcSpaceId() {
+        return srcSpaceId;
     }
 
-    public void setDestSpaceId(String destSpaceId) {
-        this.destSpaceId = destSpaceId;
+    public void setSrcSpaceId(String srcSpaceId) {
+        this.srcSpaceId = srcSpaceId;
     }
 
-    public String getDestContentId() {
-        return destContentId;
+    public String getSrcContentId() {
+        return srcContentId;
     }
 
-    public void setDestContentId(String destContentId) {
-        this.destContentId = destContentId;
+    public void setSrcContentId(String srcContentId) {
+        this.srcContentId = srcContentId;
     }
 
     public String getContentMd5() {
@@ -51,9 +69,6 @@ public void setContentMd5(String contentMd5) {
         this.contentMd5 = contentMd5;
     }
 
-    /*
-     * Generated by IntelliJ
-     */
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -62,6 +77,9 @@ public boolean equals(Object o) {
         if (!(o instanceof ContentCopyMessage)) {
             return false;
         }
+        if (!super.equals(o)) {
+            return false;
+        }
 
         ContentCopyMessage that = (ContentCopyMessage) o;
 
@@ -69,26 +87,24 @@ public boolean equals(Object o) {
             that.contentMd5 != null) {
             return false;
         }
-        if (destContentId != null ? !destContentId.equals(that.destContentId) :
-            that.destContentId != null) {
+        if (srcContentId != null ? !srcContentId.equals(that.srcContentId) :
+            that.srcContentId != null) {
             return false;
         }
-        if (destSpaceId != null ? !destSpaceId.equals(that.destSpaceId) :
-            that.destSpaceId != null) {
+        if (srcSpaceId != null ? !srcSpaceId.equals(that.srcSpaceId) :
+            that.srcSpaceId != null) {
             return false;
         }
 
         return true;
     }
 
-    /*
-     * Generated by IntelliJ
-     */
     @Override
     public int hashCode() {
-        int result = destSpaceId != null ? destSpaceId.hashCode() : 0;
-        result = 31 * result +
-            (destContentId != null ? destContentId.hashCode() : 0);
+        int result = super.hashCode();
+        result = 31 * result + (srcSpaceId != null ? srcSpaceId.hashCode() : 0);
+        result =
+            31 * result + (srcContentId != null ? srcContentId.hashCode() : 0);
         result = 31 * result + (contentMd5 != null ? contentMd5.hashCode() : 0);
         return result;
     }
diff --git a/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessageConverter.java b/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessageConverter.java
index e0e94fe9c..d41d715c5 100644
--- a/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessageConverter.java
+++ b/storageprovider/src/main/java/org/duracloud/storage/aop/ContentCopyMessageConverter.java
@@ -23,8 +23,8 @@ public class ContentCopyMessageConverter extends BaseContentMessageConverter
     protected final Logger log =
         LoggerFactory.getLogger(ContentCopyMessageConverter.class);
 
-    protected static final String DEST_SPACE_ID = ""destSpaceId"";
-    protected static final String DEST_CONTENT_ID = ""destContentId"";
+    protected static final String SRC_SPACE_ID = ""srcSpaceId"";
+    protected static final String SRC_CONTENT_ID = ""srcContentId"";
     protected static final String CONTENT_MD5= ""contentMd5"";
 
     public Object fromMessage(Message msg) throws JMSException,
@@ -38,8 +38,8 @@ public Object fromMessage(Message msg) throws JMSException,
         MapMessage mapMsg = (MapMessage) msg;
         ContentCopyMessage contentCopyMsg =
             (ContentCopyMessage) super.fromMessage(new ContentCopyMessage(), mapMsg);
-        contentCopyMsg.setDestSpaceId(mapMsg.getString(DEST_SPACE_ID));
-        contentCopyMsg.setDestContentId(mapMsg.getString(DEST_CONTENT_ID));
+        contentCopyMsg.setSrcSpaceId(mapMsg.getString(SRC_SPACE_ID));
+        contentCopyMsg.setSrcContentId(mapMsg.getString(SRC_CONTENT_ID));
         contentCopyMsg.setContentMd5(mapMsg.getString(CONTENT_MD5));
         return contentCopyMsg;
     }
@@ -54,8 +54,8 @@ public Message toMessage(Object obj, Session session) throws JMSException,
         ContentCopyMessage contentMsg = (ContentCopyMessage) obj;
         MapMessage msg = super.toMessage(contentMsg, session);
 
-        msg.setString(DEST_SPACE_ID, contentMsg.getDestSpaceId());
-        msg.setString(DEST_CONTENT_ID, contentMsg.getDestContentId());
+        msg.setString(SRC_SPACE_ID, contentMsg.getSrcSpaceId());
+        msg.setString(SRC_CONTENT_ID, contentMsg.getSrcContentId());
         msg.setString(CONTENT_MD5, contentMsg.getContentMd5());
         return msg;
     }
diff --git a/storageprovider/src/main/java/org/duracloud/storage/aop/ContentMessage.java b/storageprovider/src/main/java/org/duracloud/storage/aop/ContentMessage.java
index 49371b942..629c61d63 100644
--- a/storageprovider/src/main/java/org/duracloud/storage/aop/ContentMessage.java
+++ b/storageprovider/src/main/java/org/duracloud/storage/aop/ContentMessage.java
@@ -7,6 +7,9 @@
  */
 package org.duracloud.storage.aop;
 
+import org.duracloud.common.util.DateUtil;
+import org.duracloud.common.util.bulk.ManifestVerifier;
+
 /**
  * This bean holds to common elements for all ContentStore AOP messages.
  *
@@ -20,6 +23,9 @@ public class ContentMessage {
     private String contentId;
     private String username;
     private String action;
+    private String datetime = DateUtil.now();
+
+    protected static final char DELIM = ManifestVerifier.DELIM;
 
     @Override
     public String toString() {
@@ -29,12 +35,57 @@ public String toString() {
         sb.append(""|contentId:'"" + contentId + ""'"");
         sb.append(""|username:'"" + username + ""'"");
         sb.append(""|action:'"" + action + ""'"");
+        sb.append(""|datetime:'"" + datetime + ""'"");
         sb.append(""]\n"");
         return sb.toString();
     }
 
+    public String asTSV() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(storeId);
+        sb.append(DELIM);
+        sb.append(spaceId);
+        sb.append(DELIM);
+        sb.append(contentId);
+        sb.append(DELIM);
+        sb.append(username);
+        sb.append(DELIM);
+        sb.append(action);
+        sb.append(DELIM);
+        sb.append(datetime);
+        return sb.toString();
+    }
+
+    public static String tsvHeader() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(""store id"");
+        sb.append(DELIM);
+        sb.append(""space id"");
+        sb.append(DELIM);
+        sb.append(""content id"");
+        sb.append(DELIM);
+        sb.append(""user id"");
+        sb.append(DELIM);
+        sb.append(""action"");
+        sb.append(DELIM);
+        sb.append(""datetime"");
+        // below come from ContentCopyMessage and IngestMessage
+        sb.append(DELIM);
+        sb.append(""content MD5"");
+        sb.append(DELIM);
+        sb.append(""content size"");
+        sb.append(DELIM);
+        sb.append(""mimetype"");
+        sb.append(DELIM);
+        sb.append(""src space id"");
+        sb.append(DELIM);
+        sb.append(""src content id"");
+
+        return sb.toString();
+    }
+
     public static enum ACTION {
-        INGEST, COPY, UPDATE, DELETE;
+        INGEST, COPY, UPDATE, DELETE, ERROR;
     }
 
     public String getStoreId() {
@@ -77,6 +128,14 @@ public void setAction(String action) {
         this.action = action;
     }
 
+    public String getDatetime() {
+        return datetime;
+    }
+
+    public void setDatetime(String datetime) {
+        this.datetime = datetime;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -96,6 +155,10 @@ public boolean equals(Object o) {
             that.contentId != null) {
             return false;
         }
+        if (datetime != null ? !datetime.equals(that.datetime) :
+            that.datetime != null) {
+            return false;
+        }
         if (spaceId != null ? !spaceId.equals(that.spaceId) :
             that.spaceId != null) {
             return false;
@@ -119,6 +182,7 @@ public int hashCode() {
         result = 31 * result + (contentId != null ? contentId.hashCode() : 0);
         result = 31 * result + (username != null ? username.hashCode() : 0);
         result = 31 * result + (action != null ? action.hashCode() : 0);
+        result = 31 * result + (datetime != null ? datetime.hashCode() : 0);
         return result;
     }
 }
diff --git a/storageprovider/src/main/java/org/duracloud/storage/aop/IngestMessage.java b/storageprovider/src/main/java/org/duracloud/storage/aop/IngestMessage.java
index b80d68488..c4370c5e5 100644
--- a/storageprovider/src/main/java/org/duracloud/storage/aop/IngestMessage.java
+++ b/storageprovider/src/main/java/org/duracloud/storage/aop/IngestMessage.java
@@ -28,10 +28,24 @@ public String toString() {
         sb.append(""|username:'"" + getUsername() + ""'"");
         sb.append(""|contentMd5:'"" + contentMd5 + ""'"");
         sb.append(""|contentSize:'"" + contentSize + ""'"");
+        sb.append(""|action:'"" + getAction() + ""'"");
+        sb.append(""|datetime:'"" + getDatetime() + ""'"");
         sb.append(""]\n"");
         return sb.toString();
     }
 
+    @Override
+    public String asTSV() {
+        StringBuilder sb = new StringBuilder(super.asTSV());
+        sb.append(DELIM);
+        sb.append(contentMd5);
+        sb.append(DELIM);
+        sb.append(contentSize);
+        sb.append(DELIM);
+        sb.append(contentMimeType);
+        return sb.toString();
+    }
+
     public String getContentMimeType() {
         return contentMimeType;
     }
diff --git a/storageprovider/src/test/java/org/duracloud/storage/aop/ContentCopyMessageConverterTest.java b/storageprovider/src/test/java/org/duracloud/storage/aop/ContentCopyMessageConverterTest.java
index 17f1e3314..8920ce017 100644
--- a/storageprovider/src/test/java/org/duracloud/storage/aop/ContentCopyMessageConverterTest.java
+++ b/storageprovider/src/test/java/org/duracloud/storage/aop/ContentCopyMessageConverterTest.java
@@ -72,16 +72,16 @@ public void testFromMessage() throws JMSException {
         EasyMock.expectLastCall().andReturn(storeId);
 
         msg.getString(ContentCopyMessageConverter.SPACE_ID);
-        EasyMock.expectLastCall().andReturn(srcSpaceId);
+        EasyMock.expectLastCall().andReturn(destSpaceId);
 
         msg.getString(ContentCopyMessageConverter.CONTENT_ID);
-        EasyMock.expectLastCall().andReturn(srcContentId);
+        EasyMock.expectLastCall().andReturn(destContentId);
 
-        msg.getString(ContentCopyMessageConverter.DEST_SPACE_ID);
-        EasyMock.expectLastCall().andReturn(destSpaceId);
+        msg.getString(ContentCopyMessageConverter.SRC_SPACE_ID);
+        EasyMock.expectLastCall().andReturn(srcSpaceId);
 
-        msg.getString(ContentCopyMessageConverter.DEST_CONTENT_ID);
-        EasyMock.expectLastCall().andReturn(destContentId);
+        msg.getString(ContentCopyMessageConverter.SRC_CONTENT_ID);
+        EasyMock.expectLastCall().andReturn(srcContentId);
 
         msg.getString(ContentCopyMessageConverter.USERNAME);
         EasyMock.expectLastCall().andReturn(username);
@@ -100,10 +100,10 @@ public void testFromMessage() throws JMSException {
 
         ContentCopyMessage contentCopyMessage = (ContentCopyMessage) obj;
         assertEquals(storeId, contentCopyMessage.getStoreId());
-        assertEquals(srcSpaceId, contentCopyMessage.getSpaceId());
-        assertEquals(srcContentId, contentCopyMessage.getContentId());
-        assertEquals(destSpaceId, contentCopyMessage.getDestSpaceId());
-        assertEquals(destContentId, contentCopyMessage.getDestContentId());
+        assertEquals(srcSpaceId, contentCopyMessage.getSrcSpaceId());
+        assertEquals(srcContentId, contentCopyMessage.getSrcContentId());
+        assertEquals(destSpaceId, contentCopyMessage.getSpaceId());
+        assertEquals(destContentId, contentCopyMessage.getContentId());
         assertEquals(username, contentCopyMessage.getUsername());
         assertEquals(contentMd5, contentCopyMessage.getContentMd5());
         assertEquals(action, contentCopyMessage.getAction());
@@ -126,19 +126,19 @@ public void testToMessage() throws JMSException {
         EasyMock.expectLastCall().once();
 
         mapMsg.setString(ContentCopyMessageConverter.SPACE_ID,
-                         srcSpaceId);
+                         destSpaceId);
         EasyMock.expectLastCall().once();
 
         mapMsg.setString(ContentCopyMessageConverter.CONTENT_ID,
-                         srcContentId);
+                         destContentId);
         EasyMock.expectLastCall().once();
 
-        mapMsg.setString(ContentCopyMessageConverter.DEST_SPACE_ID,
-                         destSpaceId);
+        mapMsg.setString(ContentCopyMessageConverter.SRC_SPACE_ID,
+                         srcSpaceId);
         EasyMock.expectLastCall().once();
 
-        mapMsg.setString(ContentCopyMessageConverter.DEST_CONTENT_ID,
-                         destContentId);
+        mapMsg.setString(ContentCopyMessageConverter.SRC_CONTENT_ID,
+                         srcContentId);
         EasyMock.expectLastCall().once();
 
         mapMsg.setString(ContentCopyMessageConverter.USERNAME, username);
@@ -152,10 +152,10 @@ public void testToMessage() throws JMSException {
 
         ContentCopyMessage contentCopyMessage = new ContentCopyMessage();
         contentCopyMessage.setStoreId(storeId);
-        contentCopyMessage.setSpaceId(srcSpaceId);
-        contentCopyMessage.setContentId(srcContentId);
-        contentCopyMessage.setDestSpaceId(destSpaceId);
-        contentCopyMessage.setDestContentId(destContentId);
+        contentCopyMessage.setSrcSpaceId(srcSpaceId);
+        contentCopyMessage.setSrcContentId(srcContentId);
+        contentCopyMessage.setSpaceId(destSpaceId);
+        contentCopyMessage.setContentId(destContentId);
         contentCopyMessage.setUsername(username);
         contentCopyMessage.setContentMd5(contentMd5);
         contentCopyMessage.setAction(action);"
d47f33629bcc15db2d0f9d75289b0d0da4850799,drools,add support for maven version ranges--,a,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/main/java/org/kie/builder/impl/KieRepositoryImpl.java b/drools-compiler/src/main/java/org/kie/builder/impl/KieRepositoryImpl.java
index 5d61f05c047..418d8c0f14a 100644
--- a/drools-compiler/src/main/java/org/kie/builder/impl/KieRepositoryImpl.java
+++ b/drools-compiler/src/main/java/org/kie/builder/impl/KieRepositoryImpl.java
@@ -14,9 +14,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Stack;
+import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class KieRepositoryImpl
@@ -30,7 +40,7 @@ public class KieRepositoryImpl
 
     static final KieRepositoryImpl     INSTANCE         = new KieRepositoryImpl();
 
-    private final Map<GAV, KieModule> kieModules        = new HashMap<GAV, KieModule>();
+    private final KieModuleRepo        kieModuleRepo    = new KieModuleRepo();
 
     private final AtomicReference<GAV> defaultGAV       = new AtomicReference( new GAVImpl( DEFAULT_GROUP,
                                                                                             DEFAULT_ARTIFACT,
@@ -47,8 +57,7 @@ public GAV getDefaultGAV() {
     }
 
     public void addKieModule(KieModule kieModule) {
-        kieModules.put(kieModule.getGAV(),
-                       kieModule);
+        kieModuleRepo.store(kieModule);
         log.info( ""KieModule was added:"" + kieModule);
     }
 
@@ -57,7 +66,9 @@ public Results verfyKieModule(GAV gav) {
     }
 
     public KieModule getKieModule(GAV gav) {
-        KieModule kieModule = kieModules.get( gav );
+        VersionRange versionRange = new VersionRange(gav.getVersion());
+
+        KieModule kieModule = kieModuleRepo.load(gav, versionRange);
         if ( kieModule == null ) {
             log.debug( ""KieModule Lookup. GAV {} was not in cache, checking classpath"",
                        gav.toExternalForm() );
@@ -164,5 +175,441 @@ public KieModule getKieModule(Resource resource) {
             throw new RuntimeException(""Unable to fetch module from resource :"" + res, e);
         }          
     }
-        
+
+    private static class KieModuleRepo {
+        private final Map<String, TreeMap<ComparableVersion, KieModule>> kieModules = new HashMap<String, TreeMap<ComparableVersion, KieModule>>();
+
+        void store(KieModule kieModule) {
+            GAV gav = kieModule.getGAV();
+            String ga = gav.getGroupId() + "":"" + gav.getArtifactId();
+
+            TreeMap<ComparableVersion, KieModule> artifactMap = kieModules.get(ga);
+            if (artifactMap == null) {
+                artifactMap = new TreeMap<ComparableVersion, KieModule>();
+                kieModules.put(ga, artifactMap);
+            }
+            artifactMap.put(new ComparableVersion(gav.getVersion()), kieModule);
+        }
+
+        KieModule load(GAV gav, VersionRange versionRange) {
+            String ga = gav.getGroupId() + "":"" + gav.getArtifactId();
+            TreeMap<ComparableVersion, KieModule> artifactMap = kieModules.get(ga);
+            if (artifactMap == null) {
+                return null;
+            }
+
+            if (versionRange.fixed) {
+                return artifactMap.get(new ComparableVersion(gav.getVersion()));
+            }
+
+            if (versionRange.upperBound == null) {
+                return artifactMap.lastEntry().getValue();
+            }
+
+            Map.Entry<ComparableVersion, KieModule> entry = versionRange.upperInclusive ?
+                    artifactMap.ceilingEntry(new ComparableVersion(versionRange.upperBound)) :
+                    artifactMap.lowerEntry(new ComparableVersion(versionRange.upperBound));
+
+            if (entry == null) {
+                return null;
+            }
+
+            if (versionRange.lowerBound == null) {
+                return entry.getValue();
+            }
+
+            int versionComparison = entry.getKey().compareTo(new ComparableVersion(versionRange.lowerBound));
+            return versionComparison > 0 || (versionComparison == 0 && versionRange.lowerInclusive) ? entry.getValue() : null;
+        }
+    }
+
+    private static class VersionRange {
+        private String lowerBound;
+        private String upperBound;
+        private boolean lowerInclusive;
+        private boolean upperInclusive;
+        private boolean fixed;
+
+        private VersionRange(String version) {
+            parse(version);
+        }
+
+        private void parse(String version) {
+            if (""LATEST"".equals(version) || ""RELEASE"".equals(version)) {
+                fixed = false;
+                lowerBound = ""1.0"";
+                upperBound = null;
+                lowerInclusive = true;
+                upperInclusive = false;
+                return;
+            }
+
+            if (version.charAt(0) != '(' && version.charAt(0) != '[') {
+                fixed = true;
+                lowerBound = version;
+                upperBound = version;
+                lowerInclusive = true;
+                upperInclusive = true;
+                return;
+            }
+
+            lowerInclusive = version.charAt(0) == '[';
+            upperInclusive = version.charAt(version.length()-1) == ']';
+
+            int commaPos = version.indexOf(',');
+            if (commaPos < 0) {
+                fixed = true;
+                lowerBound = version.substring(1, version.length() - 1);
+                upperBound = lowerBound;
+            } else {
+                if (commaPos > 1) {
+                    lowerBound = version.substring(1, commaPos);
+                }
+                if (commaPos < version.length()-2) {
+                    upperBound = version.substring(commaPos + 1, version.length() - 1);
+                }
+            }
+        }
+    }
+
+    public static class ComparableVersion implements Comparable<ComparableVersion> {
+        private String value;
+
+        private String canonical;
+
+        private ListItem items;
+
+        private interface Item {
+            final int INTEGER_ITEM = 0;
+            final int STRING_ITEM = 1;
+            final int LIST_ITEM = 2;
+
+            int compareTo( Item item );
+
+            int getType();
+
+            boolean isNull();
+        }
+
+        private static class IntegerItem implements Item {
+            private static final BigInteger BigInteger_ZERO = new BigInteger( ""0"" );
+
+            private final BigInteger value;
+
+            public static final IntegerItem ZERO = new IntegerItem();
+
+            private IntegerItem() {
+                this.value = BigInteger_ZERO;
+            }
+
+            public IntegerItem( String str ) {
+                this.value = new BigInteger( str );
+            }
+
+            public int getType() {
+                return INTEGER_ITEM;
+            }
+
+            public boolean isNull() {
+                return BigInteger_ZERO.equals( value );
+            }
+
+            public int compareTo( Item item ) {
+                if ( item == null )
+                {
+                    return BigInteger_ZERO.equals( value ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+                }
+
+                switch ( item.getType() )
+                {
+                    case INTEGER_ITEM:
+                        return value.compareTo( ( (IntegerItem) item ).value );
+
+                    case STRING_ITEM:
+                        return 1; // 1.1 > 1-sp
+
+                    case LIST_ITEM:
+                        return 1; // 1.1 > 1-1
+
+                    default:
+                        throw new RuntimeException( ""invalid item: "" + item.getClass() );
+                }
+            }
+
+            public String toString() {
+                return value.toString();
+            }
+        }
+
+        /**
+         * Represents a string in the version item list, usually a qualifier.
+         */
+        private static class StringItem implements Item {
+            private static final String[] QUALIFIERS = { ""alpha"", ""beta"", ""milestone"", ""rc"", ""snapshot"", """", ""sp"" };
+
+            private static final List<String> _QUALIFIERS = Arrays.asList(QUALIFIERS);
+
+            private static final Properties ALIASES = new Properties();
+
+            static {
+                ALIASES.put( ""ga"", """" );
+                ALIASES.put( ""final"", """" );
+                ALIASES.put( ""cr"", ""rc"" );
+            }
+
+            /**
+             * A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
+             * the version older than one without a qualifier, or more recent.
+             */
+            private static final String RELEASE_VERSION_INDEX = String.valueOf( _QUALIFIERS.indexOf( """" ) );
+
+            private String value;
+
+            public StringItem( String value, boolean followedByDigit ) {
+                if ( followedByDigit && value.length() == 1 ) {
+                    // a1 = alpha-1, b1 = beta-1, m1 = milestone-1
+                    switch ( value.charAt( 0 ) ) {
+                        case 'a':
+                            value = ""alpha"";
+                            break;
+                        case 'b':
+                            value = ""beta"";
+                            break;
+                        case 'm':
+                            value = ""milestone"";
+                            break;
+                    }
+                }
+                this.value = ALIASES.getProperty( value , value );
+            }
+
+            public int getType() {
+                return STRING_ITEM;
+            }
+
+            public boolean isNull() {
+                return ( comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX ) == 0 );
+            }
+
+            /**
+             * Returns a comparable value for a qualifier.
+             *
+             * This method both takes into account the ordering of known qualifiers as well as lexical ordering for unknown
+             * qualifiers.
+             *
+             * just returning an Integer with the index here is faster, but requires a lot of if/then/else to check for -1
+             * or QUALIFIERS.size and then resort to lexical ordering. Most comparisons are decided by the first character,
+             * so this is still fast. If more characters are needed then it requires a lexical sort anyway.
+             *
+             * @param qualifier
+             * @return an equivalent value that can be used with lexical comparison
+             */
+            public static String comparableQualifier( String qualifier ) {
+                int i = _QUALIFIERS.indexOf( qualifier );
+
+                return i == -1 ? _QUALIFIERS.size() + ""-"" + qualifier : String.valueOf( i );
+            }
+
+            public int compareTo( Item item ) {
+                if ( item == null ) {
+                    // 1-rc < 1, 1-ga > 1
+                    return comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX );
+                }
+                switch ( item.getType() ) {
+                    case INTEGER_ITEM:
+                        return -1; // 1.any < 1.1 ?
+
+                    case STRING_ITEM:
+                        return comparableQualifier( value ).compareTo( comparableQualifier( ( (StringItem) item ).value ) );
+
+                    case LIST_ITEM:
+                        return -1; // 1.any < 1-1
+
+                    default:
+                        throw new RuntimeException( ""invalid item: "" + item.getClass() );
+                }
+            }
+
+            public String toString() {
+                return value;
+            }
+        }
+
+        /**
+         * Represents a version list item. This class is used both for the global item list and for sub-lists (which start
+         * with '-(number)' in the version specification).
+         */
+        private static class ListItem extends ArrayList<Item> implements Item {
+            public int getType() {
+                return LIST_ITEM;
+            }
+
+            public boolean isNull() {
+                return ( size() == 0 );
+            }
+
+            void normalize() {
+                for( ListIterator<Item> iterator = listIterator( size() ); iterator.hasPrevious(); ) {
+                    Item item = iterator.previous();
+                    if ( item.isNull() ) {
+                        iterator.remove(); // remove null trailing items: 0, """", empty list
+                    } else {
+                        break;
+                    }
+                }
+            }
+
+            public int compareTo( Item item ) {
+                if ( item == null ) {
+                    if ( size() == 0 ) {
+                        return 0; // 1-0 = 1- (normalize) = 1
+                    }
+                    Item first = get( 0 );
+                    return first.compareTo( null );
+                }
+                switch ( item.getType() ) {
+                    case INTEGER_ITEM:
+                        return -1; // 1-1 < 1.0.x
+
+                    case STRING_ITEM:
+                        return 1; // 1-1 > 1-sp
+
+                    case LIST_ITEM:
+                        Iterator<Item> left = iterator();
+                        Iterator<Item> right = ( (ListItem) item ).iterator();
+
+                        while ( left.hasNext() || right.hasNext() ) {
+                            Item l = left.hasNext() ? left.next() : null;
+                            Item r = right.hasNext() ? right.next() : null;
+
+                            // if this is shorter, then invert the compare and mul with -1
+                            int result = l == null ? -1 * r.compareTo( l ) : l.compareTo( r );
+
+                            if ( result != 0 ) {
+                                return result;
+                            }
+                        }
+
+                        return 0;
+
+                    default:
+                        throw new RuntimeException( ""invalid item: "" + item.getClass() );
+                }
+            }
+
+            public String toString() {
+                StringBuilder buffer = new StringBuilder( ""("" );
+                for( Iterator<Item> iter = iterator(); iter.hasNext(); )
+                {
+                    buffer.append( iter.next() );
+                    if ( iter.hasNext() )
+                    {
+                        buffer.append( ',' );
+                    }
+                }
+                buffer.append( ')' );
+                return buffer.toString();
+            }
+        }
+
+        public ComparableVersion( String version ) {
+            parseVersion( version );
+        }
+
+        public final void parseVersion( String version ) {
+            this.value = version;
+
+            items = new ListItem();
+
+            version = version.toLowerCase( Locale.ENGLISH );
+
+            ListItem list = items;
+
+            Stack<Item> stack = new Stack<Item>();
+            stack.push( list );
+
+            boolean isDigit = false;
+
+            int startIndex = 0;
+
+            for ( int i = 0; i < version.length(); i++ ) {
+                char c = version.charAt( i );
+
+                if ( c == '.' ) {
+                    if ( i == startIndex ) {
+                        list.add( IntegerItem.ZERO );
+                    } else {
+                        list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
+                    }
+                    startIndex = i + 1;
+                } else if ( c == '-' ) {
+                    if ( i == startIndex ) {
+                        list.add( IntegerItem.ZERO );
+                    } else {
+                        list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
+                    }
+                    startIndex = i + 1;
+
+                    if ( isDigit ) {
+                        list.normalize(); // 1.0-* = 1-*
+
+                        if ( ( i + 1 < version.length() ) && Character.isDigit( version.charAt( i + 1 ) ) ) {
+                            // new ListItem only if previous were digits and new char is a digit,
+                            // ie need to differentiate only 1.1 from 1-1
+                            list.add( list = new ListItem() );
+
+                            stack.push( list );
+                        }
+                    }
+                }
+                else if ( Character.isDigit( c ) ) {
+                    if ( !isDigit && i > startIndex ) {
+                        list.add( new StringItem( version.substring( startIndex, i ), true ) );
+                        startIndex = i;
+                    }
+
+                    isDigit = true;
+                } else {
+                    if ( isDigit && i > startIndex ) {
+                        list.add( parseItem( true, version.substring( startIndex, i ) ) );
+                        startIndex = i;
+                    }
+
+                    isDigit = false;
+                }
+            }
+
+            if ( version.length() > startIndex ) {
+                list.add( parseItem( isDigit, version.substring( startIndex ) ) );
+            }
+
+            while ( !stack.isEmpty() ) {
+                list = (ListItem) stack.pop();
+                list.normalize();
+            }
+
+            canonical = items.toString();
+        }
+
+        private static Item parseItem( boolean isDigit, String buf ) {
+            return isDigit ? new IntegerItem( buf ) : new StringItem( buf, false );
+        }
+
+        public int compareTo( ComparableVersion o ) {
+            return items.compareTo( o.items );
+        }
+
+        public String toString() {
+            return value;
+        }
+
+        public boolean equals( Object o ) {
+            return ( o instanceof ComparableVersion ) && canonical.equals( ( (ComparableVersion) o ).canonical );
+        }
+
+        public int hashCode() {
+            return canonical.hashCode();
+        }
+    }
 }
+
diff --git a/drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java b/drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
index 8024bf64c42..66a7de75d5f 100644
--- a/drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
+++ b/drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
@@ -1,9 +1,5 @@
 package org.kie.builder.impl;
 
-import static org.drools.compiler.io.memory.MemoryFileSystem.readFromJar;
-
-import java.io.File;
-
 import org.drools.audit.KnowledgeRuntimeLoggerProviderImpl;
 import org.drools.command.impl.CommandFactoryServiceImpl;
 import org.drools.concurrent.ExecutorProviderImpl;
@@ -25,6 +21,10 @@
 import org.kie.persistence.jpa.KieStoreServices;
 import org.kie.util.ServiceRegistryImpl;
 
+import java.io.File;
+
+import static org.drools.compiler.io.memory.MemoryFileSystem.readFromJar;
+
 public class KieServicesImpl implements KieServices {
     private ResourceFactoryService resourceFactory;
     
@@ -60,7 +60,11 @@ public KieContainer getKieClasspathContainer() {
     }
     
     public KieContainer getKieContainer(GAV gav) {
-        KieProject kProject = new KieModuleKieProject( ( InternalKieModule )  getKieRepository().getKieModule(gav), getKieRepository() );
+        InternalKieModule kieModule = (InternalKieModule)getKieRepository().getKieModule(gav);
+        if (kieModule == null) {
+            throw new RuntimeException(""Cannot find KieModule: "" + gav);
+        }
+        KieProject kProject = new KieModuleKieProject( kieModule, getKieRepository() );
         return new KieContainerImpl( kProject, getKieRepository() );
     }
     
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/KieHelloWorldTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/KieHelloWorldTest.java
index 09a22735675..5e8ae855efc 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/KieHelloWorldTest.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/KieHelloWorldTest.java
@@ -84,7 +84,7 @@ public void testHelloWorldWithPackages() throws Exception {
                 .generateAndWritePomXML( gav )
                 .write(""src/main/resources/KBase1/org/pkg1/r1.drl"", drl1)
                 .write(""src/main/resources/KBase1/org/pkg2/r2.drl"", drl2)
-                .writeKModuleXML( createKieProjectWithPackages(kf, ""org.pkg1"").toXML());
+                .writeKModuleXML(createKieProjectWithPackages(kf, ""org.pkg1"").toXML());
         ks.newKieBuilder( kfs ).build();
 
         KieSession ksession = ks.getKieContainer(gav).getKieSession(""KSession1"");
@@ -139,8 +139,64 @@ private KieModuleModel createKieProjectWithPackages(KieFactory kf, String pkg) {
 
         KieSessionModel ksession1 = kieBaseModel1.newKieSessionModel(""KSession1"")
                 .setType( KieSessionType.STATEFUL )
-                .setClockType( ClockTypeOption.get(""realtime"") );
+                .setClockType(ClockTypeOption.get(""realtime""));
 
         return kproj;
     }
-}
+
+    @Test
+    public void testHelloWorldOnVersionRange() throws Exception {
+        KieServices ks = KieServices.Factory.get();
+        KieFactory kf = KieFactory.Factory.get();
+
+        buildVersion(ks, kf, ""Hello World"", ""1.0"");
+        buildVersion(ks, kf, ""Aloha Earth"", ""1.1"");
+        buildVersion(ks, kf, ""Hi Universe"", ""1.2"");
+
+        GAV latestGav = kf.newGav(""org.kie"", ""hello-world"", ""LATEST"");
+
+        KieSession ksession = ks.getKieContainer(latestGav).getKieSession(""KSession1"");
+        ksession.insert(new Message(""Hello World""));
+        assertEquals( 0, ksession.fireAllRules() );
+
+        ksession = ks.getKieContainer(latestGav).getKieSession(""KSession1"");
+        ksession.insert(new Message(""Hi Universe""));
+        assertEquals( 1, ksession.fireAllRules() );
+
+        GAV gav1 = kf.newGav(""org.kie"", ""hello-world"", ""1.0"");
+
+        ksession = ks.getKieContainer(gav1).getKieSession(""KSession1"");
+        ksession.insert(new Message(""Hello World""));
+        assertEquals( 1, ksession.fireAllRules() );
+
+        ksession = ks.getKieContainer(gav1).getKieSession(""KSession1"");
+        ksession.insert(new Message(""Hi Universe""));
+        assertEquals( 0, ksession.fireAllRules() );
+
+        GAV gav2 = kf.newGav(""org.kie"", ""hello-world"", ""[1.0,1.2)"");
+
+        ksession = ks.getKieContainer(gav2).getKieSession(""KSession1"");
+        ksession.insert(new Message(""Aloha Earth""));
+        assertEquals( 1, ksession.fireAllRules() );
+
+        ksession = ks.getKieContainer(gav2).getKieSession(""KSession1"");
+        ksession.insert(new Message(""Hi Universe""));
+        assertEquals( 0, ksession.fireAllRules() );
+    }
+
+    private void buildVersion(KieServices ks, KieFactory kf, String message, String version) {
+        String drl = ""package org.drools\n"" +
+                ""rule R1 when\n"" +
+                ""   $m : Message( message == \"""" + message+ ""\"" )\n"" +
+                ""then\n"" +
+                ""end\n"";
+
+        GAV gav = kf.newGav(""org.kie"", ""hello-world"", version);
+
+        KieFileSystem kfs = kf.newKieFileSystem()
+                .generateAndWritePomXML( gav )
+                .write(""src/main/resources/KBase1/org/pkg1/r1.drl"", drl)
+                .writeKModuleXML(createKieProjectWithPackages(kf, ""*"").toXML());
+        ks.newKieBuilder( kfs ).build();
+    }
+}
\ No newline at end of file
diff --git a/kie-ci/src/main/java/org/drools/scanner/DependencyDescriptor.java b/kie-ci/src/main/java/org/drools/scanner/DependencyDescriptor.java
index bef63bce73d..bb664538a27 100644
--- a/kie-ci/src/main/java/org/drools/scanner/DependencyDescriptor.java
+++ b/kie-ci/src/main/java/org/drools/scanner/DependencyDescriptor.java
@@ -67,7 +67,7 @@ public String getType() {
     }
 
     public boolean isFixedVersion() {
-        return !isSnapshot() && !version.equals(""LATEST"") && !version.equals("")"");
+        return !isSnapshot() && !version.equals(""LATEST"") && !version.equals(""RELEASE"");
     }
 
     public boolean isSnapshot() {
diff --git a/kie-ci/src/main/java/org/drools/scanner/KieRepositoryScannerImpl.java b/kie-ci/src/main/java/org/drools/scanner/KieRepositoryScannerImpl.java
index 9cad4a12bbe..c57c373347e 100644
--- a/kie-ci/src/main/java/org/drools/scanner/KieRepositoryScannerImpl.java
+++ b/kie-ci/src/main/java/org/drools/scanner/KieRepositoryScannerImpl.java
@@ -166,6 +166,9 @@ private Collection<Artifact> scanForUpdates(Collection<DependencyDescriptor> dep
         List<Artifact> newArtifacts = new ArrayList<Artifact>();
         for (DependencyDescriptor dependency : dependencies) {
             Artifact newArtifact = getArtifactResolver().resolveArtifact(dependency.toResolvableString());
+            if (newArtifact == null) {
+                continue;
+            }
             DependencyDescriptor resolvedDep = new DependencyDescriptor(newArtifact);
             if (resolvedDep.isNewerThan(dependency)) {
                 newArtifacts.add(newArtifact);
diff --git a/kie-ci/src/test/java/org/drools/scanner/KieRepositoryScannerTest.java b/kie-ci/src/test/java/org/drools/scanner/KieRepositoryScannerTest.java
index 95b75930554..77b33dee482 100644
--- a/kie-ci/src/test/java/org/drools/scanner/KieRepositoryScannerTest.java
+++ b/kie-ci/src/test/java/org/drools/scanner/KieRepositoryScannerTest.java
@@ -141,7 +141,7 @@ public void testScannerOnPomProject() throws Exception {
         InternalKieModule kJar1 = createKieJarWithClass(ks, kf, gav1, 2, 7);
         repository.deployArtifact(gav1, kJar1, createKPom(gav1));
 
-        KieContainer kieContainer = ks.getKieContainer(kf.newGav(""org.kie"", ""scanner-master-test"", ""1.0""));
+        KieContainer kieContainer = ks.getKieContainer(kf.newGav(""org.kie"", ""scanner-master-test"", ""LATEST""));
         KieSession ksession = kieContainer.getKieSession(""KSession1"");
         checkKSession(ksession, 14);"
01ff1c8a77ed63405af637be35318ee693dcd1c5,restlet-framework-java, - Deprecated ServletConverter and added an- equivalent    ServletAdapter class to prevent confusion with the  - ConverterService reintroduced in Restlet 1.2.  - Added root Helper class.--,p,https://github.com/restlet/restlet-framework-java,"diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
index 1a4dc4b5ff..3bdf989f0d 100644
--- a/build/tmpl/text/changes.txt
+++ b/build/tmpl/text/changes.txt
@@ -5,7 +5,9 @@ Changes log
 
 - @version-full@ (@release-date@)
     - Breaking changes
-        - 
+        - Deprecated ServletConverter and added an equivalent 
+          ServletAdapter class to prevent confusion with the 
+          ConverterService reintroduced in Restlet 1.2. 
     - Bugs fixed
         - Fixed bug with a ServerResource when an annotated method does 
           not return a value.
diff --git a/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/internal/util/Util.java b/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/internal/util/Util.java
index 4a32217c8d..6accbacefd 100644
--- a/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/internal/util/Util.java
+++ b/modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/internal/util/Util.java
@@ -78,8 +78,8 @@
 import org.restlet.data.Response;
 import org.restlet.engine.http.ContentType;
 import org.restlet.engine.http.HttpClientCall;
-import org.restlet.engine.http.HttpClientConverter;
-import org.restlet.engine.http.HttpServerConverter;
+import org.restlet.engine.http.HttpClientAdapter;
+import org.restlet.engine.http.HttpServerAdapter;
 import org.restlet.engine.http.HttpUtils;
 import org.restlet.engine.util.DateUtils;
 import org.restlet.ext.jaxrs.internal.core.UnmodifiableMultivaluedMap;
@@ -306,7 +306,7 @@ public static void copyResponseHeaders(
             restletResponse.setEntity(new EmptyRepresentation());
         }
 
-        HttpClientConverter.copyResponseTransportHeaders(headers,
+        HttpClientAdapter.copyResponseTransportHeaders(headers,
                 restletResponse);
         HttpClientCall.copyResponseEntityHeaders(headers, restletResponse
                 .getEntity());
@@ -324,8 +324,8 @@ public static void copyResponseHeaders(
      */
     public static Series<Parameter> copyResponseHeaders(Response restletResponse) {
         final Series<Parameter> headers = new Form();
-        HttpServerConverter.addResponseHeaders(restletResponse, headers);
-        HttpServerConverter.addEntityHeaders(restletResponse.getEntity(),
+        HttpServerAdapter.addResponseHeaders(restletResponse, headers);
+        HttpServerAdapter.addEntityHeaders(restletResponse.getEntity(),
                 headers);
         return headers;
     }
diff --git a/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletAdapter.java b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletAdapter.java
new file mode 100644
index 0000000000..48ac006096
--- /dev/null
+++ b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletAdapter.java
@@ -0,0 +1,243 @@
+/**
+ * Copyright 2005-2009 Noelios Technologies.
+ * 
+ * The contents of this file are subject to the terms of one of the following
+ * open source licenses: LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL 1.0 (the
+ * ""Licenses""). You can select the license that you prefer but you may not use
+ * this file except in compliance with one of these Licenses.
+ * 
+ * You can obtain a copy of the LGPL 3.0 license at
+ * http://www.opensource.org/licenses/lgpl-3.0.html
+ * 
+ * You can obtain a copy of the LGPL 2.1 license at
+ * http://www.opensource.org/licenses/lgpl-2.1.php
+ * 
+ * You can obtain a copy of the CDDL 1.0 license at
+ * http://www.opensource.org/licenses/cddl1.php
+ * 
+ * You can obtain a copy of the EPL 1.0 license at
+ * http://www.opensource.org/licenses/eclipse-1.0.php
+ * 
+ * See the Licenses for the specific language governing permissions and
+ * limitations under the Licenses.
+ * 
+ * Alternatively, you can obtain a royalty free commercial license with less
+ * limitations, transferable or non-transferable, directly at
+ * http://www.noelios.com/products/restlet-engine
+ * 
+ * Restlet is a registered trademark of Noelios Technologies.
+ */
+
+package org.restlet.ext.servlet;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.restlet.Context;
+import org.restlet.Restlet;
+import org.restlet.data.Reference;
+import org.restlet.engine.http.HttpRequest;
+import org.restlet.engine.http.HttpResponse;
+import org.restlet.engine.http.HttpServerAdapter;
+import org.restlet.ext.servlet.internal.ServletCall;
+import org.restlet.ext.servlet.internal.ServletLogger;
+
+/**
+ * HTTP adapter from Servlet calls to Restlet calls. This class can be used in
+ * any Servlet, just create a new instance and override the service() method in
+ * your Servlet to delegate all those calls to this class's service() method.
+ * Remember to set the target Restlet, for example using a Restlet Router
+ * instance. You can get the Restlet context directly on instances of this
+ * class, it will be based on the parent Servlet's context for logging purpose.<br>
+ * <br>
+ * This class is especially useful when directly integrating Restlets with
+ * Spring managed Web applications. Here is a simple usage example:
+ * 
+ * <pre>
+ * public class TestServlet extends HttpServlet {
+ *     private ServletAdapter adapter;
+ * 
+ *     public void init() throws ServletException {
+ *         super.init();
+ *         this.adapter = new ServletAdapter(getServletContext());
+ * 
+ *         Restlet trace = new Restlet(this.adapter.getContext()) {
+ *             public void handle(Request req, Response res) {
+ *                 getLogger().info(&quot;Hello World&quot;);
+ *                 res.setEntity(&quot;Hello World!&quot;, MediaType.TEXT_PLAIN);
+ *             }
+ *         };
+ * 
+ *         this.adapter.setTarget(trace);
+ *     }
+ * 
+ *     protected void service(HttpServletRequest req, HttpServletResponse res)
+ *             throws ServletException, IOException {
+ *         this.adapter.service(req, res);
+ *     }
+ * }
+ * </pre>
+ * 
+ * @author Jerome Louvel
+ */
+public class ServletAdapter extends HttpServerAdapter {
+    /** The target Restlet. */
+    private volatile Restlet target;
+
+    /**
+     * Constructor. Remember to manually set the ""target"" property before
+     * invoking the service() method.
+     * 
+     * @param context
+     *            The Servlet context.
+     */
+    public ServletAdapter(ServletContext context) {
+        this(context, null);
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param context
+     *            The Servlet context.
+     * @param target
+     *            The target Restlet.
+     */
+    public ServletAdapter(ServletContext context, Restlet target) {
+        super(new Context(new ServletLogger(context)));
+        this.target = target;
+    }
+
+    /**
+     * Returns the base reference of new Restlet requests.
+     * 
+     * @param request
+     *            The Servlet request.
+     * @return The base reference of new Restlet requests.
+     */
+    public Reference getBaseRef(HttpServletRequest request) {
+        Reference result = null;
+        final String basePath = request.getContextPath()
+                + request.getServletPath();
+        final String baseUri = request.getRequestURL().toString();
+        // Path starts at first slash after scheme://
+        final int pathStart = baseUri.indexOf(""/"",
+                request.getScheme().length() + 3);
+        if (basePath.length() == 0) {
+            // basePath is empty in case the webapp is mounted on root context
+            if (pathStart != -1) {
+                result = new Reference(baseUri.substring(0, pathStart));
+            } else {
+                result = new Reference(baseUri);
+            }
+        } else {
+            if (pathStart != -1) {
+                final int baseIndex = baseUri.indexOf(basePath, pathStart);
+                if (baseIndex != -1) {
+                    result = new Reference(baseUri.substring(0, baseIndex
+                            + basePath.length()));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns the root reference of new Restlet requests. By default it returns
+     * the result of getBaseRef().
+     * 
+     * @param request
+     *            The Servlet request.
+     * @return The root reference of new Restlet requests.
+     */
+    public Reference getRootRef(HttpServletRequest request) {
+        return getBaseRef(request);
+    }
+
+    /**
+     * Returns the target Restlet.
+     * 
+     * @return The target Restlet.
+     */
+    public Restlet getTarget() {
+        return this.target;
+    }
+
+    /**
+     * Services a HTTP Servlet request as a Restlet request handled by the
+     * ""target"" Restlet.
+     * 
+     * @param request
+     *            The HTTP Servlet request.
+     * @param response
+     *            The HTTP Servlet response.
+     */
+    public void service(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        if (getTarget() != null) {
+            // Set the current context
+            Context.setCurrent(getContext());
+
+            // Convert the Servlet call to a Restlet call
+            final ServletCall servletCall = new ServletCall(request
+                    .getLocalAddr(), request.getLocalPort(), request, response);
+            final HttpRequest httpRequest = toRequest(servletCall);
+            final HttpResponse httpResponse = new HttpResponse(servletCall,
+                    httpRequest);
+
+            // Adjust the relative reference
+            httpRequest.getResourceRef().setBaseRef(getBaseRef(request));
+
+            // Adjust the root reference
+            httpRequest.setRootRef(getRootRef(request));
+
+            // Handle the request and commit the response
+            getTarget().handle(httpRequest, httpResponse);
+            commit(httpResponse);
+        } else {
+            getLogger().warning(""Unable to find the Restlet target"");
+        }
+    }
+
+    /**
+     * Sets the target Restlet.
+     * 
+     * @param target
+     *            The target Restlet.
+     */
+    public void setTarget(Restlet target) {
+        this.target = target;
+    }
+
+    /**
+     * Converts a low-level Servlet call into a high-level Restlet request. In
+     * addition to the parent {@link HttpServerAdapter}, it also copies the
+     * Servlet's request attributes into the Restlet's request attributes map.
+     * 
+     * @param servletCall
+     *            The low-level Servlet call.
+     * @return A new high-level uniform request.
+     */
+    @SuppressWarnings(""unchecked"")
+    public HttpRequest toRequest(ServletCall servletCall) {
+        final HttpRequest result = super.toRequest(servletCall);
+
+        // Copy all Servlet's request attributes
+        String attributeName;
+        for (final Enumeration<String> namesEnum = servletCall.getRequest()
+                .getAttributeNames(); namesEnum.hasMoreElements();) {
+            attributeName = namesEnum.nextElement();
+            result.getAttributes().put(attributeName,
+                    servletCall.getRequest().getAttribute(attributeName));
+        }
+
+        return result;
+    }
+
+}
diff --git a/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletConverter.java b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletConverter.java
index 407e52a214..cf5c0a7918 100644
--- a/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletConverter.java
+++ b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/ServletConverter.java
@@ -43,7 +43,7 @@
 import org.restlet.data.Reference;
 import org.restlet.engine.http.HttpRequest;
 import org.restlet.engine.http.HttpResponse;
-import org.restlet.engine.http.HttpServerConverter;
+import org.restlet.engine.http.HttpServerAdapter;
 import org.restlet.ext.servlet.internal.ServletCall;
 import org.restlet.ext.servlet.internal.ServletLogger;
 
@@ -60,184 +60,186 @@
  * 
  * <pre>
  * public class TestServlet extends HttpServlet {
- * 	private ServletConverter converter;
+ *     private ServletConverter converter;
  * 
- * 	public void init() throws ServletException {
- * 		super.init();
- * 		this.converter = new ServletConverter(getServletContext());
+ *     public void init() throws ServletException {
+ *         super.init();
+ *         this.converter = new ServletConverter(getServletContext());
  * 
- * 		Restlet trace = new Restlet(this.converter.getContext()) {
- * 			public void handle(Request req, Response res) {
- * 				getLogger().info(&quot;Hello World&quot;);
- * 				res.setEntity(&quot;Hello World!&quot;, MediaType.TEXT_PLAIN);
- * 			}
- * 		};
+ *         Restlet trace = new Restlet(this.converter.getContext()) {
+ *             public void handle(Request req, Response res) {
+ *                 getLogger().info(&quot;Hello World&quot;);
+ *                 res.setEntity(&quot;Hello World!&quot;, MediaType.TEXT_PLAIN);
+ *             }
+ *         };
  * 
- * 		this.converter.setTarget(trace);
- * 	}
+ *         this.converter.setTarget(trace);
+ *     }
  * 
- * 	protected void service(HttpServletRequest req, HttpServletResponse res)
- * 			throws ServletException, IOException {
- * 		this.converter.service(req, res);
- * 	}
+ *     protected void service(HttpServletRequest req, HttpServletResponse res)
+ *             throws ServletException, IOException {
+ *         this.converter.service(req, res);
+ *     }
  * }
  * </pre>
  * 
  * @author Jerome Louvel
+ * @deprecated Use {@link ServletAdapter} instead.
  */
-public class ServletConverter extends HttpServerConverter {
-	/** The target Restlet. */
-	private volatile Restlet target;
-
-	/**
-	 * Constructor. Remember to manually set the ""target"" property before
-	 * invoking the service() method.
-	 * 
-	 * @param context
-	 *            The Servlet context.
-	 */
-	public ServletConverter(ServletContext context) {
-		this(context, null);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param context
-	 *            The Servlet context.
-	 * @param target
-	 *            The target Restlet.
-	 */
-	public ServletConverter(ServletContext context, Restlet target) {
-		super(new Context(new ServletLogger(context)));
-		this.target = target;
-	}
-
-	/**
-	 * Returns the base reference of new Restlet requests.
-	 * 
-	 * @param request
-	 *            The Servlet request.
-	 * @return The base reference of new Restlet requests.
-	 */
-	public Reference getBaseRef(HttpServletRequest request) {
-		Reference result = null;
-		final String basePath = request.getContextPath()
-				+ request.getServletPath();
-		final String baseUri = request.getRequestURL().toString();
-		// Path starts at first slash after scheme://
-		final int pathStart = baseUri.indexOf(""/"",
-				request.getScheme().length() + 3);
-		if (basePath.length() == 0) {
-			// basePath is empty in case the webapp is mounted on root context
-			if (pathStart != -1) {
-				result = new Reference(baseUri.substring(0, pathStart));
-			} else {
-				result = new Reference(baseUri);
-			}
-		} else {
-			if (pathStart != -1) {
-				final int baseIndex = baseUri.indexOf(basePath, pathStart);
-				if (baseIndex != -1) {
-					result = new Reference(baseUri.substring(0, baseIndex
-							+ basePath.length()));
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns the root reference of new Restlet requests. By default it returns
-	 * the result of getBaseRef().
-	 * 
-	 * @param request
-	 *            The Servlet request.
-	 * @return The root reference of new Restlet requests.
-	 */
-	public Reference getRootRef(HttpServletRequest request) {
-		return getBaseRef(request);
-	}
-
-	/**
-	 * Returns the target Restlet.
-	 * 
-	 * @return The target Restlet.
-	 */
-	public Restlet getTarget() {
-		return this.target;
-	}
-
-	/**
-	 * Services a HTTP Servlet request as a Restlet request handled by the
-	 * ""target"" Restlet.
-	 * 
-	 * @param request
-	 *            The HTTP Servlet request.
-	 * @param response
-	 *            The HTTP Servlet response.
-	 */
-	public void service(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-		if (getTarget() != null) {
-			// Set the current context
-			Context.setCurrent(getContext());
-
-			// Convert the Servlet call to a Restlet call
-			final ServletCall servletCall = new ServletCall(request
-					.getLocalAddr(), request.getLocalPort(), request, response);
-			final HttpRequest httpRequest = toRequest(servletCall);
-			final HttpResponse httpResponse = new HttpResponse(servletCall,
-					httpRequest);
-
-			// Adjust the relative reference
-			httpRequest.getResourceRef().setBaseRef(getBaseRef(request));
-
-			// Adjust the root reference
-			httpRequest.setRootRef(getRootRef(request));
-
-			// Handle the request and commit the response
-			getTarget().handle(httpRequest, httpResponse);
-			commit(httpResponse);
-		} else {
-			getLogger().warning(""Unable to find the Restlet target"");
-		}
-	}
-
-	/**
-	 * Sets the target Restlet.
-	 * 
-	 * @param target
-	 *            The target Restlet.
-	 */
-	public void setTarget(Restlet target) {
-		this.target = target;
-	}
-
-	/**
-	 * Converts a low-level Servlet call into a high-level Restlet request. In
-	 * addition to the parent HttpServerConverter class, it also copies the
-	 * Servlet's request attributes into the Restlet's request attributes map.
-	 * 
-	 * @param servletCall
-	 *            The low-level Servlet call.
-	 * @return A new high-level uniform request.
-	 */
-	@SuppressWarnings(""unchecked"")
-	public HttpRequest toRequest(ServletCall servletCall) {
-		final HttpRequest result = super.toRequest(servletCall);
-
-		// Copy all Servlet's request attributes
-		String attributeName;
-		for (final Enumeration<String> namesEnum = servletCall.getRequest()
-				.getAttributeNames(); namesEnum.hasMoreElements();) {
-			attributeName = namesEnum.nextElement();
-			result.getAttributes().put(attributeName,
-					servletCall.getRequest().getAttribute(attributeName));
-		}
-
-		return result;
-	}
+@Deprecated
+public class ServletConverter extends HttpServerAdapter {
+    /** The target Restlet. */
+    private volatile Restlet target;
+
+    /**
+     * Constructor. Remember to manually set the ""target"" property before
+     * invoking the service() method.
+     * 
+     * @param context
+     *            The Servlet context.
+     */
+    public ServletConverter(ServletContext context) {
+        this(context, null);
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param context
+     *            The Servlet context.
+     * @param target
+     *            The target Restlet.
+     */
+    public ServletConverter(ServletContext context, Restlet target) {
+        super(new Context(new ServletLogger(context)));
+        this.target = target;
+    }
+
+    /**
+     * Returns the base reference of new Restlet requests.
+     * 
+     * @param request
+     *            The Servlet request.
+     * @return The base reference of new Restlet requests.
+     */
+    public Reference getBaseRef(HttpServletRequest request) {
+        Reference result = null;
+        final String basePath = request.getContextPath()
+                + request.getServletPath();
+        final String baseUri = request.getRequestURL().toString();
+        // Path starts at first slash after scheme://
+        final int pathStart = baseUri.indexOf(""/"",
+                request.getScheme().length() + 3);
+        if (basePath.length() == 0) {
+            // basePath is empty in case the webapp is mounted on root context
+            if (pathStart != -1) {
+                result = new Reference(baseUri.substring(0, pathStart));
+            } else {
+                result = new Reference(baseUri);
+            }
+        } else {
+            if (pathStart != -1) {
+                final int baseIndex = baseUri.indexOf(basePath, pathStart);
+                if (baseIndex != -1) {
+                    result = new Reference(baseUri.substring(0, baseIndex
+                            + basePath.length()));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns the root reference of new Restlet requests. By default it returns
+     * the result of getBaseRef().
+     * 
+     * @param request
+     *            The Servlet request.
+     * @return The root reference of new Restlet requests.
+     */
+    public Reference getRootRef(HttpServletRequest request) {
+        return getBaseRef(request);
+    }
+
+    /**
+     * Returns the target Restlet.
+     * 
+     * @return The target Restlet.
+     */
+    public Restlet getTarget() {
+        return this.target;
+    }
+
+    /**
+     * Services a HTTP Servlet request as a Restlet request handled by the
+     * ""target"" Restlet.
+     * 
+     * @param request
+     *            The HTTP Servlet request.
+     * @param response
+     *            The HTTP Servlet response.
+     */
+    public void service(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        if (getTarget() != null) {
+            // Set the current context
+            Context.setCurrent(getContext());
+
+            // Convert the Servlet call to a Restlet call
+            final ServletCall servletCall = new ServletCall(request
+                    .getLocalAddr(), request.getLocalPort(), request, response);
+            final HttpRequest httpRequest = toRequest(servletCall);
+            final HttpResponse httpResponse = new HttpResponse(servletCall,
+                    httpRequest);
+
+            // Adjust the relative reference
+            httpRequest.getResourceRef().setBaseRef(getBaseRef(request));
+
+            // Adjust the root reference
+            httpRequest.setRootRef(getRootRef(request));
+
+            // Handle the request and commit the response
+            getTarget().handle(httpRequest, httpResponse);
+            commit(httpResponse);
+        } else {
+            getLogger().warning(""Unable to find the Restlet target"");
+        }
+    }
+
+    /**
+     * Sets the target Restlet.
+     * 
+     * @param target
+     *            The target Restlet.
+     */
+    public void setTarget(Restlet target) {
+        this.target = target;
+    }
+
+    /**
+     * Converts a low-level Servlet call into a high-level Restlet request. In
+     * addition to the parent HttpServerConverter class, it also copies the
+     * Servlet's request attributes into the Restlet's request attributes map.
+     * 
+     * @param servletCall
+     *            The low-level Servlet call.
+     * @return A new high-level uniform request.
+     */
+    @SuppressWarnings(""unchecked"")
+    public HttpRequest toRequest(ServletCall servletCall) {
+        final HttpRequest result = super.toRequest(servletCall);
+
+        // Copy all Servlet's request attributes
+        String attributeName;
+        for (final Enumeration<String> namesEnum = servletCall.getRequest()
+                .getAttributeNames(); namesEnum.hasMoreElements();) {
+            attributeName = namesEnum.nextElement();
+            result.getAttributes().put(attributeName,
+                    servletCall.getRequest().getAttribute(attributeName));
+        }
+
+        return result;
+    }
 
 }
diff --git a/modules/org.restlet.ext.spring/src/org/restlet/ext/spring/RestletFrameworkServlet.java b/modules/org.restlet.ext.spring/src/org/restlet/ext/spring/RestletFrameworkServlet.java
index c5647a2625..12824a3b0d 100644
--- a/modules/org.restlet.ext.spring/src/org/restlet/ext/spring/RestletFrameworkServlet.java
+++ b/modules/org.restlet.ext.spring/src/org/restlet/ext/spring/RestletFrameworkServlet.java
@@ -39,11 +39,10 @@
 import org.restlet.Application;
 import org.restlet.Context;
 import org.restlet.Restlet;
-import org.restlet.ext.servlet.ServletConverter;
+import org.restlet.ext.servlet.ServletAdapter;
 import org.springframework.beans.BeansException;
 import org.springframework.web.servlet.FrameworkServlet;
 
-
 /**
  * A Servlet which provides an automatic Restlet integration with an existing
  * {@link org.springframework.web.context.WebApplicationContext}. The usage is
@@ -97,16 +96,53 @@ public class RestletFrameworkServlet extends FrameworkServlet {
 
     private static final long serialVersionUID = 1L;
 
-    /** The converter of Servlet calls into Restlet equivalents. */
-    private volatile ServletConverter converter;
+    /** The adapter of Servlet calls into Restlet equivalents. */
+    private volatile ServletAdapter adapter;
 
     /** The bean name of the target Restlet. */
     private volatile String targetRestletBeanName;
 
+    /**
+     * Creates the Restlet {@link Context} to use if the target application does
+     * not already have a context associated, or if the target restlet is not an
+     * {@link Application} at all.
+     * <p>
+     * Uses a simple {@link Context} by default.
+     * 
+     * @return A new instance of {@link Context}
+     */
+    protected Context createContext() {
+        return new Context();
+    }
+
     @Override
     protected void doService(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
-        getConverter().service(request, response);
+        getAdapter().service(request, response);
+    }
+
+    /**
+     * Provides access to the {@link ServletAdapter} used to handle requests.
+     * Exposed so that subclasses may do additional configuration, if necessary,
+     * by overriding {@link #initFrameworkServlet()}.
+     * 
+     * @return The adapter of Servlet calls into Restlet equivalents.
+     */
+    protected ServletAdapter getAdapter() {
+        return this.adapter;
+    }
+
+    /**
+     * Provides access to the {@link ServletConverter} used to handle requests.
+     * Exposed so that subclasses may do additional configuration, if necessary,
+     * by overriding {@link #initFrameworkServlet()}.
+     * 
+     * @return The converter of Servlet calls into Restlet equivalents.
+     * @deprecated Use {@link #getAdapter()} instead.
+     */
+    @Deprecated
+    protected ServletAdapter getConverter() {
+        return this.adapter;
     }
 
     /**
@@ -129,22 +165,11 @@ public String getTargetRestletBeanName() {
                 : this.targetRestletBeanName;
     }
 
-    /**
-     * Provides access to the {@link ServletConverter} used to handle requests.
-     * Exposed so that subclasses may do additional configuration, if necessary,
-     * by overriding {@link #initFrameworkServlet()}.
-     * 
-     * @return The converter of Servlet calls into Restlet equivalents.
-     */
-    protected ServletConverter getConverter() {
-        return this.converter;
-    }
-
     @Override
     protected void initFrameworkServlet() throws ServletException,
             BeansException {
         super.initFrameworkServlet();
-        this.converter = new ServletConverter(getServletContext());
+        this.adapter = new ServletAdapter(getServletContext());
 
         org.restlet.Application application;
         if (getTargetRestlet() instanceof Application) {
@@ -156,20 +181,7 @@ protected void initFrameworkServlet() throws ServletException,
         if (application.getContext() == null) {
             application.setContext(createContext());
         }
-        this.converter.setTarget(application);
-    }
-
-    /**
-     * Creates the Restlet {@link Context} to use if the target application does
-     * not already have a context associated, or if the target restlet is not an
-     * {@link Application} at all.
-     * <p>
-     * Uses a simple {@link Context} by default.
-     * 
-     * @return A new instance of {@link Context}
-     */
-    protected Context createContext() {
-        return new Context();
+        this.adapter.setTarget(application);
     }
 
     /**
diff --git a/modules/org.restlet.ext.xdb/src/org/restlet/ext/xdb/XdbServletConverter.java b/modules/org.restlet.ext.xdb/src/org/restlet/ext/xdb/XdbServletConverter.java
index 66dd3da4c5..3c1f5cb406 100644
--- a/modules/org.restlet.ext.xdb/src/org/restlet/ext/xdb/XdbServletConverter.java
+++ b/modules/org.restlet.ext.xdb/src/org/restlet/ext/xdb/XdbServletConverter.java
@@ -47,7 +47,7 @@
 import org.restlet.data.Reference;
 import org.restlet.engine.http.HttpRequest;
 import org.restlet.engine.http.HttpResponse;
-import org.restlet.engine.http.HttpServerConverter;
+import org.restlet.engine.http.HttpServerAdapter;
 import org.restlet.ext.servlet.internal.ServletLogger;
 
 
@@ -89,7 +89,7 @@
  * 
  * @author Marcelo F. Ochoa (mochoa@ieee.org)
  */
-public class XdbServletConverter extends HttpServerConverter {
+public class XdbServletConverter extends HttpServerAdapter {
     /** The target Restlet. */
     private volatile Restlet target;
 
diff --git a/modules/org.restlet/src/org/restlet/engine/converter/RepresentationConverter.java b/modules/org.restlet/src/org/restlet/engine/Helper.java
similarity index 56%
rename from modules/org.restlet/src/org/restlet/engine/converter/RepresentationConverter.java
rename to modules/org.restlet/src/org/restlet/engine/Helper.java
index ae2463059e..493f28593c 100644
--- a/modules/org.restlet/src/org/restlet/engine/converter/RepresentationConverter.java
+++ b/modules/org.restlet/src/org/restlet/engine/Helper.java
@@ -28,41 +28,13 @@
  * Restlet is a registered trademark of Noelios Technologies.
  */
 
-package org.restlet.engine.converter;
-
-import java.util.List;
-
-import org.restlet.representation.Representation;
-import org.restlet.representation.Variant;
-import org.restlet.resource.UniformResource;
+package org.restlet.engine;
 
 /**
- * Converter between the DOM API and Representation classes.
+ * Abstract marker class parent of all engine helpers.
  * 
  * @author Jerome Louvel
  */
-public class RepresentationConverter extends ConverterHelper {
-
-    @Override
-    public List<Class<?>> getObjectClasses(Variant variant) {
-        return null;
-    }
-
-    @Override
-    public List<Variant> getVariants(Class<?> objectClass) {
-        return null;
-    }
-
-    @Override
-    public <T> T toObject(Representation representation, Class<T> targetClass,
-            UniformResource resource) {
-        return null;
-    }
-
-    @Override
-    public Representation toRepresentation(Object object,
-            Variant targetVariant, UniformResource resource) {
-        return null;
-    }
+public abstract class Helper {
 
 }
diff --git a/modules/org.restlet/src/org/restlet/engine/RestletHelper.java b/modules/org.restlet/src/org/restlet/engine/RestletHelper.java
index 687905d4c6..b7946d1497 100644
--- a/modules/org.restlet/src/org/restlet/engine/RestletHelper.java
+++ b/modules/org.restlet/src/org/restlet/engine/RestletHelper.java
@@ -48,7 +48,7 @@
  * 
  * @author Jerome Louvel
  */
-public abstract class RestletHelper<T extends Restlet> {
+public abstract class RestletHelper<T extends Restlet> extends Helper {
 
     /**
      * The map of attributes exchanged between the API and the Engine via this
diff --git a/modules/org.restlet/src/org/restlet/engine/converter/ConverterHelper.java b/modules/org.restlet/src/org/restlet/engine/converter/ConverterHelper.java
index 9713868eb3..425a80ebcb 100644
--- a/modules/org.restlet/src/org/restlet/engine/converter/ConverterHelper.java
+++ b/modules/org.restlet/src/org/restlet/engine/converter/ConverterHelper.java
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.restlet.engine.Helper;
 import org.restlet.representation.Representation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.UniformResource;
@@ -43,7 +44,7 @@
  * 
  * @author Jerome Louvel
  */
-public abstract class ConverterHelper {
+public abstract class ConverterHelper extends Helper {
 
     /**
      * Adds an object class to the given list. Creates a new list if necessary.
diff --git a/modules/org.restlet/src/org/restlet/engine/http/HttpConverter.java b/modules/org.restlet/src/org/restlet/engine/http/HttpAdapter.java
similarity index 99%
rename from modules/org.restlet/src/org/restlet/engine/http/HttpConverter.java
rename to modules/org.restlet/src/org/restlet/engine/http/HttpAdapter.java
index c9829e1a4e..77358036f4 100644
--- a/modules/org.restlet/src/org/restlet/engine/http/HttpConverter.java
+++ b/modules/org.restlet/src/org/restlet/engine/http/HttpAdapter.java
@@ -41,7 +41,7 @@
  * 
  * @author Jerome Louvel
  */
-public class HttpConverter {
+public class HttpAdapter {
     /** The context. */
     private volatile Context context;
 
@@ -51,7 +51,7 @@ public class HttpConverter {
      * @param context
      *            The context to use.
      */
-    public HttpConverter(Context context) {
+    public HttpAdapter(Context context) {
         this.context = context;
     }
 
diff --git a/modules/org.restlet/src/org/restlet/engine/http/HttpClientConverter.java b/modules/org.restlet/src/org/restlet/engine/http/HttpClientAdapter.java
similarity index 99%
rename from modules/org.restlet/src/org/restlet/engine/http/HttpClientConverter.java
rename to modules/org.restlet/src/org/restlet/engine/http/HttpClientAdapter.java
index 734bbe09a8..9931682e53 100644
--- a/modules/org.restlet/src/org/restlet/engine/http/HttpClientConverter.java
+++ b/modules/org.restlet/src/org/restlet/engine/http/HttpClientAdapter.java
@@ -60,7 +60,7 @@
  * 
  * @author Jerome Louvel
  */
-public class HttpClientConverter extends HttpConverter {
+public class HttpClientAdapter extends HttpAdapter {
     /**
      * Copies headers into a response.
      * 
@@ -150,7 +150,7 @@ public static void copyResponseTransportHeaders(
      * @param context
      *            The context to use.
      */
-    public HttpClientConverter(Context context) {
+    public HttpClientAdapter(Context context) {
         super(context);
     }
 
diff --git a/modules/org.restlet/src/org/restlet/engine/http/HttpClientCall.java b/modules/org.restlet/src/org/restlet/engine/http/HttpClientCall.java
index 06cf1278b3..7bf3df5ebd 100644
--- a/modules/org.restlet/src/org/restlet/engine/http/HttpClientCall.java
+++ b/modules/org.restlet/src/org/restlet/engine/http/HttpClientCall.java
@@ -76,7 +76,7 @@ public abstract class HttpClientCall extends HttpCall {
      *         if no representation has been provided and the response has not
      *         sent any entity header.
      * @throws NumberFormatException
-     * @see HttpClientConverter#copyResponseTransportHeaders(Iterable, Response)
+     * @see HttpClientAdapter#copyResponseTransportHeaders(Iterable, Response)
      */
     public static Representation copyResponseEntityHeaders(
             Iterable<Parameter> responseHeaders, Representation representation)
diff --git a/modules/org.restlet/src/org/restlet/engine/http/HttpClientHelper.java b/modules/org.restlet/src/org/restlet/engine/http/HttpClientHelper.java
index 1e8d886ce5..24a6864a32 100644
--- a/modules/org.restlet/src/org/restlet/engine/http/HttpClientHelper.java
+++ b/modules/org.restlet/src/org/restlet/engine/http/HttpClientHelper.java
@@ -52,7 +52,7 @@
  * <tr>
  * <td>converter</td>
  * <td>String</td>
- * <td>org.restlet.engine.http.HttpClientConverter</td>
+ * <td>org.restlet.engine.http.HttpClientAdapter</td>
  * <td>Class name of the converter of low-level HTTP calls into high level
  * requests and responses.</td>
  * </tr>
@@ -62,7 +62,7 @@
  */
 public abstract class HttpClientHelper extends ClientHelper {
     /** The converter from uniform calls to HTTP calls. */
-    private volatile HttpClientConverter converter;
+    private volatile HttpClientAdapter converter;
 
     /**
      * Constructor.
@@ -89,13 +89,12 @@ public HttpClientHelper(Client client) {
      * 
      * @return the converter from uniform calls to HTTP calls.
      */
-    public HttpClientConverter getConverter() throws Exception {
+    public HttpClientAdapter getConverter() throws Exception {
         if (this.converter == null) {
             final String converterClass = getHelpedParameters().getFirstValue(
-                    ""converter"", ""org.restlet.engine.http.HttpClientConverter"");
-            this.converter = (HttpClientConverter) Class
-                    .forName(converterClass).getConstructor(Context.class)
-                    .newInstance(getContext());
+                    ""converter"", ""org.restlet.engine.http.HttpClientAdapter"");
+            this.converter = (HttpClientAdapter) Class.forName(converterClass)
+                    .getConstructor(Context.class).newInstance(getContext());
         }
 
         return this.converter;
@@ -120,7 +119,7 @@ public void handle(Request request, Response response) {
      * @param converter
      *            The converter to set.
      */
-    public void setConverter(HttpClientConverter converter) {
+    public void setConverter(HttpClientAdapter converter) {
         this.converter = converter;
     }
 }
diff --git a/modules/org.restlet/src/org/restlet/engine/http/HttpServerConverter.java b/modules/org.restlet/src/org/restlet/engine/http/HttpServerAdapter.java
similarity index 99%
rename from modules/org.restlet/src/org/restlet/engine/http/HttpServerConverter.java
rename to modules/org.restlet/src/org/restlet/engine/http/HttpServerAdapter.java
index 279f45bb48..7807170363 100644
--- a/modules/org.restlet/src/org/restlet/engine/http/HttpServerConverter.java
+++ b/modules/org.restlet/src/org/restlet/engine/http/HttpServerAdapter.java
@@ -59,7 +59,7 @@
  * 
  * @author Jerome Louvel
  */
-public class HttpServerConverter extends HttpConverter {
+public class HttpServerAdapter extends HttpAdapter {
     /**
      * Copies the entity headers from the {@link Representation} to the
      * {@link Series}.
@@ -267,7 +267,7 @@ public static void addResponseHeaders(Response response,
      * @param context
      *            The client context.
      */
-    public HttpServerConverter(Context context) {
+    public HttpServerAdapter(Context context) {
         super(context);
     }
 
diff --git a/modules/org.restlet/src/org/restlet/engine/http/HttpServerHelper.java b/modules/org.restlet/src/org/restlet/engine/http/HttpServerHelper.java
index dbc15c966a..ad23a92851 100644
--- a/modules/org.restlet/src/org/restlet/engine/http/HttpServerHelper.java
+++ b/modules/org.restlet/src/org/restlet/engine/http/HttpServerHelper.java
@@ -61,7 +61,7 @@
  * <tr>
  * <td>converter</td>
  * <td>String</td>
- * <td>org.restlet.engine.http.HttpServerConverter</td>
+ * <td>org.restlet.engine.http.HttpServerAdapter</td>
  * <td>Class name of the converter of low-level HTTP calls into high level
  * requests and responses.</td>
  * </tr>
@@ -71,7 +71,7 @@
  */
 public class HttpServerHelper extends ServerHelper {
     /** The converter from HTTP calls to uniform calls. */
-    private volatile HttpServerConverter converter;
+    private volatile HttpServerAdapter converter;
 
     /**
      * Default constructor. Note that many methods assume that a non-null server
@@ -98,13 +98,13 @@ public HttpServerHelper(Server server) {
      * 
      * @return the converter from HTTP calls to uniform calls.
      */
-    public HttpServerConverter getConverter() {
+    public HttpServerAdapter getConverter() {
         if (this.converter == null) {
             try {
                 final String converterClass = getHelpedParameters()
                         .getFirstValue(""converter"",
-                                ""org.restlet.engine.http.HttpServerConverter"");
-                this.converter = (HttpServerConverter) Engine.loadClass(
+                                ""org.restlet.engine.http.HttpServerAdapter"");
+                this.converter = (HttpServerAdapter) Engine.loadClass(
                         converterClass).getConstructor(Context.class)
                         .newInstance(getContext());
             } catch (IllegalArgumentException e) {
@@ -163,7 +163,7 @@ public void handle(HttpServerCall httpCall) {
      * @param converter
      *            The converter to set.
      */
-    public void setConverter(HttpServerConverter converter) {
+    public void setConverter(HttpServerAdapter converter) {
         this.converter = converter;
     }
 }
diff --git a/modules/org.restlet/src/org/restlet/engine/security/AuthenticatorHelper.java b/modules/org.restlet/src/org/restlet/engine/security/AuthenticatorHelper.java
index 49cb48fddc..d0eb2c05df 100644
--- a/modules/org.restlet/src/org/restlet/engine/security/AuthenticatorHelper.java
+++ b/modules/org.restlet/src/org/restlet/engine/security/AuthenticatorHelper.java
@@ -40,6 +40,7 @@
 import org.restlet.data.Request;
 import org.restlet.data.Response;
 import org.restlet.data.Status;
+import org.restlet.engine.Helper;
 import org.restlet.security.Guard;
 import org.restlet.util.Series;
 
@@ -48,243 +49,243 @@
  * 
  * @author Jerome Louvel
  */
-public abstract class AuthenticatorHelper {
+public abstract class AuthenticatorHelper extends Helper {
 
-	/** The supported challenge scheme. */
-	private volatile ChallengeScheme challengeScheme;
+    /** The supported challenge scheme. */
+    private volatile ChallengeScheme challengeScheme;
 
-	/** Indicates if client side authentication is supported. */
-	private volatile boolean clientSide;
+    /** Indicates if client side authentication is supported. */
+    private volatile boolean clientSide;
 
-	/** Indicates if server side authentication is supported. */
-	private volatile boolean serverSide;
+    /** Indicates if server side authentication is supported. */
+    private volatile boolean serverSide;
 
-	/**
-	 * Constructor.
-	 * 
-	 * @param challengeScheme
-	 *            The supported challenge scheme.
-	 * @param clientSide
-	 *            Indicates if client side authentication is supported.
-	 * @param serverSide
-	 *            Indicates if server side authentication is supported.
-	 */
-	public AuthenticatorHelper(ChallengeScheme challengeScheme,
-			boolean clientSide, boolean serverSide) {
-		this.challengeScheme = challengeScheme;
-		this.clientSide = clientSide;
-		this.serverSide = serverSide;
-	}
+    /**
+     * Constructor.
+     * 
+     * @param challengeScheme
+     *            The supported challenge scheme.
+     * @param clientSide
+     *            Indicates if client side authentication is supported.
+     * @param serverSide
+     *            Indicates if server side authentication is supported.
+     */
+    public AuthenticatorHelper(ChallengeScheme challengeScheme,
+            boolean clientSide, boolean serverSide) {
+        this.challengeScheme = challengeScheme;
+        this.clientSide = clientSide;
+        this.serverSide = serverSide;
+    }
 
-	/**
-	 * Indicates if the call is properly authenticated. You are guaranteed that
-	 * the request has a challenge response with a scheme matching the one
-	 * supported by the plugin.
-	 * 
-	 * @param cr
-	 *            The challenge response in the request.
-	 * @param request
-	 *            The request to authenticate.
-	 * @param guard
-	 *            The associated guard to callback.
-	 * @return -1 if the given credentials were invalid, 0 if no credentials
-	 *         were found and 1 otherwise.
-	 * @see Guard#checkSecret(Request, String, char[])
-	 * @deprecated See new org.restlet.security package.
-	 */
-	@Deprecated
-	public int authenticate(ChallengeResponse cr, Request request, Guard guard) {
-		int result = Guard.AUTHENTICATION_MISSING;
+    /**
+     * Indicates if the call is properly authenticated. You are guaranteed that
+     * the request has a challenge response with a scheme matching the one
+     * supported by the plugin.
+     * 
+     * @param cr
+     *            The challenge response in the request.
+     * @param request
+     *            The request to authenticate.
+     * @param guard
+     *            The associated guard to callback.
+     * @return -1 if the given credentials were invalid, 0 if no credentials
+     *         were found and 1 otherwise.
+     * @see Guard#checkSecret(Request, String, char[])
+     * @deprecated See new org.restlet.security package.
+     */
+    @Deprecated
+    public int authenticate(ChallengeResponse cr, Request request, Guard guard) {
+        int result = Guard.AUTHENTICATION_MISSING;
 
-		// The challenge schemes are compatible
-		final String identifier = cr.getIdentifier();
-		final char[] secret = cr.getSecret();
+        // The challenge schemes are compatible
+        final String identifier = cr.getIdentifier();
+        final char[] secret = cr.getSecret();
 
-		// Check the credentials
-		if ((identifier != null) && (secret != null)) {
-			result = guard.checkSecret(request, identifier, secret) ? Guard.AUTHENTICATION_VALID
-					: Guard.AUTHENTICATION_INVALID;
-		}
+        // Check the credentials
+        if ((identifier != null) && (secret != null)) {
+            result = guard.checkSecret(request, identifier, secret) ? Guard.AUTHENTICATION_VALID
+                    : Guard.AUTHENTICATION_INVALID;
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/**
-	 * Challenges the client by adding a challenge request to the response and
-	 * by setting the status to CLIENT_ERROR_UNAUTHORIZED.
-	 * 
-	 * @param response
-	 *            The response to update.
-	 * @param stale
-	 *            Indicates if the new challenge is due to a stale response.
-	 * @param guard
-	 *            The associated guard to callback.
-	 * @deprecated See new org.restlet.security package.
-	 */
-	@Deprecated
-	public void challenge(Response response, boolean stale, Guard guard) {
-		response.setStatus(Status.CLIENT_ERROR_UNAUTHORIZED);
-		response.setChallengeRequest(new ChallengeRequest(guard.getScheme(),
-				guard.getRealm()));
-	}
+    /**
+     * Challenges the client by adding a challenge request to the response and
+     * by setting the status to CLIENT_ERROR_UNAUTHORIZED.
+     * 
+     * @param response
+     *            The response to update.
+     * @param stale
+     *            Indicates if the new challenge is due to a stale response.
+     * @param guard
+     *            The associated guard to callback.
+     * @deprecated See new org.restlet.security package.
+     */
+    @Deprecated
+    public void challenge(Response response, boolean stale, Guard guard) {
+        response.setStatus(Status.CLIENT_ERROR_UNAUTHORIZED);
+        response.setChallengeRequest(new ChallengeRequest(guard.getScheme(),
+                guard.getRealm()));
+    }
 
-	/**
-	 * Formats a challenge request as a HTTP header value.
-	 * 
-	 * @param request
-	 *            The challenge request to format.
-	 * @return The authenticate header value.
-	 */
-	public String format(ChallengeRequest request) {
-		final StringBuilder sb = new StringBuilder();
-		sb.append(request.getScheme().getTechnicalName());
+    /**
+     * Formats a challenge request as a HTTP header value.
+     * 
+     * @param request
+     *            The challenge request to format.
+     * @return The authenticate header value.
+     */
+    public String format(ChallengeRequest request) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(request.getScheme().getTechnicalName());
 
-		if (request.getRealm() != null) {
-			sb.append("" realm=\"""").append(request.getRealm()).append('""');
-		}
+        if (request.getRealm() != null) {
+            sb.append("" realm=\"""").append(request.getRealm()).append('""');
+        }
 
-		formatParameters(sb, request.getParameters(), request);
-		return sb.toString();
-	}
+        formatParameters(sb, request.getParameters(), request);
+        return sb.toString();
+    }
 
-	/**
-	 * Formats a challenge response as raw credentials.
-	 * 
-	 * @param challenge
-	 *            The challenge response to format.
-	 * @param request
-	 *            The parent request.
-	 * @param httpHeaders
-	 *            The current request HTTP headers.
-	 * @return The authorization header value.
-	 */
-	public String format(ChallengeResponse challenge, Request request,
-			Series<Parameter> httpHeaders) {
-		final StringBuilder sb = new StringBuilder();
-		sb.append(challenge.getScheme().getTechnicalName()).append(' ');
+    /**
+     * Formats a challenge response as raw credentials.
+     * 
+     * @param challenge
+     *            The challenge response to format.
+     * @param request
+     *            The parent request.
+     * @param httpHeaders
+     *            The current request HTTP headers.
+     * @return The authorization header value.
+     */
+    public String format(ChallengeResponse challenge, Request request,
+            Series<Parameter> httpHeaders) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(challenge.getScheme().getTechnicalName()).append(' ');
 
-		if (challenge.getCredentials() != null) {
-			sb.append(challenge.getCredentials());
-		} else {
-			formatCredentials(sb, challenge, request, httpHeaders);
-		}
+        if (challenge.getCredentials() != null) {
+            sb.append(challenge.getCredentials());
+        } else {
+            formatCredentials(sb, challenge, request, httpHeaders);
+        }
 
-		return sb.toString();
-	}
+        return sb.toString();
+    }
 
-	/**
-	 * Formats a challenge response as raw credentials.
-	 * 
-	 * @param sb
-	 *            The String builder to update.
-	 * @param challenge
-	 *            The challenge response to format.
-	 * @param request
-	 *            The parent request.
-	 * @param httpHeaders
-	 *            The current request HTTP headers.
-	 */
-	public abstract void formatCredentials(StringBuilder sb,
-			ChallengeResponse challenge, Request request,
-			Series<Parameter> httpHeaders);
+    /**
+     * Formats a challenge response as raw credentials.
+     * 
+     * @param sb
+     *            The String builder to update.
+     * @param challenge
+     *            The challenge response to format.
+     * @param request
+     *            The parent request.
+     * @param httpHeaders
+     *            The current request HTTP headers.
+     */
+    public abstract void formatCredentials(StringBuilder sb,
+            ChallengeResponse challenge, Request request,
+            Series<Parameter> httpHeaders);
 
-	/**
-	 * Formats the parameters of a challenge request, to be appended to the
-	 * scheme technical name and realm.
-	 * 
-	 * @param sb
-	 *            The string builder to update.
-	 * @param parameters
-	 *            The parameters to format.
-	 * @param request
-	 *            The challenger request.
-	 */
-	public void formatParameters(StringBuilder sb,
-			Series<Parameter> parameters, ChallengeRequest request) {
-	}
+    /**
+     * Formats the parameters of a challenge request, to be appended to the
+     * scheme technical name and realm.
+     * 
+     * @param sb
+     *            The string builder to update.
+     * @param parameters
+     *            The parameters to format.
+     * @param request
+     *            The challenger request.
+     */
+    public void formatParameters(StringBuilder sb,
+            Series<Parameter> parameters, ChallengeRequest request) {
+    }
 
-	/**
-	 * Returns the supported challenge scheme.
-	 * 
-	 * @return The supported challenge scheme.
-	 */
-	public ChallengeScheme getChallengeScheme() {
-		return this.challengeScheme;
-	}
+    /**
+     * Returns the supported challenge scheme.
+     * 
+     * @return The supported challenge scheme.
+     */
+    public ChallengeScheme getChallengeScheme() {
+        return this.challengeScheme;
+    }
 
-	/**
-	 * Returns the context's logger.
-	 * 
-	 * @return The context's logger.
-	 */
-	public Logger getLogger() {
-		return Context.getCurrentLogger();
-	}
+    /**
+     * Returns the context's logger.
+     * 
+     * @return The context's logger.
+     */
+    public Logger getLogger() {
+        return Context.getCurrentLogger();
+    }
 
-	/**
-	 * Indicates if client side authentication is supported.
-	 * 
-	 * @return True if client side authentication is supported.
-	 */
-	public boolean isClientSide() {
-		return this.clientSide;
-	}
+    /**
+     * Indicates if client side authentication is supported.
+     * 
+     * @return True if client side authentication is supported.
+     */
+    public boolean isClientSide() {
+        return this.clientSide;
+    }
 
-	/**
-	 * Indicates if server side authentication is supported.
-	 * 
-	 * @return True if server side authentication is supported.
-	 */
-	public boolean isServerSide() {
-		return this.serverSide;
-	}
+    /**
+     * Indicates if server side authentication is supported.
+     * 
+     * @return True if server side authentication is supported.
+     */
+    public boolean isServerSide() {
+        return this.serverSide;
+    }
 
-	/**
-	 * Parses an authenticate header into a challenge request.
-	 * 
-	 * @param header
-	 *            The HTTP header value to parse.
-	 */
-	public void parseRequest(ChallengeRequest cr, String header) {
-	}
+    /**
+     * Parses an authenticate header into a challenge request.
+     * 
+     * @param header
+     *            The HTTP header value to parse.
+     */
+    public void parseRequest(ChallengeRequest cr, String header) {
+    }
 
-	/**
-	 * Parses an authorization header into a challenge response.
-	 * 
-	 * @param request
-	 *            The request.
-	 */
-	public void parseResponse(ChallengeResponse cr, Request request) {
-	}
+    /**
+     * Parses an authorization header into a challenge response.
+     * 
+     * @param request
+     *            The request.
+     */
+    public void parseResponse(ChallengeResponse cr, Request request) {
+    }
 
-	/**
-	 * Sets the supported challenge scheme.
-	 * 
-	 * @param challengeScheme
-	 *            The supported challenge scheme.
-	 */
-	public void setChallengeScheme(ChallengeScheme challengeScheme) {
-		this.challengeScheme = challengeScheme;
-	}
+    /**
+     * Sets the supported challenge scheme.
+     * 
+     * @param challengeScheme
+     *            The supported challenge scheme.
+     */
+    public void setChallengeScheme(ChallengeScheme challengeScheme) {
+        this.challengeScheme = challengeScheme;
+    }
 
-	/**
-	 * Indicates if client side authentication is supported.
-	 * 
-	 * @param clientSide
-	 *            True if client side authentication is supported.
-	 */
-	public void setClientSide(boolean clientSide) {
-		this.clientSide = clientSide;
-	}
+    /**
+     * Indicates if client side authentication is supported.
+     * 
+     * @param clientSide
+     *            True if client side authentication is supported.
+     */
+    public void setClientSide(boolean clientSide) {
+        this.clientSide = clientSide;
+    }
 
-	/**
-	 * Indicates if server side authentication is supported.
-	 * 
-	 * @param serverSide
-	 *            True if server side authentication is supported.
-	 */
-	public void setServerSide(boolean serverSide) {
-		this.serverSide = serverSide;
-	}
+    /**
+     * Indicates if server side authentication is supported.
+     * 
+     * @param serverSide
+     *            True if server side authentication is supported.
+     */
+    public void setServerSide(boolean serverSide) {
+        this.serverSide = serverSide;
+    }
 
 }"
bc79855cf59458c38498b449f3b8ab99fa1191c9,kotlin,Minor: additional logging when failing to read- file in VirtualFileKotlinClass--,p,https://github.com/JetBrains/kotlin,"diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
index a63970f91bd2d..76305bd1cf1d3 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.kotlin;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
 import kotlin.Function0;
@@ -34,12 +35,12 @@
 import org.jetbrains.jet.storage.StorageManager;
 import org.jetbrains.jet.utils.UtilsPackage;
 
-import java.io.IOException;
-
 import static org.jetbrains.asm4.ClassReader.*;
 import static org.jetbrains.asm4.Opcodes.ASM4;
 
 public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
+    private final static Logger LOG = Logger.getInstance(VirtualFileKotlinClass.class);
+
     private final VirtualFile file;
     private final NotNullLazyValue<JvmClassName> className;
     private final NullableLazyValue<KotlinClassHeader> classHeader;
@@ -80,7 +81,8 @@ public void visit(int version, int access, String name, String signature, String
                 }
             }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
         }
-        catch (IOException e) {
+        catch (Throwable e) {
+            logFileReadingError(e);
             throw UtilsPackage.rethrow(e);
         }
         return classNameRef.get();
@@ -112,7 +114,8 @@ public void visitEnd() {
                 }
             }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
         }
-        catch (IOException e) {
+        catch (Throwable e) {
+            logFileReadingError(e);
             throw UtilsPackage.rethrow(e);
         }
     }
@@ -196,7 +199,8 @@ public void visitEnd() {
                 }
             }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
         }
-        catch (IOException e) {
+        catch (Throwable e) {
+            logFileReadingError(e);
             throw UtilsPackage.rethrow(e);
         }
     }
@@ -221,4 +225,13 @@ public boolean equals(Object obj) {
     public String toString() {
         return getClass().getSimpleName() + "": "" + file.toString();
     }
+
+    private void logFileReadingError(@NotNull Throwable e) {
+        LOG.error(
+                ""Could not read file: "" + file.getPath() + ""\n""
+                + ""Size in bytes: "" + file.getLength() + ""\n""
+                + ""File type: "" + file.getFileType().getName(),
+                e
+        );
+    }
 }
\ No newline at end of file"
7679e6c2affe21f5179dbd1bedaac4cfa0b00436,Valadoc,"0.20.x: Add support for [GenericAccessors]
",a,https://github.com/GNOME/vala/,"diff --git a/src/driver/0.20.x/treebuilder.vala b/src/driver/0.20.x/treebuilder.vala
index 343527a660..f9f8fef6f0 100644
--- a/src/driver/0.20.x/treebuilder.vala
+++ b/src/driver/0.20.x/treebuilder.vala
@@ -192,10 +192,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	//
 
 	private void process_attributes (Api.Symbol parent, GLib.List<Vala.Attribute> lst) {
-		// attributes wihtout arguments:
+		// attributes without arguments:
 		string[] attributes = {
 				""ReturnsModifiedPointer"",
 				""DestroysInstance"",
+				""GenericAccessors"",
 				""NoAccessorMethod"",
 				""NoArrayLength"",
 				""Experimental"","
9ebbf1bfcea9942117727c08c6905dd444c230ae,hadoop,YARN-3361. CapacityScheduler side changes to- support non-exclusive node labels. Contributed by Wangda Tan (cherry picked- from commit 0fefda645bca935b87b6bb8ca63e6f18340d59f5)--,a,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 478d0aebacc5f..059c5a3d39e7d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -24,6 +24,9 @@ Release 2.8.0 - UNRELEASED
     YARN-3443. Create a 'ResourceHandler' subsystem to ease addition of support 
     for new resource types on the NM. (Sidharta Seethana via junping_du)
 
+    YARN-3361. CapacityScheduler side changes to support non-exclusive node
+    labels. (Wangda Tan via jianhe)
+
   IMPROVEMENTS
 
     YARN-1880. Cleanup TestApplicationClientProtocolOnHA
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
index 68d4ef9fe77aa..f2146c8b124be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java
@@ -313,6 +313,7 @@ public static ResourceRequest newResourceRequest(ResourceRequest r) {
     request.setResourceName(r.getResourceName());
     request.setCapability(r.getCapability());
     request.setNumContainers(r.getNumContainers());
+    request.setNodeLabelExpression(r.getNodeLabelExpression());
     return request;
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
index 1be1727e86599..1071831263ae1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
@@ -146,7 +146,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
   private ConcurrentMap<NodeId, List<ContainerStatus>>
       finishedContainersSentToAM =
       new ConcurrentHashMap<NodeId, List<ContainerStatus>>();
-  private Container masterContainer;
+  private volatile Container masterContainer;
 
   private float progress = 0;
   private String host = ""N/A"";
@@ -762,13 +762,7 @@ public List<ContainerStatus> pullJustFinishedContainers() {
 
   @Override
   public Container getMasterContainer() {
-    this.readLock.lock();
-
-    try {
-      return this.masterContainer;
-    } finally {
-      this.readLock.unlock();
-    }
+    return this.masterContainer;
   }
 
   @InterfaceAudience.Private
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index 5521d47ed6076..5604f0f33965f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -73,10 +73,11 @@ public class AppSchedulingInfo {
   /* Allocated by scheduler */
   boolean pending = true; // for app metrics
   
+  private ResourceUsage appResourceUsage;
  
   public AppSchedulingInfo(ApplicationAttemptId appAttemptId,
       String user, Queue queue, ActiveUsersManager activeUsersManager,
-      long epoch) {
+      long epoch, ResourceUsage appResourceUsage) {
     this.applicationAttemptId = appAttemptId;
     this.applicationId = appAttemptId.getApplicationId();
     this.queue = queue;
@@ -84,6 +85,7 @@ public AppSchedulingInfo(ApplicationAttemptId appAttemptId,
     this.user = user;
     this.activeUsersManager = activeUsersManager;
     this.containerIdCounter = new AtomicLong(epoch << EPOCH_BIT_SHIFT);
+    this.appResourceUsage = appResourceUsage;
   }
 
   public ApplicationId getApplicationId() {
@@ -191,13 +193,19 @@ synchronized public void updateResourceRequests(
             lastRequestCapability);
         
         // update queue:
+        Resource increasedResource = Resources.multiply(request.getCapability(),
+            request.getNumContainers());
         queue.incPendingResource(
             request.getNodeLabelExpression(),
-            Resources.multiply(request.getCapability(),
-                request.getNumContainers()));
+            increasedResource);
+        appResourceUsage.incPending(request.getNodeLabelExpression(), increasedResource);
         if (lastRequest != null) {
+          Resource decreasedResource =
+              Resources.multiply(lastRequestCapability, lastRequestContainers);
           queue.decPendingResource(lastRequest.getNodeLabelExpression(),
-              Resources.multiply(lastRequestCapability, lastRequestContainers));
+              decreasedResource);
+          appResourceUsage.decPending(lastRequest.getNodeLabelExpression(),
+              decreasedResource);
         }
       }
     }
@@ -385,6 +393,8 @@ synchronized private void decrementOutstanding(
       checkForDeactivation();
     }
     
+    appResourceUsage.decPending(offSwitchRequest.getNodeLabelExpression(),
+        offSwitchRequest.getCapability());
     queue.decPendingResource(offSwitchRequest.getNodeLabelExpression(),
         offSwitchRequest.getCapability());
   }
@@ -492,9 +502,10 @@ public synchronized void recoverContainer(RMContainer rmContainer) {
   }
   
   public ResourceRequest cloneResourceRequest(ResourceRequest request) {
-    ResourceRequest newRequest = ResourceRequest.newInstance(
-        request.getPriority(), request.getResourceName(),
-        request.getCapability(), 1, request.getRelaxLocality());
+    ResourceRequest newRequest =
+        ResourceRequest.newInstance(request.getPriority(),
+            request.getResourceName(), request.getCapability(), 1,
+            request.getRelaxLocality(), request.getNodeLabelExpression());
     return newRequest;
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
index 36ee4daa1edbc..5169b78dd582f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
@@ -27,6 +27,7 @@
 
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
 /**
@@ -250,6 +251,10 @@ private static Resource normalize(Resource res) {
   }
 
   private Resource _get(String label, ResourceType type) {
+    if (label == null) {
+      label = RMNodeLabelsManager.NO_LABEL;
+    }
+    
     try {
       readLock.lock();
       UsageByLabel usage = usages.get(label);
@@ -263,6 +268,9 @@ private Resource _get(String label, ResourceType type) {
   }
 
   private UsageByLabel getAndAddIfMissing(String label) {
+    if (label == null) {
+      label = RMNodeLabelsManager.NO_LABEL;
+    }
     if (!usages.containsKey(label)) {
       UsageByLabel u = new UsageByLabel(label);
       usages.put(label, u);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
index 5e0bbc7f9b48e..fccf7661a2ad4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
@@ -56,6 +56,8 @@
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerReservedEvent;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeCleanContainerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.SchedulingMode;
+import org.apache.hadoop.yarn.util.resource.ResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
 import com.google.common.base.Preconditions;
@@ -108,14 +110,24 @@ public class SchedulerApplicationAttempt {
   private Set<ContainerId> pendingRelease = null;
 
   /**
-   * Count how many times the application has been given an opportunity
-   * to schedule a task at each priority. Each time the scheduler
-   * asks the application for a task at this priority, it is incremented,
-   * and each time the application successfully schedules a task, it
+   * Count how many times the application has been given an opportunity to
+   * schedule a task at each priority. Each time the scheduler asks the
+   * application for a task at this priority, it is incremented, and each time
+   * the application successfully schedules a task (at rack or node local), it
    * is reset to 0.
    */
   Multiset<Priority> schedulingOpportunities = HashMultiset.create();
   
+  /**
+   * Count how many times the application has been given an opportunity to
+   * schedule a non-partitioned resource request at each priority. Each time the
+   * scheduler asks the application for a task at this priority, it is
+   * incremented, and each time the application successfully schedules a task,
+   * it is reset to 0 when schedule any task at corresponding priority.
+   */
+  Multiset<Priority> missedNonPartitionedRequestSchedulingOpportunity =
+      HashMultiset.create();
+  
   // Time of the last container scheduled at the current allowed level
   protected Map<Priority, Long> lastScheduledContainer =
       new HashMap<Priority, Long>();
@@ -132,7 +144,7 @@ public SchedulerApplicationAttempt(ApplicationAttemptId applicationAttemptId,
     this.rmContext = rmContext;
     this.appSchedulingInfo = 
         new AppSchedulingInfo(applicationAttemptId, user, queue,  
-            activeUsersManager, rmContext.getEpoch());
+            activeUsersManager, rmContext.getEpoch(), attemptResourceUsage);
     this.queue = queue;
     this.pendingRelease = new HashSet<ContainerId>();
     this.attemptId = applicationAttemptId;
@@ -489,6 +501,18 @@ public boolean isBlacklisted(String resourceName) {
     return this.appSchedulingInfo.isBlacklisted(resourceName);
   }
 
+  public synchronized int addMissedNonPartitionedRequestSchedulingOpportunity(
+      Priority priority) {
+    missedNonPartitionedRequestSchedulingOpportunity.add(priority);
+    return missedNonPartitionedRequestSchedulingOpportunity.count(priority);
+  }
+
+  public synchronized void
+      resetMissedNonPartitionedRequestSchedulingOpportunity(Priority priority) {
+    missedNonPartitionedRequestSchedulingOpportunity.setCount(priority, 0);
+  }
+
+  
   public synchronized void addSchedulingOpportunity(Priority priority) {
     schedulingOpportunities.setCount(priority,
         schedulingOpportunities.count(priority) + 1);
@@ -518,6 +542,7 @@ public synchronized int getSchedulingOpportunities(Priority priority) {
   public synchronized void resetSchedulingOpportunities(Priority priority) {
     resetSchedulingOpportunities(priority, System.currentTimeMillis());
   }
+
   // used for continuous scheduling
   public synchronized void resetSchedulingOpportunities(Priority priority,
       long currentTimeMs) {
@@ -669,4 +694,13 @@ public void recordContainerAllocationTime(long value) {
   public Set<String> getBlacklistedNodes() {
     return this.appSchedulingInfo.getBlackListCopy();
   }
+  
+  @Private
+  public boolean hasPendingResourceRequest(ResourceCalculator rc,
+      String nodePartition, Resource cluster,
+      SchedulingMode schedulingMode) {
+    return SchedulerUtils.hasPendingResourceRequest(rc,
+        this.attemptResourceUsage, nodePartition, cluster,
+        schedulingMode);
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java
index 248cc08b74853..7a1a5287a9959 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java
@@ -37,11 +37,10 @@
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.security.AccessType;
 import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.SchedulingMode;
 import org.apache.hadoop.yarn.util.resource.ResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
-import com.google.common.collect.Sets;
-
 /**
  * Utilities shared by schedulers. 
  */
@@ -235,9 +234,13 @@ public static void validateResourceRequest(ResourceRequest resReq,
     if (labelExp == null && queueInfo != null
         && ResourceRequest.ANY.equals(resReq.getResourceName())) {
       labelExp = queueInfo.getDefaultNodeLabelExpression();
-      resReq.setNodeLabelExpression(labelExp);
     }
     
+    // If labelExp still equals to null, set it to be NO_LABEL
+    resReq
+        .setNodeLabelExpression(labelExp == null ? RMNodeLabelsManager.NO_LABEL
+            : labelExp);
+    
     // we don't allow specify label expression other than resourceName=ANY now
     if (!ResourceRequest.ANY.equals(resReq.getResourceName())
         && labelExp != null && !labelExp.trim().isEmpty()) {
@@ -273,25 +276,6 @@ public static void validateResourceRequest(ResourceRequest resReq,
     }
   }
   
-  public static boolean checkQueueAccessToNode(Set<String> queueLabels,
-      Set<String> nodeLabels) {
-    // if queue's label is *, it can access any node
-    if (queueLabels != null && queueLabels.contains(RMNodeLabelsManager.ANY)) {
-      return true;
-    }
-    // any queue can access to a node without label
-    if (nodeLabels == null || nodeLabels.isEmpty()) {
-      return true;
-    }
-    // a queue can access to a node only if it contains any label of the node
-    if (queueLabels != null
-        && Sets.intersection(queueLabels, nodeLabels).size() > 0) {
-      return true;
-    }
-    // sorry, you cannot access
-    return false;
-  }
-  
   public static void checkIfLabelInClusterNodeLabels(RMNodeLabelsManager mgr,
       Set<String> labels) throws IOException {
     if (mgr == null) {
@@ -311,26 +295,6 @@ public static void checkIfLabelInClusterNodeLabels(RMNodeLabelsManager mgr,
       }
     }
   }
-  
-  public static boolean checkNodeLabelExpression(Set<String> nodeLabels,
-      String labelExpression) {
-    // empty label expression can only allocate on node with empty labels
-    if (labelExpression == null || labelExpression.trim().isEmpty()) {
-      if (!nodeLabels.isEmpty()) {
-        return false;
-      }
-    }
-
-    if (labelExpression != null) {
-      for (String str : labelExpression.split(""&&"")) {
-        if (!str.trim().isEmpty()
-            && (nodeLabels == null || !nodeLabels.contains(str.trim()))) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
 
   public static boolean checkQueueLabelExpression(Set<String> queueLabels,
       String labelExpression) {
@@ -360,4 +324,43 @@ public static AccessType toAccessType(QueueACL acl) {
     }
     return null;
   }
+  
+  public static boolean checkResourceRequestMatchingNodePartition(
+      ResourceRequest offswitchResourceRequest, String nodePartition,
+      SchedulingMode schedulingMode) {
+    // We will only look at node label = nodeLabelToLookAt according to
+    // schedulingMode and partition of node.
+    String nodePartitionToLookAt = null;
+    if (schedulingMode == SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY) {
+      nodePartitionToLookAt = nodePartition;
+    } else {
+      nodePartitionToLookAt = RMNodeLabelsManager.NO_LABEL;
+    }
+    
+    String askedNodePartition = offswitchResourceRequest.getNodeLabelExpression();
+    if (null == askedNodePartition) {
+      askedNodePartition = RMNodeLabelsManager.NO_LABEL;
+    }
+    return askedNodePartition.equals(nodePartitionToLookAt);
+  }
+  
+  private static boolean hasPendingResourceRequest(ResourceCalculator rc,
+      ResourceUsage usage, String partitionToLookAt, Resource cluster) {
+    if (Resources.greaterThan(rc, cluster,
+        usage.getPending(partitionToLookAt), Resources.none())) {
+      return true;
+    }
+    return false;
+  }
+
+  @Private
+  public static boolean hasPendingResourceRequest(ResourceCalculator rc,
+      ResourceUsage usage, String nodePartition, Resource cluster,
+      SchedulingMode schedulingMode) {
+    String partitionToLookAt = nodePartition;
+    if (schedulingMode == SchedulingMode.IGNORE_PARTITION_EXCLUSIVITY) {
+      partitionToLookAt = RMNodeLabelsManager.NO_LABEL;
+    }
+    return hasPendingResourceRequest(rc, usage, partitionToLookAt, cluster);
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
index 42ea089d72afa..d95c45c79be87 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -38,12 +37,12 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
 import org.apache.hadoop.yarn.security.AccessType;
 import org.apache.hadoop.yarn.security.PrivilegedEntity;
 import org.apache.hadoop.yarn.security.PrivilegedEntity.EntityType;
 import org.apache.hadoop.yarn.security.YarnAuthorizationProvider;
 import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceLimits;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceUsage;
@@ -56,6 +55,11 @@
 public abstract class AbstractCSQueue implements CSQueue {
   private static final Log LOG = LogFactory.getLog(AbstractCSQueue.class);
   
+  static final CSAssignment NULL_ASSIGNMENT =
+      new CSAssignment(Resources.createResource(0, 0), NodeType.NODE_LOCAL);
+  
+  static final CSAssignment SKIP_ASSIGNMENT = new CSAssignment(true);
+  
   CSQueue parent;
   final String queueName;
   volatile int numContainers;
@@ -343,16 +347,8 @@ public Resource getMinimumAllocation() {
   }
   
   synchronized void allocateResource(Resource clusterResource, 
-      Resource resource, Set<String> nodeLabels) {
-    
-    // Update usedResources by labels
-    if (nodeLabels == null || nodeLabels.isEmpty()) {
-      queueUsage.incUsed(resource);
-    } else {
-      for (String label : Sets.intersection(accessibleLabels, nodeLabels)) {
-        queueUsage.incUsed(label, resource);
-      }
-    }
+      Resource resource, String nodePartition) {
+    queueUsage.incUsed(nodePartition, resource);
 
     ++numContainers;
     CSQueueUtils.updateQueueStatistics(resourceCalculator, this, getParent(),
@@ -360,15 +356,8 @@ synchronized void allocateResource(Resource clusterResource,
   }
   
   protected synchronized void releaseResource(Resource clusterResource,
-      Resource resource, Set<String> nodeLabels) {
-    // Update usedResources by labels
-    if (null == nodeLabels || nodeLabels.isEmpty()) {
-      queueUsage.decUsed(resource);
-    } else {
-      for (String label : Sets.intersection(accessibleLabels, nodeLabels)) {
-        queueUsage.decUsed(label, resource);
-      }
-    }
+      Resource resource, String nodePartition) {
+    queueUsage.decUsed(nodePartition, resource);
 
     CSQueueUtils.updateQueueStatistics(resourceCalculator, this, getParent(),
         clusterResource, minimumAllocation);
@@ -434,103 +423,108 @@ private boolean isQueueHierarchyPreemptionDisabled(CSQueue q) {
                                         parentQ.getPreemptionDisabled());
   }
   
-  private Resource getCurrentLimitResource(String nodeLabel,
-      Resource clusterResource, ResourceLimits currentResourceLimits) {
-    /*
-     * Current limit resource: For labeled resource: limit = queue-max-resource
-     * (TODO, this part need update when we support labeled-limit) For
-     * non-labeled resource: limit = min(queue-max-resource,
-     * limit-set-by-parent)
-     */
-    Resource queueMaxResource =
-        Resources.multiplyAndNormalizeDown(resourceCalculator,
-            labelManager.getResourceByLabel(nodeLabel, clusterResource),
-            queueCapacities.getAbsoluteMaximumCapacity(nodeLabel), minimumAllocation);
-    if (nodeLabel.equals(RMNodeLabelsManager.NO_LABEL)) {
-      return Resources.min(resourceCalculator, clusterResource,
-          queueMaxResource, currentResourceLimits.getLimit());
+  private Resource getCurrentLimitResource(String nodePartition,
+      Resource clusterResource, ResourceLimits currentResourceLimits,
+      SchedulingMode schedulingMode) {
+    if (schedulingMode == SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY) {
+      /*
+       * Current limit resource: For labeled resource: limit = queue-max-resource
+       * (TODO, this part need update when we support labeled-limit) For
+       * non-labeled resource: limit = min(queue-max-resource,
+       * limit-set-by-parent)
+       */
+      Resource queueMaxResource =
+          Resources.multiplyAndNormalizeDown(resourceCalculator,
+              labelManager.getResourceByLabel(nodePartition, clusterResource),
+              queueCapacities.getAbsoluteMaximumCapacity(nodePartition), minimumAllocation);
+      if (nodePartition.equals(RMNodeLabelsManager.NO_LABEL)) {
+        return Resources.min(resourceCalculator, clusterResource,
+            queueMaxResource, currentResourceLimits.getLimit());
+      }
+      return queueMaxResource;  
+    } else if (schedulingMode == SchedulingMode.IGNORE_PARTITION_EXCLUSIVITY) {
+      // When we doing non-exclusive resource allocation, maximum capacity of
+      // all queues on this label equals to total resource with the label.
+      return labelManager.getResourceByLabel(nodePartition, clusterResource);
     }
-    return queueMaxResource;
+    
+    return Resources.none();
   }
   
   synchronized boolean canAssignToThisQueue(Resource clusterResource,
-      Set<String> nodeLabels, ResourceLimits currentResourceLimits,
-      Resource nowRequired, Resource resourceCouldBeUnreserved) {
-    // Get label of this queue can access, it's (nodeLabel AND queueLabel)
-    Set<String> labelCanAccess;
-    if (null == nodeLabels || nodeLabels.isEmpty()) {
-      labelCanAccess = new HashSet<String>();
-      // Any queue can always access any node without label
-      labelCanAccess.add(RMNodeLabelsManager.NO_LABEL);
-    } else {
-      labelCanAccess = new HashSet<String>(
-          accessibleLabels.contains(CommonNodeLabelsManager.ANY) ? nodeLabels
-              : Sets.intersection(accessibleLabels, nodeLabels));
-    }
-    
-    for (String label : labelCanAccess) {
-      // New total resource = used + required
-      Resource newTotalResource =
-          Resources.add(queueUsage.getUsed(label), nowRequired);
-
-      Resource currentLimitResource =
-          getCurrentLimitResource(label, clusterResource, currentResourceLimits);
-
-      // if reservation continous looking enabled, check to see if could we
-      // potentially use this node instead of a reserved node if the application
-      // has reserved containers.
-      // TODO, now only consider reservation cases when the node has no label
-      if (this.reservationsContinueLooking
-          && label.equals(RMNodeLabelsManager.NO_LABEL)
-          && Resources.greaterThan(resourceCalculator, clusterResource,
-              resourceCouldBeUnreserved, Resources.none())) {
-        // resource-without-reserved = used - reserved
-        Resource newTotalWithoutReservedResource =
-            Resources.subtract(newTotalResource, resourceCouldBeUnreserved);
-        
-        // when total-used-without-reserved-resource < currentLimit, we still
-        // have chance to allocate on this node by unreserving some containers
-        if (Resources.lessThan(resourceCalculator, clusterResource,
-            newTotalWithoutReservedResource, currentLimitResource)) {
-          if (LOG.isDebugEnabled()) {
-            LOG.debug(""try to use reserved: "" + getQueueName()
-                + "" usedResources: "" + queueUsage.getUsed()
-                + "", clusterResources: "" + clusterResource
-                + "", reservedResources: "" + resourceCouldBeUnreserved
-                + "", capacity-without-reserved: ""
-                + newTotalWithoutReservedResource + "", maxLimitCapacity: ""
-                + currentLimitResource); 
-          }
-          return true;
+      String nodePartition, ResourceLimits currentResourceLimits,
+      Resource nowRequired, Resource resourceCouldBeUnreserved,
+      SchedulingMode schedulingMode) {
+    // New total resource = used + required
+    Resource newTotalResource =
+        Resources.add(queueUsage.getUsed(nodePartition), nowRequired);
+
+    // Get current limited resource: 
+    // - When doing RESPECT_PARTITION_EXCLUSIVITY allocation, we will respect
+    // queues' max capacity.
+    // - When doing IGNORE_PARTITION_EXCLUSIVITY allocation, we will not respect
+    // queue's max capacity, queue's max capacity on the partition will be
+    // considered to be 100%. Which is a queue can use all resource in the
+    // partition. 
+    // Doing this because: for non-exclusive allocation, we make sure there's
+    // idle resource on the partition, to avoid wastage, such resource will be
+    // leveraged as much as we can, and preemption policy will reclaim it back
+    // when partitoned-resource-request comes back.  
+    Resource currentLimitResource =
+        getCurrentLimitResource(nodePartition, clusterResource,
+            currentResourceLimits, schedulingMode);
+
+    // if reservation continous looking enabled, check to see if could we
+    // potentially use this node instead of a reserved node if the application
+    // has reserved containers.
+    // TODO, now only consider reservation cases when the node has no label
+    if (this.reservationsContinueLooking
+        && nodePartition.equals(RMNodeLabelsManager.NO_LABEL)
+        && Resources.greaterThan(resourceCalculator, clusterResource,
+            resourceCouldBeUnreserved, Resources.none())) {
+      // resource-without-reserved = used - reserved
+      Resource newTotalWithoutReservedResource =
+          Resources.subtract(newTotalResource, resourceCouldBeUnreserved);
+
+      // when total-used-without-reserved-resource < currentLimit, we still
+      // have chance to allocate on this node by unreserving some containers
+      if (Resources.lessThan(resourceCalculator, clusterResource,
+          newTotalWithoutReservedResource, currentLimitResource)) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(""try to use reserved: "" + getQueueName()
+              + "" usedResources: "" + queueUsage.getUsed()
+              + "", clusterResources: "" + clusterResource
+              + "", reservedResources: "" + resourceCouldBeUnreserved
+              + "", capacity-without-reserved: ""
+              + newTotalWithoutReservedResource + "", maxLimitCapacity: ""
+              + currentLimitResource);
         }
+        return true;
       }
-      
-      // Otherwise, if any of the label of this node beyond queue limit, we
-      // cannot allocate on this node. Consider a small epsilon here.
-      if (Resources.greaterThan(resourceCalculator, clusterResource,
-          newTotalResource, currentLimitResource)) {
-        return false;
-      }
+    }
 
-      if (LOG.isDebugEnabled()) {
-        LOG.debug(getQueueName()
-            + ""Check assign to queue, label="" + label
-            + "" usedResources: "" + queueUsage.getUsed(label)
-            + "" clusterResources: "" + clusterResource
-            + "" currentUsedCapacity ""
-            + Resources.divide(resourceCalculator, clusterResource,
-                queueUsage.getUsed(label),
-                labelManager.getResourceByLabel(label, clusterResource))
-            + "" max-capacity: ""
-            + queueCapacities.getAbsoluteMaximumCapacity(label)
-            + "")"");
-      }
-      return true;
+    // Check if we over current-resource-limit computed.
+    if (Resources.greaterThan(resourceCalculator, clusterResource,
+        newTotalResource, currentLimitResource)) {
+      return false;
     }
-    
-    // Actually, this will not happen, since labelCanAccess will be always
-    // non-empty
-    return false;
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug(getQueueName()
+          + ""Check assign to queue, nodePartition=""
+          + nodePartition
+          + "" usedResources: ""
+          + queueUsage.getUsed(nodePartition)
+          + "" clusterResources: ""
+          + clusterResource
+          + "" currentUsedCapacity ""
+          + Resources.divide(resourceCalculator, clusterResource,
+              queueUsage.getUsed(nodePartition),
+              labelManager.getResourceByLabel(nodePartition, clusterResource))
+          + "" max-capacity: ""
+          + queueCapacities.getAbsoluteMaximumCapacity(nodePartition) + "")"");
+    }
+    return true;
   }
   
   @Override
@@ -556,4 +550,33 @@ public void decPendingResource(String nodeLabel, Resource resourceToDec) {
       parent.decPendingResource(nodeLabel, resourceToDec);
     }
   }
+  
+  /**
+   * Return if the queue has pending resource on given nodePartition and
+   * schedulingMode. 
+   */
+  boolean hasPendingResourceRequest(String nodePartition, 
+      Resource cluster, SchedulingMode schedulingMode) {
+    return SchedulerUtils.hasPendingResourceRequest(resourceCalculator,
+        queueUsage, nodePartition, cluster, schedulingMode);
+  }
+  
+  boolean accessibleToPartition(String nodePartition) {
+    // if queue's label is *, it can access any node
+    if (accessibleLabels != null
+        && accessibleLabels.contains(RMNodeLabelsManager.ANY)) {
+      return true;
+    }
+    // any queue can access to a node without label
+    if (nodePartition == null
+        || nodePartition.equals(RMNodeLabelsManager.NO_LABEL)) {
+      return true;
+    }
+    // a queue can access to a node only if it contains any label of the node
+    if (accessibleLabels != null && accessibleLabels.contains(nodePartition)) {
+      return true;
+    }
+    // sorry, you cannot access
+    return false;
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java
index 1a9448acaa148..b06a646cec973 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java
@@ -190,10 +190,13 @@ public void finishApplicationAttempt(FiCaSchedulerApp application,
    * @param clusterResource the resource of the cluster.
    * @param node node on which resources are available
    * @param resourceLimits how much overall resource of this queue can use. 
+   * @param schedulingMode Type of exclusive check when assign container on a 
+   * NodeManager, see {@link SchedulingMode}.
    * @return the assignment
    */
   public CSAssignment assignContainers(Resource clusterResource,
-      FiCaSchedulerNode node, ResourceLimits resourceLimits);
+      FiCaSchedulerNode node, ResourceLimits resourceLimits,
+      SchedulingMode schedulingMode);
   
   /**
    * A container assigned to the queue has completed.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index e93c5291f2905..cfeee37d1e6ac 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
@@ -1114,28 +1115,30 @@ private synchronized void allocateContainersToNode(FiCaSchedulerNode node) {
     if (reservedContainer != null) {
       FiCaSchedulerApp reservedApplication =
           getCurrentAttemptForContainer(reservedContainer.getContainerId());
-      
+
       // Try to fulfill the reservation
-      LOG.info(""Trying to fulfill reservation for application "" + 
-          reservedApplication.getApplicationId() + "" on node: "" + 
-          node.getNodeID());
-      
-      LeafQueue queue = ((LeafQueue)reservedApplication.getQueue());
-      assignment = queue.assignContainers(
+      LOG.info(""Trying to fulfill reservation for application ""
+          + reservedApplication.getApplicationId() + "" on node: ""
+          + node.getNodeID());
+
+      LeafQueue queue = ((LeafQueue) reservedApplication.getQueue());
+      assignment =
+          queue.assignContainers(
               clusterResource,
               node,
               // TODO, now we only consider limits for parent for non-labeled
               // resources, should consider labeled resources as well.
               new ResourceLimits(labelManager.getResourceByLabel(
-                  RMNodeLabelsManager.NO_LABEL, clusterResource)));
+                  RMNodeLabelsManager.NO_LABEL, clusterResource)),
+              SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
       if (assignment.isFulfilledReservation()) {
         CSAssignment tmp =
             new CSAssignment(reservedContainer.getReservedResource(),
-              assignment.getType());
+                assignment.getType());
         Resources.addTo(assignment.getAssignmentInformation().getAllocated(),
-          reservedContainer.getReservedResource());
+            reservedContainer.getReservedResource());
         tmp.getAssignmentInformation().addAllocationDetails(
-          reservedContainer.getContainerId(), queue.getQueuePath());
+            reservedContainer.getContainerId(), queue.getQueuePath());
         tmp.getAssignmentInformation().incrAllocations();
         updateSchedulerHealth(lastNodeUpdateTime, node, tmp);
         schedulerHealth.updateSchedulerFulfilledReservationCounts(1);
@@ -1143,16 +1146,13 @@ private synchronized void allocateContainersToNode(FiCaSchedulerNode node) {
 
       RMContainer excessReservation = assignment.getExcessReservation();
       if (excessReservation != null) {
-      Container container = excessReservation.getContainer();
-      queue.completedContainer(
-          clusterResource, assignment.getApplication(), node, 
-          excessReservation, 
-          SchedulerUtils.createAbnormalContainerStatus(
-              container.getId(), 
-              SchedulerUtils.UNRESERVED_CONTAINER), 
-          RMContainerEventType.RELEASED, null, true);
+        Container container = excessReservation.getContainer();
+        queue.completedContainer(clusterResource, assignment.getApplication(),
+            node, excessReservation, SchedulerUtils
+                .createAbnormalContainerStatus(container.getId(),
+                    SchedulerUtils.UNRESERVED_CONTAINER),
+            RMContainerEventType.RELEASED, null, true);
       }
-
     }
 
     // Try to schedule more if there are no reservations to fulfill
@@ -1163,22 +1163,61 @@ private synchronized void allocateContainersToNode(FiCaSchedulerNode node) {
           LOG.debug(""Trying to schedule on node: "" + node.getNodeName() +
               "", available: "" + node.getAvailableResource());
         }
+
         assignment = root.assignContainers(
             clusterResource,
             node,
             // TODO, now we only consider limits for parent for non-labeled
             // resources, should consider labeled resources as well.
             new ResourceLimits(labelManager.getResourceByLabel(
-                RMNodeLabelsManager.NO_LABEL, clusterResource)));
+                RMNodeLabelsManager.NO_LABEL, clusterResource)),
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
+        if (Resources.greaterThan(calculator, clusterResource,
+            assignment.getResource(), Resources.none())) {
+          updateSchedulerHealth(lastNodeUpdateTime, node, assignment);
+          return;
+        }
+        
+        // Only do non-exclusive allocation when node has node-labels.
+        if (StringUtils.equals(node.getPartition(),
+            RMNodeLabelsManager.NO_LABEL)) {
+          return;
+        }
+        
+        // Only do non-exclusive allocation when the node-label supports that
+        try {
+          if (rmContext.getNodeLabelManager().isExclusiveNodeLabel(
+              node.getPartition())) {
+            return;
+          }
+        } catch (IOException e) {
+          LOG.warn(""Exception when trying to get exclusivity of node label=""
+              + node.getPartition(), e);
+          return;
+        }
+        
+        // Try to use NON_EXCLUSIVE
+        assignment = root.assignContainers(
+            clusterResource,
+            node,
+            // TODO, now we only consider limits for parent for non-labeled
+            // resources, should consider labeled resources as well.
+            new ResourceLimits(labelManager.getResourceByLabel(
+                RMNodeLabelsManager.NO_LABEL, clusterResource)),
+            SchedulingMode.IGNORE_PARTITION_EXCLUSIVITY);
         updateSchedulerHealth(lastNodeUpdateTime, node, assignment);
+        if (Resources.greaterThan(calculator, clusterResource,
+            assignment.getResource(), Resources.none())) {
+          return;
+        }
       }
     } else {
-      LOG.info(""Skipping scheduling since node "" + node.getNodeID() + 
-          "" is reserved by application "" + 
-          node.getReservedContainer().getContainerId().getApplicationAttemptId()
-          );
+      LOG.info(""Skipping scheduling since node ""
+          + node.getNodeID()
+          + "" is reserved by application ""
+          + node.getReservedContainer().getContainerId()
+              .getApplicationAttemptId());
     }
-  
   }
 
   @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
index 102e5539f162a..4e8d61769ecdf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
@@ -319,6 +319,11 @@ public float getMaximumApplicationMasterResourcePerQueuePercent(String queue) {
     		getMaximumApplicationMasterResourcePercent());
   }
   
+  public void setMaximumApplicationMasterResourcePerQueuePercent(String queue,
+      float percent) {
+    setFloat(getQueuePrefix(queue) + MAXIMUM_AM_RESOURCE_SUFFIX, percent);
+  }
+  
   public float getNonLabeledQueueCapacity(String queue) {
     float capacity = queue.equals(""root"") ? 100.0f : getFloat(
         getQueuePrefix(queue) + CAPACITY, UNDEFINED);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
index 59a016f98140d..8a6a601f202f7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
@@ -24,7 +24,6 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +57,7 @@
 import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
 import org.apache.hadoop.yarn.security.AccessType;
 import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerEventType;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerState;
@@ -718,39 +718,11 @@ private synchronized FiCaSchedulerApp getApplication(
       ApplicationAttemptId applicationAttemptId) {
     return applicationAttemptMap.get(applicationAttemptId);
   }
-
-  private static final CSAssignment NULL_ASSIGNMENT =
-      new CSAssignment(Resources.createResource(0, 0), NodeType.NODE_LOCAL);
-  
-  private static final CSAssignment SKIP_ASSIGNMENT = new CSAssignment(true);
-  
-  private static Set<String> getRequestLabelSetByExpression(
-      String labelExpression) {
-    Set<String> labels = new HashSet<String>();
-    if (null == labelExpression) {
-      return labels;
-    }
-    for (String l : labelExpression.split(""&&"")) {
-      if (l.trim().isEmpty()) {
-        continue;
-      }
-      labels.add(l.trim());
-    }
-    return labels;
-  }
-  
-  private boolean checkResourceRequestMatchingNodeLabel(ResourceRequest offswitchResourceRequest,
-      FiCaSchedulerNode node) {
-    String askedNodeLabel = offswitchResourceRequest.getNodeLabelExpression();
-    if (null == askedNodeLabel) {
-      askedNodeLabel = RMNodeLabelsManager.NO_LABEL;
-    }
-    return askedNodeLabel.equals(node.getPartition());
-  }
   
   @Override
   public synchronized CSAssignment assignContainers(Resource clusterResource,
-      FiCaSchedulerNode node, ResourceLimits currentResourceLimits) {
+      FiCaSchedulerNode node, ResourceLimits currentResourceLimits,
+      SchedulingMode schedulingMode) {
     updateCurrentResourceLimits(currentResourceLimits, clusterResource);
     
     if(LOG.isDebugEnabled()) {
@@ -758,12 +730,6 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
         + "" #applications="" + activeApplications.size());
     }
     
-    // if our queue cannot access this node, just return
-    if (!SchedulerUtils.checkQueueAccessToNode(accessibleLabels,
-        node.getLabels())) {
-      return NULL_ASSIGNMENT;
-    }
-    
     // Check for reserved resources
     RMContainer reservedContainer = node.getReservedContainer();
     if (reservedContainer != null) {
@@ -771,8 +737,26 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
           getApplication(reservedContainer.getApplicationAttemptId());
       synchronized (application) {
         return assignReservedContainer(application, node, reservedContainer,
-            clusterResource);
+            clusterResource, schedulingMode);
+      }
+    }
+    
+    // if our queue cannot access this node, just return
+    if (schedulingMode == SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY
+        && !accessibleToPartition(node.getPartition())) {
+      return NULL_ASSIGNMENT;
+    }
+    
+    // Check if this queue need more resource, simply skip allocation if this
+    // queue doesn't need more resources.
+    if (!hasPendingResourceRequest(node.getPartition(),
+        clusterResource, schedulingMode)) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(""Skip this queue="" + getQueuePath()
+            + "", because it doesn't need more resource, schedulingMode=""
+            + schedulingMode.name() + "" node-partition="" + node.getPartition());
       }
+      return NULL_ASSIGNMENT;
     }
     
     // Try to assign containers to applications in order
@@ -783,6 +767,17 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
         + application.getApplicationId());
         application.showRequests();
       }
+      
+      // Check if application needs more resource, skip if it doesn't need more.
+      if (!application.hasPendingResourceRequest(resourceCalculator,
+          node.getPartition(), clusterResource, schedulingMode)) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(""Skip app_attempt="" + application.getApplicationAttemptId()
+              + "", because it doesn't need more resource, schedulingMode=""
+              + schedulingMode.name() + "" node-label="" + node.getPartition());
+        }
+        continue;
+      }
 
       synchronized (application) {
         // Check if this resource is on the blacklist
@@ -806,10 +801,27 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
             continue;
           }
           
+          // AM container allocation doesn't support non-exclusive allocation to
+          // avoid painful of preempt an AM container
+          if (schedulingMode == SchedulingMode.IGNORE_PARTITION_EXCLUSIVITY) {
+            RMAppAttempt rmAppAttempt =
+                csContext.getRMContext().getRMApps()
+                    .get(application.getApplicationId()).getCurrentAppAttempt();
+            if (null == rmAppAttempt.getMasterContainer()) {
+              if (LOG.isDebugEnabled()) {
+                LOG.debug(""Skip allocating AM container to app_attempt=""
+                    + application.getApplicationAttemptId()
+                    + "", don't allow to allocate AM container in non-exclusive mode"");
+              }
+              break;
+            }
+          }
+          
           // Is the node-label-expression of this offswitch resource request
           // matches the node's label?
           // If not match, jump to next priority.
-          if (!checkResourceRequestMatchingNodeLabel(anyRequest, node)) {
+          if (!SchedulerUtils.checkResourceRequestMatchingNodePartition(
+              anyRequest, node.getPartition(), schedulingMode)) {
             continue;
           }
           
@@ -822,10 +834,6 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
             }
           }
           
-          Set<String> requestedNodeLabels =
-              getRequestLabelSetByExpression(anyRequest
-                  .getNodeLabelExpression());
-
           // Compute user-limit & set headroom
           // Note: We compute both user-limit & headroom with the highest 
           //       priority request as the target. 
@@ -833,27 +841,61 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
           //       before all higher priority ones are serviced.
           Resource userLimit = 
               computeUserLimitAndSetHeadroom(application, clusterResource, 
-                  required, requestedNodeLabels);          
+                  required, node.getPartition(), schedulingMode);          
           
           // Check queue max-capacity limit
-          if (!super.canAssignToThisQueue(clusterResource, node.getLabels(),
-              this.currentResourceLimits, required, application.getCurrentReservation())) {
+          if (!super.canAssignToThisQueue(clusterResource, node.getPartition(),
+              this.currentResourceLimits, required,
+              application.getCurrentReservation(), schedulingMode)) {
             return NULL_ASSIGNMENT;
           }
 
           // Check user limit
           if (!canAssignToUser(clusterResource, application.getUser(), userLimit,
-              application, true, requestedNodeLabels)) {
+              application, true, node.getPartition())) {
             break;
           }
 
           // Inform the application it is about to get a scheduling opportunity
           application.addSchedulingOpportunity(priority);
           
+          // Increase missed-non-partitioned-resource-request-opportunity.
+          // This is to make sure non-partitioned-resource-request will prefer
+          // to be allocated to non-partitioned nodes
+          int missedNonPartitionedRequestSchedulingOpportunity = 0;
+          if (anyRequest.getNodeLabelExpression().equals(
+              RMNodeLabelsManager.NO_LABEL)) {
+            missedNonPartitionedRequestSchedulingOpportunity =
+                application
+                    .addMissedNonPartitionedRequestSchedulingOpportunity(priority);
+          }
+          
+          if (schedulingMode == SchedulingMode.IGNORE_PARTITION_EXCLUSIVITY) {
+            // Before doing allocation, we need to check scheduling opportunity to
+            // make sure : non-partitioned resource request should be scheduled to
+            // non-partitioned partition first.
+            if (missedNonPartitionedRequestSchedulingOpportunity < scheduler
+                .getNumClusterNodes()) {
+              if (LOG.isDebugEnabled()) {
+                LOG.debug(""Skip app_attempt=""
+                    + application.getApplicationAttemptId()
+                    + "" priority=""
+                    + priority
+                    + "" because missed-non-partitioned-resource-request""
+                    + "" opportunity under requred:""
+                    + "" Now="" + missedNonPartitionedRequestSchedulingOpportunity
+                    + "" required=""
+                    + scheduler.getNumClusterNodes());
+              }
+
+              break;
+            }
+          }
+          
           // Try to schedule
           CSAssignment assignment =  
             assignContainersOnNode(clusterResource, node, application, priority, 
-                null);
+                null, schedulingMode);
 
           // Did the application skip this node?
           if (assignment.getSkipped()) {
@@ -870,9 +912,9 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
             // Book-keeping 
             // Note: Update headroom to account for current allocation too...
             allocateResource(clusterResource, application, assigned,
-                node.getLabels());
+                node.getPartition());
             
-            // Don't reset scheduling opportunities for non-local assignments
+            // Don't reset scheduling opportunities for offswitch assignments
             // otherwise the app will be delayed for each non-local assignment.
             // This helps apps with many off-cluster requests schedule faster.
             if (assignment.getType() != NodeType.OFF_SWITCH) {
@@ -881,6 +923,10 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
               }
               application.resetSchedulingOpportunities(priority);
             }
+            // Non-exclusive scheduling opportunity is different: we need reset
+            // it every time to make sure non-labeled resource request will be
+            // most likely allocated on non-labeled nodes first. 
+            application.resetMissedNonPartitionedRequestSchedulingOpportunity(priority);
             
             // Done
             return assignment;
@@ -904,7 +950,8 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
 
   private synchronized CSAssignment assignReservedContainer(
       FiCaSchedulerApp application, FiCaSchedulerNode node,
-      RMContainer rmContainer, Resource clusterResource) {
+      RMContainer rmContainer, Resource clusterResource,
+      SchedulingMode schedulingMode) {
     // Do we still need this reservation?
     Priority priority = rmContainer.getReservedPriority();
     if (application.getTotalRequiredResources(priority) == 0) {
@@ -915,7 +962,7 @@ private synchronized CSAssignment assignReservedContainer(
     // Try to assign if we have sufficient resources
     CSAssignment tmp =
         assignContainersOnNode(clusterResource, node, application, priority,
-          rmContainer);
+          rmContainer, schedulingMode);
     
     // Doesn't matter... since it's already charged for at time of reservation
     // ""re-reservation"" is *free*
@@ -929,7 +976,8 @@ private synchronized CSAssignment assignReservedContainer(
   protected Resource getHeadroom(User user, Resource queueCurrentLimit,
       Resource clusterResource, FiCaSchedulerApp application, Resource required) {
     return getHeadroom(user, queueCurrentLimit, clusterResource,
-	  computeUserLimit(application, clusterResource, required, user, null));
+        computeUserLimit(application, clusterResource, required, user,
+            RMNodeLabelsManager.NO_LABEL, SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY));
   }
   
   private Resource getHeadroom(User user, Resource currentResourceLimit,
@@ -973,7 +1021,8 @@ private void setQueueResourceLimitsInfo(
 
   @Lock({LeafQueue.class, FiCaSchedulerApp.class})
   Resource computeUserLimitAndSetHeadroom(FiCaSchedulerApp application,
-      Resource clusterResource, Resource required, Set<String> requestedLabels) {
+      Resource clusterResource, Resource required, String nodePartition,
+      SchedulingMode schedulingMode) {
     String user = application.getUser();
     User queueUser = getUser(user);
 
@@ -981,7 +1030,7 @@ Resource computeUserLimitAndSetHeadroom(FiCaSchedulerApp application,
     // TODO, need consider headroom respect labels also
     Resource userLimit =
         computeUserLimit(application, clusterResource, required,
-            queueUser, requestedLabels);
+            queueUser, nodePartition, schedulingMode);
 
     setQueueResourceLimitsInfo(clusterResource);
     
@@ -1010,34 +1059,18 @@ Resource computeUserLimitAndSetHeadroom(FiCaSchedulerApp application,
   @Lock(NoLock.class)
   private Resource computeUserLimit(FiCaSchedulerApp application,
       Resource clusterResource, Resource required, User user,
-      Set<String> requestedLabels) {
+      String nodePartition, SchedulingMode schedulingMode) {
     // What is our current capacity? 
     // * It is equal to the max(required, queue-capacity) if
     //   we're running below capacity. The 'max' ensures that jobs in queues
     //   with miniscule capacity (< 1 slot) make progress
     // * If we're running over capacity, then its
     //   (usedResources + required) (which extra resources we are allocating)
-    Resource queueCapacity = Resource.newInstance(0, 0);
-    if (requestedLabels != null && !requestedLabels.isEmpty()) {
-      // if we have multiple labels to request, we will choose to use the first
-      // label
-      String firstLabel = requestedLabels.iterator().next();
-      queueCapacity =
-          Resources
-              .max(resourceCalculator, clusterResource, queueCapacity,
-                  Resources.multiplyAndNormalizeUp(resourceCalculator,
-                      labelManager.getResourceByLabel(firstLabel,
-                          clusterResource),
-                      queueCapacities.getAbsoluteCapacity(firstLabel),
-                      minimumAllocation));
-    } else {
-      // else there's no label on request, just to use absolute capacity as
-      // capacity for nodes without label
-      queueCapacity =
-          Resources.multiplyAndNormalizeUp(resourceCalculator, labelManager
-                .getResourceByLabel(CommonNodeLabelsManager.NO_LABEL, clusterResource),
-              queueCapacities.getAbsoluteCapacity(), minimumAllocation);
-    }
+    Resource queueCapacity =
+        Resources.multiplyAndNormalizeUp(resourceCalculator,
+            labelManager.getResourceByLabel(nodePartition, clusterResource),
+            queueCapacities.getAbsoluteCapacity(nodePartition),
+            minimumAllocation);
 
     // Allow progress for queues with miniscule capacity
     queueCapacity =
@@ -1047,33 +1080,56 @@ private Resource computeUserLimit(FiCaSchedulerApp application,
             required);
 
     Resource currentCapacity =
-        Resources.lessThan(resourceCalculator, clusterResource, 
-            queueUsage.getUsed(), queueCapacity) ?
-            queueCapacity : Resources.add(queueUsage.getUsed(), required);
+        Resources.lessThan(resourceCalculator, clusterResource,
+            queueUsage.getUsed(nodePartition), queueCapacity) ? queueCapacity
+            : Resources.add(queueUsage.getUsed(nodePartition), required);
     
     // Never allow a single user to take more than the 
     // queue's configured capacity * user-limit-factor.
     // Also, the queue's configured capacity should be higher than 
     // queue-hard-limit * ulMin
     
-    final int activeUsers = activeUsersManager.getNumActiveUsers();  
-    		
-    Resource limit =
+    final int activeUsers = activeUsersManager.getNumActiveUsers();
+    
+    // User limit resource is determined by:
+    // max{currentCapacity / #activeUsers, currentCapacity * user-limit-percentage%)
+    Resource userLimitResource = Resources.max(
+        resourceCalculator, clusterResource, 
+        Resources.divideAndCeil(
+            resourceCalculator, currentCapacity, activeUsers),
+        Resources.divideAndCeil(
+            resourceCalculator, 
+            Resources.multiplyAndRoundDown(
+                currentCapacity, userLimit), 
+            100)
+        );
+    
+    // User limit is capped by maxUserLimit
+    // - maxUserLimit = queueCapacity * user-limit-factor (RESPECT_PARTITION_EXCLUSIVITY)
+    // - maxUserLimit = total-partition-resource (IGNORE_PARTITION_EXCLUSIVITY)
+    //
+    // In IGNORE_PARTITION_EXCLUSIVITY mode, if a queue cannot access a
+    // partition, its guaranteed resource on that partition is 0. And
+    // user-limit-factor computation is based on queue's guaranteed capacity. So
+    // we will not cap user-limit as well as used resource when doing
+    // IGNORE_PARTITION_EXCLUSIVITY allocation.
+    Resource maxUserLimit = Resources.none();
+    if (schedulingMode == SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY) {
+      maxUserLimit =
+          Resources.multiplyAndRoundDown(queueCapacity, userLimitFactor);
+    } else if (schedulingMode == SchedulingMode.IGNORE_PARTITION_EXCLUSIVITY) {
+      maxUserLimit =
+          labelManager.getResourceByLabel(nodePartition, clusterResource);
+    }
+    
+    // Cap final user limit with maxUserLimit
+    userLimitResource =
         Resources.roundUp(
             resourceCalculator, 
             Resources.min(
                 resourceCalculator, clusterResource,   
-                Resources.max(
-                    resourceCalculator, clusterResource, 
-                    Resources.divideAndCeil(
-                        resourceCalculator, currentCapacity, activeUsers),
-                    Resources.divideAndCeil(
-                        resourceCalculator, 
-                        Resources.multiplyAndRoundDown(
-                            currentCapacity, userLimit), 
-                        100)
-                    ), 
-                Resources.multiplyAndRoundDown(queueCapacity, userLimitFactor)
+                  userLimitResource,
+                  maxUserLimit
                 ), 
             minimumAllocation);
 
@@ -1081,11 +1137,11 @@ private Resource computeUserLimit(FiCaSchedulerApp application,
       String userName = application.getUser();
       LOG.debug(""User limit computation for "" + userName + 
           "" in queue "" + getQueueName() +
-          "" userLimit="" + userLimit +
+          "" userLimitPercent="" + userLimit +
           "" userLimitFactor="" + userLimitFactor +
           "" required: "" + required + 
           "" consumed: "" + user.getUsed() + 
-          "" limit: "" + limit +
+          "" user-limit-resource: "" + userLimitResource +
           "" queueCapacity: "" + queueCapacity + 
           "" qconsumed: "" + queueUsage.getUsed() +
           "" currentCapacity: "" + currentCapacity +
@@ -1093,31 +1149,26 @@ private Resource computeUserLimit(FiCaSchedulerApp application,
           "" clusterCapacity: "" + clusterResource
       );
     }
-    user.setUserResourceLimit(limit);
-    return limit;
+    user.setUserResourceLimit(userLimitResource);
+    return userLimitResource;
   }
   
   @Private
   protected synchronized boolean canAssignToUser(Resource clusterResource,
       String userName, Resource limit, FiCaSchedulerApp application,
-      boolean checkReservations, Set<String> requestLabels) {
+      boolean checkReservations, String nodePartition) {
     User user = getUser(userName);
-    
-    String label = CommonNodeLabelsManager.NO_LABEL;
-    if (requestLabels != null && !requestLabels.isEmpty()) {
-      label = requestLabels.iterator().next();
-    }
 
     // Note: We aren't considering the current request since there is a fixed
     // overhead of the AM, but it's a > check, not a >= check, so...
     if (Resources
         .greaterThan(resourceCalculator, clusterResource,
-            user.getUsed(label),
+            user.getUsed(nodePartition),
             limit)) {
       // if enabled, check to see if could we potentially use this node instead
       // of a reserved node if the application has reserved containers
       if (this.reservationsContinueLooking && checkReservations
-          && label.equals(CommonNodeLabelsManager.NO_LABEL)) {
+          && nodePartition.equals(CommonNodeLabelsManager.NO_LABEL)) {
         if (Resources.lessThanOrEqual(
             resourceCalculator,
             clusterResource,
@@ -1136,7 +1187,7 @@ protected synchronized boolean canAssignToUser(Resource clusterResource,
       if (LOG.isDebugEnabled()) {
         LOG.debug(""User "" + userName + "" in queue "" + getQueueName()
             + "" will exceed limit - "" + "" consumed: ""
-            + user.getUsed() + "" limit: "" + limit);
+            + user.getUsed(nodePartition) + "" limit: "" + limit);
       }
       return false;
     }
@@ -1176,7 +1227,7 @@ resourceCalculator, required, getMaximumAllocation()
 
   private CSAssignment assignContainersOnNode(Resource clusterResource,
       FiCaSchedulerNode node, FiCaSchedulerApp application, Priority priority,
-      RMContainer reservedContainer) {
+      RMContainer reservedContainer, SchedulingMode schedulingMode) {
 
     CSAssignment assigned;
 
@@ -1190,7 +1241,7 @@ private CSAssignment assignContainersOnNode(Resource clusterResource,
       assigned =
           assignNodeLocalContainers(clusterResource, nodeLocalResourceRequest, 
             node, application, priority, reservedContainer,
-            allocatedContainer);
+            allocatedContainer, schedulingMode);
       if (Resources.greaterThan(resourceCalculator, clusterResource,
         assigned.getResource(), Resources.none())) {
 
@@ -1219,7 +1270,7 @@ private CSAssignment assignContainersOnNode(Resource clusterResource,
       assigned = 
           assignRackLocalContainers(clusterResource, rackLocalResourceRequest, 
             node, application, priority, reservedContainer,
-            allocatedContainer);
+            allocatedContainer, schedulingMode);
       if (Resources.greaterThan(resourceCalculator, clusterResource,
         assigned.getResource(), Resources.none())) {
 
@@ -1248,7 +1299,7 @@ private CSAssignment assignContainersOnNode(Resource clusterResource,
       assigned =
           assignOffSwitchContainers(clusterResource, offSwitchResourceRequest,
             node, application, priority, reservedContainer,
-            allocatedContainer);
+            allocatedContainer, schedulingMode);
 
       // update locality statistics
       if (allocatedContainer.getValue() != null) {
@@ -1314,16 +1365,17 @@ protected boolean findNodeToUnreserve(Resource clusterResource,
 
   @Private
   protected boolean checkLimitsToReserve(Resource clusterResource,
-      FiCaSchedulerApp application, Resource capability) {
+      FiCaSchedulerApp application, Resource capability, String nodePartition,
+      SchedulingMode schedulingMode) {
     // we can't reserve if we got here based on the limit
     // checks assuming we could unreserve!!!
     Resource userLimit = computeUserLimitAndSetHeadroom(application,
-        clusterResource, capability, null);
+        clusterResource, capability, nodePartition, schedulingMode);
 
     // Check queue max-capacity limit,
     // TODO: Consider reservation on labels
-    if (!canAssignToThisQueue(clusterResource, null,
-        this.currentResourceLimits, capability, Resources.none())) {
+    if (!canAssignToThisQueue(clusterResource, RMNodeLabelsManager.NO_LABEL,
+        this.currentResourceLimits, capability, Resources.none(), schedulingMode)) {
       if (LOG.isDebugEnabled()) {
         LOG.debug(""was going to reserve but hit queue limit"");
       }
@@ -1332,7 +1384,7 @@ protected boolean checkLimitsToReserve(Resource clusterResource,
 
     // Check user limit
     if (!canAssignToUser(clusterResource, application.getUser(), userLimit,
-        application, false, null)) {
+        application, false, nodePartition)) {
       if (LOG.isDebugEnabled()) {
         LOG.debug(""was going to reserve but hit user limit"");
       }
@@ -1345,12 +1397,13 @@ protected boolean checkLimitsToReserve(Resource clusterResource,
   private CSAssignment assignNodeLocalContainers(Resource clusterResource,
       ResourceRequest nodeLocalResourceRequest, FiCaSchedulerNode node,
       FiCaSchedulerApp application, Priority priority,
-      RMContainer reservedContainer, MutableObject allocatedContainer) {
+      RMContainer reservedContainer, MutableObject allocatedContainer,
+      SchedulingMode schedulingMode) {
     if (canAssign(application, priority, node, NodeType.NODE_LOCAL, 
         reservedContainer)) {
       return assignContainer(clusterResource, node, application, priority,
           nodeLocalResourceRequest, NodeType.NODE_LOCAL, reservedContainer,
-          allocatedContainer);
+          allocatedContainer, schedulingMode);
     }
 
     return new CSAssignment(Resources.none(), NodeType.NODE_LOCAL);
@@ -1359,12 +1412,13 @@ private CSAssignment assignNodeLocalContainers(Resource clusterResource,
   private CSAssignment assignRackLocalContainers(Resource clusterResource,
       ResourceRequest rackLocalResourceRequest, FiCaSchedulerNode node,
       FiCaSchedulerApp application, Priority priority,
-      RMContainer reservedContainer, MutableObject allocatedContainer) {
+      RMContainer reservedContainer, MutableObject allocatedContainer,
+      SchedulingMode schedulingMode) {
     if (canAssign(application, priority, node, NodeType.RACK_LOCAL,
         reservedContainer)) {
       return assignContainer(clusterResource, node, application, priority,
           rackLocalResourceRequest, NodeType.RACK_LOCAL, reservedContainer,
-          allocatedContainer);
+          allocatedContainer, schedulingMode);
     }
 
     return new CSAssignment(Resources.none(), NodeType.RACK_LOCAL);
@@ -1373,16 +1427,21 @@ private CSAssignment assignRackLocalContainers(Resource clusterResource,
   private CSAssignment assignOffSwitchContainers(Resource clusterResource,
       ResourceRequest offSwitchResourceRequest, FiCaSchedulerNode node,
       FiCaSchedulerApp application, Priority priority,
-      RMContainer reservedContainer, MutableObject allocatedContainer) {
+      RMContainer reservedContainer, MutableObject allocatedContainer,
+      SchedulingMode schedulingMode) {
     if (canAssign(application, priority, node, NodeType.OFF_SWITCH,
         reservedContainer)) {
       return assignContainer(clusterResource, node, application, priority,
           offSwitchResourceRequest, NodeType.OFF_SWITCH, reservedContainer,
-          allocatedContainer);
+          allocatedContainer, schedulingMode);
     }
     
     return new CSAssignment(Resources.none(), NodeType.OFF_SWITCH);
   }
+  
+  private int getActualNodeLocalityDelay() {
+    return Math.min(scheduler.getNumClusterNodes(), getNodeLocalityDelay());
+  }
 
   boolean canAssign(FiCaSchedulerApp application, Priority priority, 
       FiCaSchedulerNode node, NodeType type, RMContainer reservedContainer) {
@@ -1417,10 +1476,7 @@ boolean canAssign(FiCaSchedulerApp application, Priority priority,
     if (type == NodeType.RACK_LOCAL) {
       // 'Delay' rack-local just a little bit...
       long missedOpportunities = application.getSchedulingOpportunities(priority);
-      return (
-          Math.min(scheduler.getNumClusterNodes(), getNodeLocalityDelay()) < 
-          missedOpportunities
-          );
+      return getActualNodeLocalityDelay() < missedOpportunities;
     }
 
     // Check if we need containers on this host
@@ -1460,7 +1516,7 @@ Container createContainer(FiCaSchedulerApp application, FiCaSchedulerNode node,
   private CSAssignment assignContainer(Resource clusterResource, FiCaSchedulerNode node,
       FiCaSchedulerApp application, Priority priority, 
       ResourceRequest request, NodeType type, RMContainer rmContainer,
-      MutableObject createdContainer) {
+      MutableObject createdContainer, SchedulingMode schedulingMode) {
     if (LOG.isDebugEnabled()) {
       LOG.debug(""assignContainers: node="" + node.getNodeName()
         + "" application="" + application.getApplicationId()
@@ -1469,9 +1525,8 @@ private CSAssignment assignContainer(Resource clusterResource, FiCaSchedulerNode
     }
     
     // check if the resource request can access the label
-    if (!SchedulerUtils.checkNodeLabelExpression(
-        node.getLabels(),
-        request.getNodeLabelExpression())) {
+    if (!SchedulerUtils.checkResourceRequestMatchingNodePartition(request,
+        node.getPartition(), schedulingMode)) {
       // this is a reserved container, but we cannot allocate it now according
       // to label not match. This can be caused by node label changed
       // We should un-reserve this container.
@@ -1576,8 +1631,8 @@ private CSAssignment assignContainer(Resource clusterResource, FiCaSchedulerNode
           // If we're trying to reserve a container here, not container will be
           // unreserved for reserving the new one. Check limits again before
           // reserve the new container
-          if (!checkLimitsToReserve(clusterResource, 
-              application, capability)) {
+          if (!checkLimitsToReserve(clusterResource,
+              application, capability, node.getPartition(), schedulingMode)) {
             return new CSAssignment(Resources.none(), type);
           }
         }
@@ -1666,7 +1721,7 @@ public void completedContainer(Resource clusterResource,
         // Book-keeping
         if (removed) {
           releaseResource(clusterResource, application,
-              container.getResource(), node.getLabels());
+              container.getResource(), node.getPartition());
           LOG.info(""completedContainer"" +
               "" container="" + container +
               "" queue="" + this +
@@ -1684,13 +1739,13 @@ public void completedContainer(Resource clusterResource,
 
   synchronized void allocateResource(Resource clusterResource,
       SchedulerApplicationAttempt application, Resource resource,
-      Set<String> nodeLabels) {
-    super.allocateResource(clusterResource, resource, nodeLabels);
+      String nodePartition) {
+    super.allocateResource(clusterResource, resource, nodePartition);
     
     // Update user metrics
     String userName = application.getUser();
     User user = getUser(userName);
-    user.assignContainer(resource, nodeLabels);
+    user.assignContainer(resource, nodePartition);
     // Note this is a bit unconventional since it gets the object and modifies
     // it here, rather then using set routine
     Resources.subtractFrom(application.getHeadroom(), resource); // headroom
@@ -1707,13 +1762,13 @@ synchronized void allocateResource(Resource clusterResource,
   }
 
   synchronized void releaseResource(Resource clusterResource, 
-      FiCaSchedulerApp application, Resource resource, Set<String> nodeLabels) {
-    super.releaseResource(clusterResource, resource, nodeLabels);
+      FiCaSchedulerApp application, Resource resource, String nodePartition) {
+    super.releaseResource(clusterResource, resource, nodePartition);
     
     // Update user metrics
     String userName = application.getUser();
     User user = getUser(userName);
-    user.releaseContainer(resource, nodeLabels);
+    user.releaseContainer(resource, nodePartition);
     metrics.setAvailableResourcesToUser(userName, application.getHeadroom());
       
     LOG.info(getQueueName() + 
@@ -1723,7 +1778,8 @@ synchronized void releaseResource(Resource clusterResource,
   
   private void updateAbsoluteCapacityResource(Resource clusterResource) {
     absoluteCapacityResource =
-        Resources.multiplyAndNormalizeUp(resourceCalculator, clusterResource,
+        Resources.multiplyAndNormalizeUp(resourceCalculator, labelManager
+            .getResourceByLabel(RMNodeLabelsManager.NO_LABEL, clusterResource),
             queueCapacities.getAbsoluteCapacity(), minimumAllocation);
   }
   
@@ -1769,8 +1825,9 @@ resourceCalculator, this, getParent(), clusterResource,
     // Update application properties
     for (FiCaSchedulerApp application : activeApplications) {
       synchronized (application) {
-        computeUserLimitAndSetHeadroom(application, clusterResource, 
-            Resources.none(), null);
+        computeUserLimitAndSetHeadroom(application, clusterResource,
+            Resources.none(), RMNodeLabelsManager.NO_LABEL,
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
       }
     }
   }
@@ -1828,25 +1885,12 @@ public synchronized void finishApplication(boolean wasActive) {
       }
     }
 
-    public void assignContainer(Resource resource,
-        Set<String> nodeLabels) {
-      if (nodeLabels == null || nodeLabels.isEmpty()) {
-        userResourceUsage.incUsed(resource);
-      } else {
-        for (String label : nodeLabels) {
-          userResourceUsage.incUsed(label, resource);
-        }
-      }
+    public void assignContainer(Resource resource, String nodePartition) {
+      userResourceUsage.incUsed(nodePartition, resource);
     }
 
-    public void releaseContainer(Resource resource, Set<String> nodeLabels) {
-      if (nodeLabels == null || nodeLabels.isEmpty()) {
-        userResourceUsage.decUsed(resource);
-      } else {
-        for (String label : nodeLabels) {
-          userResourceUsage.decUsed(label, resource);
-        }
-      }
+    public void releaseContainer(Resource resource, String nodePartition) {
+      userResourceUsage.decUsed(nodePartition, resource);
     }
 
     public Resource getUserResourceLimit() {
@@ -1869,7 +1913,7 @@ public void recoverContainer(Resource clusterResource,
       FiCaSchedulerNode node =
           scheduler.getNode(rmContainer.getContainer().getNodeId());
       allocateResource(clusterResource, attempt, rmContainer.getContainer()
-          .getResource(), node.getLabels());
+          .getResource(), node.getPartition());
     }
     getParent().recoverContainer(clusterResource, attempt, rmContainer);
   }
@@ -1909,7 +1953,7 @@ public void attachContainer(Resource clusterResource,
       FiCaSchedulerNode node =
           scheduler.getNode(rmContainer.getContainer().getNodeId());
       allocateResource(clusterResource, application, rmContainer.getContainer()
-          .getResource(), node.getLabels());
+          .getResource(), node.getPartition());
       LOG.info(""movedContainer"" + "" container="" + rmContainer.getContainer()
           + "" resource="" + rmContainer.getContainer().getResource()
           + "" queueMoveIn="" + this + "" usedCapacity="" + getUsedCapacity()
@@ -1927,7 +1971,7 @@ public void detachContainer(Resource clusterResource,
       FiCaSchedulerNode node =
           scheduler.getNode(rmContainer.getContainer().getNodeId());
       releaseResource(clusterResource, application, rmContainer.getContainer()
-          .getResource(), node.getLabels());
+          .getResource(), node.getPartition());
       LOG.info(""movedContainer"" + "" container="" + rmContainer.getContainer()
           + "" resource="" + rmContainer.getContainer().getResource()
           + "" queueMoveOut="" + this + "" usedCapacity="" + getUsedCapacity()
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
index 882498a6808f2..eb64d4384f0a7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
@@ -56,8 +56,6 @@
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceLimits;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerUtils;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.AssignmentInformation;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerNode;
 import org.apache.hadoop.yarn.util.resource.Resources;
@@ -377,16 +375,29 @@ private synchronized void removeApplication(ApplicationId applicationId,
 
   @Override
   public synchronized CSAssignment assignContainers(Resource clusterResource,
-      FiCaSchedulerNode node, ResourceLimits resourceLimits) {
-    CSAssignment assignment = 
-        new CSAssignment(Resources.createResource(0, 0), NodeType.NODE_LOCAL);
-    Set<String> nodeLabels = node.getLabels();
-    
+      FiCaSchedulerNode node, ResourceLimits resourceLimits,
+      SchedulingMode schedulingMode) {
     // if our queue cannot access this node, just return
-    if (!SchedulerUtils.checkQueueAccessToNode(accessibleLabels, nodeLabels)) {
-      return assignment;
+    if (schedulingMode == SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY
+        && !accessibleToPartition(node.getPartition())) {
+      return NULL_ASSIGNMENT;
+    }
+    
+    // Check if this queue need more resource, simply skip allocation if this
+    // queue doesn't need more resources.
+    if (!super.hasPendingResourceRequest(node.getPartition(),
+        clusterResource, schedulingMode)) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(""Skip this queue="" + getQueuePath()
+            + "", because it doesn't need more resource, schedulingMode=""
+            + schedulingMode.name() + "" node-partition="" + node.getPartition());
+      }
+      return NULL_ASSIGNMENT;
     }
     
+    CSAssignment assignment = 
+        new CSAssignment(Resources.createResource(0, 0), NodeType.NODE_LOCAL);
+    
     while (canAssign(clusterResource, node)) {
       if (LOG.isDebugEnabled()) {
         LOG.debug(""Trying to assign containers to child-queue of ""
@@ -396,15 +407,17 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
       // Are we over maximum-capacity for this queue?
       // This will also consider parent's limits and also continuous reservation
       // looking
-      if (!super.canAssignToThisQueue(clusterResource, nodeLabels, resourceLimits,
-          minimumAllocation, Resources.createResource(getMetrics()
-              .getReservedMB(), getMetrics().getReservedVirtualCores()))) {
+      if (!super.canAssignToThisQueue(clusterResource, node.getPartition(),
+          resourceLimits, minimumAllocation, Resources.createResource(
+              getMetrics().getReservedMB(), getMetrics()
+                  .getReservedVirtualCores()), schedulingMode)) {
         break;
       }
       
       // Schedule
-      CSAssignment assignedToChild = 
-          assignContainersToChildQueues(clusterResource, node, resourceLimits);
+      CSAssignment assignedToChild =
+          assignContainersToChildQueues(clusterResource, node, resourceLimits,
+              schedulingMode);
       assignment.setType(assignedToChild.getType());
       
       // Done if no child-queue assigned anything
@@ -413,7 +426,7 @@ public synchronized CSAssignment assignContainers(Resource clusterResource,
               assignedToChild.getResource(), Resources.none())) {
         // Track resource utilization for the parent-queue
         super.allocateResource(clusterResource, assignedToChild.getResource(),
-            nodeLabels);
+            node.getPartition());
         
         // Track resource utilization in this pass of the scheduler
         Resources
@@ -510,7 +523,8 @@ private ResourceLimits getResourceLimitsOfChild(CSQueue child,
   }
   
   private synchronized CSAssignment assignContainersToChildQueues(
-      Resource cluster, FiCaSchedulerNode node, ResourceLimits limits) {
+      Resource cluster, FiCaSchedulerNode node, ResourceLimits limits,
+      SchedulingMode schedulingMode) {
     CSAssignment assignment = 
         new CSAssignment(Resources.createResource(0, 0), NodeType.NODE_LOCAL);
     
@@ -523,12 +537,13 @@ private synchronized CSAssignment assignContainersToChildQueues(
         LOG.debug(""Trying to assign to queue: "" + childQueue.getQueuePath()
           + "" stats: "" + childQueue);
       }
-      
+
       // Get ResourceLimits of child queue before assign containers
       ResourceLimits childLimits =
           getResourceLimitsOfChild(childQueue, cluster, limits);
       
-      assignment = childQueue.assignContainers(cluster, node, childLimits);
+      assignment = childQueue.assignContainers(cluster, node, 
+          childLimits, schedulingMode);
       if(LOG.isDebugEnabled()) {
         LOG.debug(""Assigned to queue: "" + childQueue.getQueuePath() +
           "" stats: "" + childQueue + "" --> "" + 
@@ -584,7 +599,7 @@ public void completedContainer(Resource clusterResource,
       // Book keeping
       synchronized (this) {
         super.releaseResource(clusterResource, rmContainer.getContainer()
-            .getResource(), node.getLabels());
+            .getResource(), node.getPartition());
 
         LOG.info(""completedContainer"" +
             "" queue="" + getQueueName() + 
@@ -653,7 +668,7 @@ public void recoverContainer(Resource clusterResource,
       FiCaSchedulerNode node =
           scheduler.getNode(rmContainer.getContainer().getNodeId());
       super.allocateResource(clusterResource, rmContainer.getContainer()
-          .getResource(), node.getLabels());
+          .getResource(), node.getPartition());
     }
     if (parent != null) {
       parent.recoverContainer(clusterResource, attempt, rmContainer);
@@ -681,7 +696,7 @@ public void attachContainer(Resource clusterResource,
       FiCaSchedulerNode node =
           scheduler.getNode(rmContainer.getContainer().getNodeId());
       super.allocateResource(clusterResource, rmContainer.getContainer()
-          .getResource(), node.getLabels());
+          .getResource(), node.getPartition());
       LOG.info(""movedContainer"" + "" queueMoveIn="" + getQueueName()
           + "" usedCapacity="" + getUsedCapacity() + "" absoluteUsedCapacity=""
           + getAbsoluteUsedCapacity() + "" used="" + queueUsage.getUsed() + "" cluster=""
@@ -701,7 +716,7 @@ public void detachContainer(Resource clusterResource,
           scheduler.getNode(rmContainer.getContainer().getNodeId());
       super.releaseResource(clusterResource,
           rmContainer.getContainer().getResource(),
-          node.getLabels());
+          node.getPartition());
       LOG.info(""movedContainer"" + "" queueMoveOut="" + getQueueName()
           + "" usedCapacity="" + getUsedCapacity() + "" absoluteUsedCapacity=""
           + getAbsoluteUsedCapacity() + "" used="" + queueUsage.getUsed() + "" cluster=""
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/SchedulingMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/SchedulingMode.java
new file mode 100644
index 0000000000000..7e7dc37c9bea1
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/SchedulingMode.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
+
+/**
+ * Scheduling modes, see below for detailed explanations 
+ */
+public enum SchedulingMode {
+  /**
+   * <p>
+   * When a node has partition (say partition=x), only application in the queue
+   * can access to partition=x AND requires for partition=x resource can get
+   * chance to allocate on the node.
+   * </p>
+   * 
+   * <p>
+   * When a node has no partition, only application requires non-partitioned
+   * resource can get chance to allocate on the node.
+   * </p>
+   */
+  RESPECT_PARTITION_EXCLUSIVITY,
+  
+  /**
+   * Only used when a node has partition AND the partition isn't an exclusive
+   * partition AND application requires non-partitioned resource.
+   */
+  IGNORE_PARTITION_EXCLUSIVITY
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java
index 76ede3940f825..9b7eb840dbecc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java
@@ -54,6 +54,7 @@
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.server.resourcemanager.Task.State;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
@@ -277,6 +278,9 @@ private synchronized void addResourceRequest(
     } else {
       request.setNumContainers(request.getNumContainers() + 1);
     }
+    if (request.getNodeLabelExpression() == null) {
+      request.setNodeLabelExpression(RMNodeLabelsManager.NO_LABEL);
+    }
     
     // Note this down for next interaction with ResourceManager
     ask.remove(request);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
index f62fdb3dcee22..5c107aa38bfb1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
@@ -150,8 +150,14 @@ public AllocateResponse allocate(
   public AllocateResponse allocate(
       String host, int memory, int numContainers,
       List<ContainerId> releases, String labelExpression) throws Exception {
+    return allocate(host, memory, numContainers, 1, releases, labelExpression);
+  }
+  
+  public AllocateResponse allocate(
+      String host, int memory, int numContainers, int priority,
+      List<ContainerId> releases, String labelExpression) throws Exception {
     List<ResourceRequest> reqs =
-        createReq(new String[] { host }, memory, 1, numContainers,
+        createReq(new String[] { host }, memory, priority, numContainers,
             labelExpression);
     return allocate(reqs, releases);
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
index 06c6b3275e334..f2b1d8646de51 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
@@ -21,6 +21,8 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -200,10 +202,18 @@ public boolean waitForState(MockNM nm, ContainerId containerId,
   
   public boolean waitForState(MockNM nm, ContainerId containerId,
       RMContainerState containerState, int timeoutMillisecs) throws Exception {
+    return waitForState(Arrays.asList(nm), containerId, containerState,
+        timeoutMillisecs);
+  }
+  
+  public boolean waitForState(Collection<MockNM> nms, ContainerId containerId,
+      RMContainerState containerState, int timeoutMillisecs) throws Exception {
     RMContainer container = getResourceScheduler().getRMContainer(containerId);
     int timeoutSecs = 0;
     while(container == null && timeoutSecs++ < timeoutMillisecs / 100) {
-      nm.nodeHeartbeat(true);
+      for (MockNM nm : nms) {
+        nm.nodeHeartbeat(true);
+      }
       container = getResourceScheduler().getRMContainer(containerId);
       System.out.println(""Waiting for container "" + containerId + "" to be allocated."");
       Thread.sleep(100);
@@ -217,9 +227,11 @@ public boolean waitForState(MockNM nm, ContainerId containerId,
         && timeoutSecs++ < timeoutMillisecs / 100) {
       System.out.println(""Container : "" + containerId + "" State is : ""
           + container.getState() + "" Waiting for state : "" + containerState);
-      nm.nodeHeartbeat(true);
+      for (MockNM nm : nms) {
+        nm.nodeHeartbeat(true);
+      }
       Thread.sleep(100);
-      
+
       if (timeoutMillisecs <= timeoutSecs * 100) {
         return false;
       }
@@ -650,11 +662,28 @@ public static void finishAMAndVerifyAppState(RMApp rmApp, MockRM rm, MockNM nm,
     am.waitForState(RMAppAttemptState.FINISHED);
     rm.waitForState(rmApp.getApplicationId(), RMAppState.FINISHED);
   }
+  
+  @SuppressWarnings(""rawtypes"")
+  private static void waitForSchedulerAppAttemptAdded(
+      ApplicationAttemptId attemptId, MockRM rm) throws InterruptedException {
+    int tick = 0;
+    // Wait for at most 5 sec
+    while (null == ((AbstractYarnScheduler) rm.getResourceScheduler())
+        .getApplicationAttempt(attemptId) && tick < 50) {
+      Thread.sleep(100);
+      if (tick % 10 == 0) {
+        System.out.println(""waiting for SchedulerApplicationAttempt=""
+            + attemptId + "" added."");
+      }
+      tick++;
+    }
+  }
 
   public static MockAM launchAM(RMApp app, MockRM rm, MockNM nm)
       throws Exception {
     rm.waitForState(app.getApplicationId(), RMAppState.ACCEPTED);
     RMAppAttempt attempt = app.getCurrentAppAttempt();
+    waitForSchedulerAppAttemptAdded(attempt.getAppAttemptId(), rm);
     System.out.println(""Launch AM "" + attempt.getAppAttemptId());
     nm.nodeHeartbeat(true);
     MockAM am = rm.sendAMLaunched(attempt.getAppAttemptId());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
index 1ca5c97a411a5..46167ca68596b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
@@ -612,7 +612,7 @@ public void testHeadroom() throws Exception {
 
     // Schedule to compute 
     queue.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     Resource expectedHeadroom = Resources.createResource(10*16*GB, 1);
     assertEquals(expectedHeadroom, app_0_0.getHeadroom());
 
@@ -632,7 +632,7 @@ public void testHeadroom() throws Exception {
 
     // Schedule to compute 
     queue.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource)); // Schedule to compute
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY); // Schedule to compute
     assertEquals(expectedHeadroom, app_0_0.getHeadroom());
     assertEquals(expectedHeadroom, app_0_1.getHeadroom());// no change
     
@@ -652,7 +652,7 @@ public void testHeadroom() throws Exception {
     
     // Schedule to compute 
     queue.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource)); // Schedule to compute
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY); // Schedule to compute
     expectedHeadroom = Resources.createResource(10*16*GB / 2, 1); // changes
     assertEquals(expectedHeadroom, app_0_0.getHeadroom());
     assertEquals(expectedHeadroom, app_0_1.getHeadroom());
@@ -661,7 +661,7 @@ public void testHeadroom() throws Exception {
     // Now reduce cluster size and check for the smaller headroom
     clusterResource = Resources.createResource(90*16*GB);
     queue.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource)); // Schedule to compute
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY); // Schedule to compute
     expectedHeadroom = Resources.createResource(9*16*GB / 2, 1); // changes
     assertEquals(expectedHeadroom, app_0_0.getHeadroom());
     assertEquals(expectedHeadroom, app_0_1.getHeadroom());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java
index 23b31faeb8f7d..970a98ad576f6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java
@@ -44,6 +44,7 @@
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
 import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter;
 import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsPublisher;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerEventType;
@@ -133,7 +134,7 @@ public CSAssignment answer(InvocationOnMock invocation) throws Throwable {
         final Resource allocatedResource = Resources.createResource(allocation);
         if (queue instanceof ParentQueue) {
           ((ParentQueue)queue).allocateResource(clusterResource, 
-              allocatedResource, null);
+              allocatedResource, RMNodeLabelsManager.NO_LABEL);
         } else {
           FiCaSchedulerApp app1 = getMockApplication(0, """");
           ((LeafQueue)queue).allocateResource(clusterResource, app1, 
@@ -145,7 +146,7 @@ public CSAssignment answer(InvocationOnMock invocation) throws Throwable {
           doReturn(new CSAssignment(Resources.none(), type)).
           when(queue)
               .assignContainers(eq(clusterResource), eq(node),
-                  any(ResourceLimits.class));
+                  any(ResourceLimits.class), any(SchedulingMode.class));
 
           // Mock the node's resource availability
           Resource available = node.getAvailableResource();
@@ -157,7 +158,7 @@ public CSAssignment answer(InvocationOnMock invocation) throws Throwable {
       }
     }).
     when(queue).assignContainers(eq(clusterResource), eq(node), 
-        any(ResourceLimits.class));
+        any(ResourceLimits.class), any(SchedulingMode.class));
     doNothing().when(node).releaseContainer(any(Container.class));
   }
 
@@ -241,6 +242,14 @@ public void testSortedQueues() throws Exception {
     CSQueue b = queues.get(B);
     CSQueue c = queues.get(C);
     CSQueue d = queues.get(D);
+    
+    // Make a/b/c/d has >0 pending resource, so that allocation will continue.
+    queues.get(CapacitySchedulerConfiguration.ROOT).getQueueResourceUsage()
+        .incPending(Resources.createResource(1 * GB));
+    a.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    b.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    c.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    d.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
 
     final String user_0 = ""user_0"";
 
@@ -275,7 +284,7 @@ public void testSortedQueues() throws Exception {
     stubQueueAllocation(c, clusterResource, node_0, 0*GB);
     stubQueueAllocation(d, clusterResource, node_0, 0*GB);
     root.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     for(int i=0; i < 2; i++)
     {
       stubQueueAllocation(a, clusterResource, node_0, 0*GB);
@@ -283,7 +292,7 @@ public void testSortedQueues() throws Exception {
       stubQueueAllocation(c, clusterResource, node_0, 0*GB);
       stubQueueAllocation(d, clusterResource, node_0, 0*GB);
       root.assignContainers(clusterResource, node_0, new ResourceLimits(
-          clusterResource));
+          clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     } 
     for(int i=0; i < 3; i++)
     {
@@ -292,7 +301,7 @@ public void testSortedQueues() throws Exception {
       stubQueueAllocation(c, clusterResource, node_0, 1*GB);
       stubQueueAllocation(d, clusterResource, node_0, 0*GB);
       root.assignContainers(clusterResource, node_0, new ResourceLimits(
-          clusterResource));
+          clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     }  
     for(int i=0; i < 4; i++)
     {
@@ -301,7 +310,7 @@ public void testSortedQueues() throws Exception {
       stubQueueAllocation(c, clusterResource, node_0, 0*GB);
       stubQueueAllocation(d, clusterResource, node_0, 1*GB);
       root.assignContainers(clusterResource, node_0, new ResourceLimits(
-          clusterResource));
+          clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     }    
     verifyQueueMetrics(a, 1*GB, clusterResource);
     verifyQueueMetrics(b, 2*GB, clusterResource);
@@ -335,7 +344,7 @@ public void testSortedQueues() throws Exception {
       stubQueueAllocation(c, clusterResource, node_0, 0*GB);
       stubQueueAllocation(d, clusterResource, node_0, 0*GB);
       root.assignContainers(clusterResource, node_0, new ResourceLimits(
-          clusterResource));
+          clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     }
     verifyQueueMetrics(a, 3*GB, clusterResource);
     verifyQueueMetrics(b, 2*GB, clusterResource);
@@ -363,7 +372,7 @@ public void testSortedQueues() throws Exception {
     stubQueueAllocation(c, clusterResource, node_0, 0*GB);
     stubQueueAllocation(d, clusterResource, node_0, 0*GB);
     root.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(a, 2*GB, clusterResource);
     verifyQueueMetrics(b, 3*GB, clusterResource);
     verifyQueueMetrics(c, 3*GB, clusterResource);
@@ -390,7 +399,7 @@ public void testSortedQueues() throws Exception {
     stubQueueAllocation(c, clusterResource, node_0, 0*GB);
     stubQueueAllocation(d, clusterResource, node_0, 0*GB);
     root.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(a, 3*GB, clusterResource);
     verifyQueueMetrics(b, 2*GB, clusterResource);
     verifyQueueMetrics(c, 3*GB, clusterResource);
@@ -405,12 +414,14 @@ public void testSortedQueues() throws Exception {
     stubQueueAllocation(c, clusterResource, node_0, 0*GB);
     stubQueueAllocation(d, clusterResource, node_0, 1*GB);
     root.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     InOrder allocationOrder = inOrder(d,b);
-    allocationOrder.verify(d).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), any(ResourceLimits.class));
-    allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), any(ResourceLimits.class));
+    allocationOrder.verify(d).assignContainers(eq(clusterResource),
+        any(FiCaSchedulerNode.class), any(ResourceLimits.class),
+        any(SchedulingMode.class));
+    allocationOrder.verify(b).assignContainers(eq(clusterResource),
+        any(FiCaSchedulerNode.class), any(ResourceLimits.class),
+        any(SchedulingMode.class));
     verifyQueueMetrics(a, 3*GB, clusterResource);
     verifyQueueMetrics(b, 2*GB, clusterResource);
     verifyQueueMetrics(c, 3*GB, clusterResource);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java
index 03b8f5c1fe195..54ba61724f95e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java
@@ -19,6 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -32,6 +34,7 @@
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.LogAggregationContext;
 import org.apache.hadoop.yarn.api.records.NodeId;
+import org.apache.hadoop.yarn.api.records.NodeLabel;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
@@ -51,9 +54,13 @@
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerState;
+import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppReport;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
 import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.junit.Assert;
@@ -327,387 +334,4 @@ protected RMSecretManagerService createRMSecretManagerService() {
     rm1.waitForState(attempt.getAppAttemptId(), RMAppAttemptState.ALLOCATED);
     MockRM.launchAndRegisterAM(app1, rm1, nm1);
   }
-  
-  private Configuration getConfigurationWithQueueLabels(Configuration config) {
-    CapacitySchedulerConfiguration conf =
-        new CapacitySchedulerConfiguration(config);
-    
-    // Define top-level queues
-    conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] {""a"", ""b"", ""c""});
-    conf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""x"", 100);
-    conf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""y"", 100);
-
-    final String A = CapacitySchedulerConfiguration.ROOT + "".a"";
-    conf.setCapacity(A, 10);
-    conf.setMaximumCapacity(A, 15);
-    conf.setAccessibleNodeLabels(A, toSet(""x""));
-    conf.setCapacityByLabel(A, ""x"", 100);
-    
-    final String B = CapacitySchedulerConfiguration.ROOT + "".b"";
-    conf.setCapacity(B, 20);
-    conf.setAccessibleNodeLabels(B, toSet(""y""));
-    conf.setCapacityByLabel(B, ""y"", 100);
-    
-    final String C = CapacitySchedulerConfiguration.ROOT + "".c"";
-    conf.setCapacity(C, 70);
-    conf.setMaximumCapacity(C, 70);
-    conf.setAccessibleNodeLabels(C, RMNodeLabelsManager.EMPTY_STRING_SET);
-    
-    // Define 2nd-level queues
-    final String A1 = A + "".a1"";
-    conf.setQueues(A, new String[] {""a1""});
-    conf.setCapacity(A1, 100);
-    conf.setMaximumCapacity(A1, 100);
-    conf.setCapacityByLabel(A1, ""x"", 100);
-    
-    final String B1 = B + "".b1"";
-    conf.setQueues(B, new String[] {""b1""});
-    conf.setCapacity(B1, 100);
-    conf.setMaximumCapacity(B1, 100);
-    conf.setCapacityByLabel(B1, ""y"", 100);
-
-    final String C1 = C + "".c1"";
-    conf.setQueues(C, new String[] {""c1""});
-    conf.setCapacity(C1, 100);
-    conf.setMaximumCapacity(C1, 100);
-    
-    return conf;
-  }
-  
-  private void checkTaskContainersHost(ApplicationAttemptId attemptId,
-      ContainerId containerId, ResourceManager rm, String host) {
-    YarnScheduler scheduler = rm.getRMContext().getScheduler();
-    SchedulerAppReport appReport = scheduler.getSchedulerAppInfo(attemptId);
-
-    Assert.assertTrue(appReport.getLiveContainers().size() > 0);
-    for (RMContainer c : appReport.getLiveContainers()) {
-      if (c.getContainerId().equals(containerId)) {
-        Assert.assertEquals(host, c.getAllocatedNode().getHost());
-      }
-    }
-  }
-  
-  @SuppressWarnings(""unchecked"")
-  private <E> Set<E> toSet(E... elements) {
-    Set<E> set = Sets.newHashSet(elements);
-    return set;
-  }
-  
-  @Test (timeout = 300000)
-  public void testContainerAllocationWithSingleUserLimits() throws Exception {
-    final RMNodeLabelsManager mgr = new NullRMNodeLabelsManager();
-    mgr.init(conf);
-
-    // set node -> label
-    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
-    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x""),
-        NodeId.newInstance(""h2"", 0), toSet(""y"")));
-
-    // inject node label manager
-    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithDefaultQueueLabels(conf)) {
-      @Override
-      public RMNodeLabelsManager createNodeLabelManager() {
-        return mgr;
-      }
-    };
-
-    rm1.getRMContext().setNodeLabelManager(mgr);
-    rm1.start();
-    MockNM nm1 = rm1.registerNode(""h1:1234"", 8000); // label = x
-    rm1.registerNode(""h2:1234"", 8000); // label = y
-    MockNM nm3 = rm1.registerNode(""h3:1234"", 8000); // label = <empty>
-
-    // launch an app to queue a1 (label = x), and check all container will
-    // be allocated in h1
-    RMApp app1 = rm1.submitApp(200, ""app"", ""user"", null, ""a1"");
-    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
-    
-    // A has only 10% of x, so it can only allocate one container in label=empty
-    ContainerId containerId =
-        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
-    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), """");
-    Assert.assertTrue(rm1.waitForState(nm3, containerId,
-          RMContainerState.ALLOCATED, 10 * 1000));
-    // Cannot allocate 2nd label=empty container
-    containerId =
-        ContainerId.newContainerId(am1.getApplicationAttemptId(), 3);
-    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), """");
-    Assert.assertFalse(rm1.waitForState(nm3, containerId,
-          RMContainerState.ALLOCATED, 10 * 1000));
-
-    // A has default user limit = 100, so it can use all resource in label = x
-    // We can allocate floor(8000 / 1024) = 7 containers
-    for (int id = 3; id <= 8; id++) {
-      containerId =
-          ContainerId.newContainerId(am1.getApplicationAttemptId(), id);
-      am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""x"");
-      Assert.assertTrue(rm1.waitForState(nm1, containerId,
-          RMContainerState.ALLOCATED, 10 * 1000));
-    }
-    rm1.close();
-  }
-  
-  @Test(timeout = 300000)
-  public void testContainerAllocateWithComplexLabels() throws Exception {
-    /*
-     * Queue structure:
-     *                      root (*)
-     *                  ________________
-     *                 /                \
-     *               a x(100%), y(50%)   b y(50%), z(100%)
-     *               ________________    ______________
-     *              /                   /              \
-     *             a1 (x,y)         b1(no)              b2(y,z)
-     *               100%                          y = 100%, z = 100%
-     *                           
-     * Node structure:
-     * h1 : x
-     * h2 : y
-     * h3 : y
-     * h4 : z
-     * h5 : NO
-     * 
-     * Total resource:
-     * x: 4G
-     * y: 6G
-     * z: 2G
-     * *: 2G
-     * 
-     * Resource of
-     * a1: x=4G, y=3G, NO=0.2G
-     * b1: NO=0.9G (max=1G)
-     * b2: y=3, z=2G, NO=0.9G (max=1G)
-     * 
-     * Each node can only allocate two containers
-     */
-
-    // set node -> label
-    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y"", ""z""));
-    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0),
-        toSet(""x""), NodeId.newInstance(""h2"", 0), toSet(""y""),
-        NodeId.newInstance(""h3"", 0), toSet(""y""), NodeId.newInstance(""h4"", 0),
-        toSet(""z""), NodeId.newInstance(""h5"", 0),
-        RMNodeLabelsManager.EMPTY_STRING_SET));
-
-    // inject node label manager
-    MockRM rm1 = new MockRM(TestUtils.getComplexConfigurationWithQueueLabels(conf)) {
-      @Override
-      public RMNodeLabelsManager createNodeLabelManager() {
-        return mgr;
-      }
-    };
-
-    rm1.getRMContext().setNodeLabelManager(mgr);
-    rm1.start();
-    MockNM nm1 = rm1.registerNode(""h1:1234"", 2048);
-    MockNM nm2 = rm1.registerNode(""h2:1234"", 2048);
-    MockNM nm3 = rm1.registerNode(""h3:1234"", 2048);
-    MockNM nm4 = rm1.registerNode(""h4:1234"", 2048);
-    MockNM nm5 = rm1.registerNode(""h5:1234"", 2048);
-    
-    ContainerId containerId;
-
-    // launch an app to queue a1 (label = x), and check all container will
-    // be allocated in h1
-    RMApp app1 = rm1.submitApp(1024, ""app"", ""user"", null, ""a1"");
-    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
-
-    // request a container (label = y). can be allocated on nm2 
-    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""y"");
-    containerId =
-        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2L);
-    Assert.assertTrue(rm1.waitForState(nm2, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am1.getApplicationAttemptId(), containerId, rm1,
-        ""h2"");
-
-    // launch an app to queue b1 (label = y), and check all container will
-    // be allocated in h5
-    RMApp app2 = rm1.submitApp(1024, ""app"", ""user"", null, ""b1"");
-    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm5);
-
-    // request a container for AM, will succeed
-    // and now b1's queue capacity will be used, cannot allocate more containers
-    // (Maximum capacity reached)
-    am2.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
-    containerId = ContainerId.newContainerId(am2.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm4, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertFalse(rm1.waitForState(nm5, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    
-    // launch an app to queue b2
-    RMApp app3 = rm1.submitApp(1024, ""app"", ""user"", null, ""b2"");
-    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm5);
-
-    // request a container. try to allocate on nm1 (label = x) and nm3 (label =
-    // y,z). Will successfully allocate on nm3
-    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""y"");
-    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm1, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm3, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
-        ""h3"");
-    
-    // try to allocate container (request label = z) on nm4 (label = y,z). 
-    // Will successfully allocate on nm4 only.
-    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""z"");
-    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 3L);
-    Assert.assertTrue(rm1.waitForState(nm4, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
-        ""h4"");
-
-    rm1.close();
-  }
-
-  @Test (timeout = 120000)
-  public void testContainerAllocateWithLabels() throws Exception {
-    // set node -> label
-    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
-    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x""),
-        NodeId.newInstance(""h2"", 0), toSet(""y"")));
-
-    // inject node label manager
-    MockRM rm1 = new MockRM(getConfigurationWithQueueLabels(conf)) {
-      @Override
-      public RMNodeLabelsManager createNodeLabelManager() {
-        return mgr;
-      }
-    };
-
-    rm1.getRMContext().setNodeLabelManager(mgr);
-    rm1.start();
-    MockNM nm1 = rm1.registerNode(""h1:1234"", 8000); // label = x
-    MockNM nm2 = rm1.registerNode(""h2:1234"", 8000); // label = y
-    MockNM nm3 = rm1.registerNode(""h3:1234"", 8000); // label = <empty>
-    
-    ContainerId containerId;
-
-    // launch an app to queue a1 (label = x), and check all container will
-    // be allocated in h1
-    RMApp app1 = rm1.submitApp(200, ""app"", ""user"", null, ""a1"");
-    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm3);
-
-    // request a container.
-    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""x"");
-    containerId =
-        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm2, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm1, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am1.getApplicationAttemptId(), containerId, rm1,
-        ""h1"");
-
-    // launch an app to queue b1 (label = y), and check all container will
-    // be allocated in h2
-    RMApp app2 = rm1.submitApp(200, ""app"", ""user"", null, ""b1"");
-    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm3);
-
-    // request a container.
-    am2.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""y"");
-    containerId = ContainerId.newContainerId(am2.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm1, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm2, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am2.getApplicationAttemptId(), containerId, rm1,
-        ""h2"");
-    
-    // launch an app to queue c1 (label = """"), and check all container will
-    // be allocated in h3
-    RMApp app3 = rm1.submitApp(200, ""app"", ""user"", null, ""c1"");
-    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm3);
-
-    // request a container.
-    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
-    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm2, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm3, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
-        ""h3"");
-
-    rm1.close();
-  }
-  
-  @Test (timeout = 120000)
-  public void testContainerAllocateWithDefaultQueueLabels() throws Exception {
-    // This test is pretty much similar to testContainerAllocateWithLabel.
-    // Difference is, this test doesn't specify label expression in ResourceRequest,
-    // instead, it uses default queue label expression
-
-    // set node -> label
-    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
-    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x""),
-        NodeId.newInstance(""h2"", 0), toSet(""y"")));
-
-    // inject node label manager
-    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithDefaultQueueLabels(conf)) {
-      @Override
-      public RMNodeLabelsManager createNodeLabelManager() {
-        return mgr;
-      }
-    };
-
-    rm1.getRMContext().setNodeLabelManager(mgr);
-    rm1.start();
-    MockNM nm1 = rm1.registerNode(""h1:1234"", 8000); // label = x
-    MockNM nm2 = rm1.registerNode(""h2:1234"", 8000); // label = y
-    MockNM nm3 = rm1.registerNode(""h3:1234"", 8000); // label = <empty>
-    
-    ContainerId containerId;
-
-    // launch an app to queue a1 (label = x), and check all container will
-    // be allocated in h1
-    RMApp app1 = rm1.submitApp(200, ""app"", ""user"", null, ""a1"");
-    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
-
-    // request a container.
-    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
-    containerId =
-        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm3, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm1, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am1.getApplicationAttemptId(), containerId, rm1,
-        ""h1"");
-
-    // launch an app to queue b1 (label = y), and check all container will
-    // be allocated in h2
-    RMApp app2 = rm1.submitApp(200, ""app"", ""user"", null, ""b1"");
-    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm2);
-
-    // request a container.
-    am2.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
-    containerId = ContainerId.newContainerId(am2.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm3, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm2, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am2.getApplicationAttemptId(), containerId, rm1,
-        ""h2"");
-    
-    // launch an app to queue c1 (label = """"), and check all container will
-    // be allocated in h3
-    RMApp app3 = rm1.submitApp(200, ""app"", ""user"", null, ""c1"");
-    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm3);
-
-    // request a container.
-    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
-    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 2);
-    Assert.assertFalse(rm1.waitForState(nm2, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    Assert.assertTrue(rm1.waitForState(nm3, containerId,
-        RMContainerState.ALLOCATED, 10 * 1000));
-    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
-        ""h3"");
-
-    rm1.close();
-  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
index 972cabbf2cc2c..0b5250b4fae87 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
@@ -351,7 +351,7 @@ public void testSingleQueueOneUserMetrics() throws Exception {
     
     // Only 1 container
     a.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(
         (int)(node_0.getTotalResource().getMemory() * a.getCapacity()) - (1*GB),
         a.getMetrics().getAvailableMB());
@@ -487,7 +487,7 @@ public void testSingleQueueWithOneUser() throws Exception {
     
     // Only 1 container
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(1*GB, a.getUsedResources().getMemory());
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -498,7 +498,7 @@ public void testSingleQueueWithOneUser() throws Exception {
     // Also 2nd -> minCapacity = 1024 since (.1 * 8G) < minAlloc, also
     // you can get one container more than user-limit
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -507,7 +507,7 @@ public void testSingleQueueWithOneUser() throws Exception {
     
     // Can't allocate 3rd due to user-limit
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -517,7 +517,7 @@ public void testSingleQueueWithOneUser() throws Exception {
     // Bump up user-limit-factor, now allocate should work
     a.setUserLimitFactor(10);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(3*GB, a.getUsedResources().getMemory());
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -526,7 +526,7 @@ public void testSingleQueueWithOneUser() throws Exception {
 
     // One more should work, for app_1, due to user-limit-factor
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(4*GB, a.getUsedResources().getMemory());
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
@@ -537,7 +537,7 @@ public void testSingleQueueWithOneUser() throws Exception {
     // Now - no more allocs since we are at max-cap
     a.setMaxCapacity(0.5f);
     a.assignContainers(clusterResource, node_0, new ResourceLimits(
-        clusterResource));
+        clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(4*GB, a.getUsedResources().getMemory());
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
@@ -653,21 +653,21 @@ public void testUserLimits() throws Exception {
 
     // 1 container to user_0
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
 
     // Again one to user_0 since he hasn't exceeded user limit yet
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(3*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
 
     // One more to user_0 since he is the only active user
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(4*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(2*GB, app_1.getCurrentConsumption().getMemory());
@@ -719,10 +719,10 @@ public void testComputeUserLimitAndSetHeadroom(){
         1, qb.getActiveUsersManager().getNumActiveUsers());
     //get headroom
     qb.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     qb.computeUserLimitAndSetHeadroom(app_0, clusterResource, app_0
         .getResourceRequest(u0Priority, ResourceRequest.ANY).getCapability(),
-        null);
+        """", SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
 
     //maxqueue 16G, userlimit 13G, - 4G used = 9G
     assertEquals(9*GB,app_0.getHeadroom().getMemory());
@@ -739,10 +739,10 @@ public void testComputeUserLimitAndSetHeadroom(){
             u1Priority, recordFactory)));
     qb.submitApplicationAttempt(app_2, user_1);
     qb.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     qb.computeUserLimitAndSetHeadroom(app_0, clusterResource, app_0
         .getResourceRequest(u0Priority, ResourceRequest.ANY).getCapability(),
-        null);
+        """", SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
 
     assertEquals(8*GB, qb.getUsedResources().getMemory());
     assertEquals(4*GB, app_0.getCurrentConsumption().getMemory());
@@ -782,12 +782,12 @@ public void testComputeUserLimitAndSetHeadroom(){
     qb.submitApplicationAttempt(app_1, user_0);
     qb.submitApplicationAttempt(app_3, user_1);
     qb.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     qb.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     qb.computeUserLimitAndSetHeadroom(app_3, clusterResource, app_3
         .getResourceRequest(u1Priority, ResourceRequest.ANY).getCapability(),
-        null);
+        """", SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(4*GB, qb.getUsedResources().getMemory());
     //maxqueue 16G, userlimit 7G, used (by each user) 2G, headroom 5G (both)
     assertEquals(5*GB, app_3.getHeadroom().getMemory());
@@ -803,13 +803,13 @@ public void testComputeUserLimitAndSetHeadroom(){
               TestUtils.createResourceRequest(ResourceRequest.ANY, 6*GB, 1, true,
                       u0Priority, recordFactory)));
     qb.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     qb.computeUserLimitAndSetHeadroom(app_4, clusterResource, app_4
         .getResourceRequest(u0Priority, ResourceRequest.ANY).getCapability(),
-        null);
+        """", SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     qb.computeUserLimitAndSetHeadroom(app_3, clusterResource, app_3
         .getResourceRequest(u1Priority, ResourceRequest.ANY).getCapability(),
-        null);
+        """", SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     
     
     //app3 is user1, active from last test case
@@ -876,7 +876,7 @@ public void testUserHeadroomMultiApp() throws Exception {
                 priority, recordFactory)));
 
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(1*GB, a.getUsedResources().getMemory());
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -893,7 +893,7 @@ public void testUserHeadroomMultiApp() throws Exception {
             priority, recordFactory)));
 
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
@@ -982,7 +982,7 @@ public void testHeadroomWithMaxCap() throws Exception {
 
     // 1 container to user_0
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -993,7 +993,7 @@ public void testHeadroomWithMaxCap() throws Exception {
 
     // Again one to user_0 since he hasn't exceeded user limit yet
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(3*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
@@ -1010,7 +1010,7 @@ public void testHeadroomWithMaxCap() throws Exception {
     // No more to user_0 since he is already over user-limit
     // and no more containers to queue since it's already at max-cap
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(3*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
@@ -1024,7 +1024,7 @@ public void testHeadroomWithMaxCap() throws Exception {
             priority, recordFactory)));
     assertEquals(1, a.getActiveUsersManager().getNumActiveUsers());
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(0*GB, app_2.getHeadroom().getMemory());   // hit queue max-cap 
   }
 
@@ -1095,7 +1095,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     
     // Only 1 container
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(1*GB, a.getUsedResources().getMemory());
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1103,7 +1103,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     // Also 2nd -> minCapacity = 1024 since (.1 * 8G) < minAlloc, also
     // you can get one container more than user-limit
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1111,7 +1111,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     // Can't allocate 3rd due to user-limit
     a.setUserLimit(25);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1130,7 +1130,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     // user_0 is at limit inspite of high user-limit-factor
     a.setUserLimitFactor(10);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1140,7 +1140,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     // Now allocations should goto app_0 since 
     // user_0 is at user-limit not above it
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(6*GB, a.getUsedResources().getMemory());
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1151,7 +1151,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     // Now - no more allocs since we are at max-cap
     a.setMaxCapacity(0.5f);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(6*GB, a.getUsedResources().getMemory());
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1163,7 +1163,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
     a.setMaxCapacity(1.0f);
     a.setUserLimitFactor(1);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(7*GB, a.getUsedResources().getMemory()); 
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1172,7 +1172,7 @@ public void testSingleQueueWithMultipleUsers() throws Exception {
 
     // Now we should assign to app_3 again since user_2 is under user-limit
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8*GB, a.getUsedResources().getMemory()); 
     assertEquals(3*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1272,7 +1272,7 @@ public void testReservation() throws Exception {
     
     // Only 1 container
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(1*GB, a.getUsedResources().getMemory());
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1283,7 +1283,7 @@ public void testReservation() throws Exception {
     // Also 2nd -> minCapacity = 1024 since (.1 * 8G) < minAlloc, also
     // you can get one container more than user-limit
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1292,7 +1292,7 @@ public void testReservation() throws Exception {
     
     // Now, reservation should kick in for app_1
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(6*GB, a.getUsedResources().getMemory()); 
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1309,7 +1309,7 @@ public void testReservation() throws Exception {
             ContainerExitStatus.KILLED_BY_RESOURCEMANAGER),
         RMContainerEventType.KILL, null, true);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5*GB, a.getUsedResources().getMemory()); 
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1326,7 +1326,7 @@ public void testReservation() throws Exception {
             ContainerExitStatus.KILLED_BY_RESOURCEMANAGER),
         RMContainerEventType.KILL, null, true);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(4*GB, a.getUsedResources().getMemory());
     assertEquals(0*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(4*GB, app_1.getCurrentConsumption().getMemory());
@@ -1394,7 +1394,7 @@ public void testStolenReservedContainer() throws Exception {
     // Start testing...
 
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1404,7 +1404,7 @@ public void testStolenReservedContainer() throws Exception {
 
     // Now, reservation should kick in for app_1
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(6*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1418,7 +1418,7 @@ public void testStolenReservedContainer() throws Exception {
     doReturn(-1).when(a).getNodeLocalityDelay();
     
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(10*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(4*GB, app_1.getCurrentConsumption().getMemory());
@@ -1435,7 +1435,7 @@ public void testStolenReservedContainer() throws Exception {
             ContainerExitStatus.KILLED_BY_RESOURCEMANAGER),
         RMContainerEventType.KILL, null, true);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8*GB, a.getUsedResources().getMemory());
     assertEquals(0*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(8*GB, app_1.getCurrentConsumption().getMemory());
@@ -1504,7 +1504,7 @@ public void testReservationExchange() throws Exception {
     
     // Only 1 container
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(1*GB, a.getUsedResources().getMemory());
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1512,14 +1512,14 @@ public void testReservationExchange() throws Exception {
     // Also 2nd -> minCapacity = 1024 since (.1 * 8G) < minAlloc, also
     // you can get one container more than user-limit
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2*GB, a.getUsedResources().getMemory());
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
     
     // Now, reservation should kick in for app_1
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(6*GB, a.getUsedResources().getMemory()); 
     assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1534,7 +1534,7 @@ public void testReservationExchange() throws Exception {
             ContainerExitStatus.KILLED_BY_RESOURCEMANAGER),
         RMContainerEventType.KILL, null, true);
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5*GB, a.getUsedResources().getMemory()); 
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1544,7 +1544,7 @@ public void testReservationExchange() throws Exception {
 
     // Re-reserve
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5*GB, a.getUsedResources().getMemory()); 
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
@@ -1554,7 +1554,7 @@ public void testReservationExchange() throws Exception {
     
     // Try to schedule on node_1 now, should *move* the reservation
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(9*GB, a.getUsedResources().getMemory()); 
     assertEquals(1*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(4*GB, app_1.getCurrentConsumption().getMemory());
@@ -1572,7 +1572,7 @@ public void testReservationExchange() throws Exception {
             ContainerExitStatus.KILLED_BY_RESOURCEMANAGER),
         RMContainerEventType.KILL, null, true);
     CSAssignment assignment = a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8*GB, a.getUsedResources().getMemory());
     assertEquals(0*GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(4*GB, app_1.getCurrentConsumption().getMemory());
@@ -1644,7 +1644,7 @@ public void testLocalityScheduling() throws Exception {
     
     // Start with off switch, shouldn't allocate due to delay scheduling
     assignment = a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_2), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(1, app_0.getSchedulingOpportunities(priority));
@@ -1653,7 +1653,7 @@ public void testLocalityScheduling() throws Exception {
 
     // Another off switch, shouldn't allocate due to delay scheduling
     assignment = a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_2), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(2, app_0.getSchedulingOpportunities(priority));
@@ -1662,7 +1662,7 @@ public void testLocalityScheduling() throws Exception {
     
     // Another off switch, shouldn't allocate due to delay scheduling
     assignment = a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_2), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(3, app_0.getSchedulingOpportunities(priority));
@@ -1672,7 +1672,7 @@ public void testLocalityScheduling() throws Exception {
     // Another off switch, now we should allocate 
     // since missedOpportunities=3 and reqdContainers=3
     assignment = a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.OFF_SWITCH), eq(node_2), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(4, app_0.getSchedulingOpportunities(priority)); // should NOT reset
@@ -1681,7 +1681,7 @@ public void testLocalityScheduling() throws Exception {
     
     // NODE_LOCAL - node_0
     assignment = a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.NODE_LOCAL), eq(node_0), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should reset
@@ -1690,7 +1690,7 @@ public void testLocalityScheduling() throws Exception {
     
     // NODE_LOCAL - node_1
     assignment = a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.NODE_LOCAL), eq(node_1), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should reset
@@ -1719,14 +1719,14 @@ public void testLocalityScheduling() throws Exception {
     
     // Shouldn't assign RACK_LOCAL yet
     assignment = a.assignContainers(clusterResource, node_3,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(1, app_0.getSchedulingOpportunities(priority));
     assertEquals(2, app_0.getTotalRequiredResources(priority));
     assertEquals(NodeType.NODE_LOCAL, assignment.getType()); // None->NODE_LOCAL
 
     // Should assign RACK_LOCAL now
     assignment = a.assignContainers(clusterResource, node_3,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.RACK_LOCAL), eq(node_3), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should reset
@@ -1808,7 +1808,7 @@ public void testApplicationPriorityScheduling() throws Exception {
     // Start with off switch, shouldn't allocate P1 due to delay scheduling
     // thus, no P2 either!
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_2), 
         eq(priority_1), any(ResourceRequest.class), any(Container.class));
     assertEquals(1, app_0.getSchedulingOpportunities(priority_1));
@@ -1821,7 +1821,7 @@ public void testApplicationPriorityScheduling() throws Exception {
     // Another off-switch, shouldn't allocate P1 due to delay scheduling
     // thus, no P2 either!
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_2), 
         eq(priority_1), any(ResourceRequest.class), any(Container.class));
     assertEquals(2, app_0.getSchedulingOpportunities(priority_1));
@@ -1833,7 +1833,7 @@ public void testApplicationPriorityScheduling() throws Exception {
 
     // Another off-switch, shouldn't allocate OFF_SWITCH P1
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.OFF_SWITCH), eq(node_2), 
         eq(priority_1), any(ResourceRequest.class), any(Container.class));
     assertEquals(3, app_0.getSchedulingOpportunities(priority_1));
@@ -1845,7 +1845,7 @@ public void testApplicationPriorityScheduling() throws Exception {
 
     // Now, DATA_LOCAL for P1
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.NODE_LOCAL), eq(node_0), 
         eq(priority_1), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority_1));
@@ -1857,7 +1857,7 @@ public void testApplicationPriorityScheduling() throws Exception {
 
     // Now, OFF_SWITCH for P2
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_1), 
         eq(priority_1), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority_1));
@@ -1934,7 +1934,7 @@ public void testSchedulingConstraints() throws Exception {
     
     // NODE_LOCAL - node_0_1
     a.assignContainers(clusterResource, node_0_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.NODE_LOCAL), eq(node_0_0), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should reset
@@ -1943,7 +1943,7 @@ public void testSchedulingConstraints() throws Exception {
     // No allocation on node_1_0 even though it's node/rack local since
     // required(ANY) == 0
     a.assignContainers(clusterResource, node_1_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_1_0), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // Still zero
@@ -1960,7 +1960,7 @@ public void testSchedulingConstraints() throws Exception {
     // No allocation on node_0_1 even though it's node/rack local since
     // required(rack_1) == 0
     a.assignContainers(clusterResource, node_0_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_1_0), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(1, app_0.getSchedulingOpportunities(priority)); 
@@ -1968,7 +1968,7 @@ public void testSchedulingConstraints() throws Exception {
     
     // NODE_LOCAL - node_1
     a.assignContainers(clusterResource, node_1_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.NODE_LOCAL), eq(node_1_0), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should reset
@@ -2221,7 +2221,7 @@ public void testLocalityConstraints() throws Exception {
     // node_0_1  
     // Shouldn't allocate since RR(rack_0) = null && RR(ANY) = relax: false
     a.assignContainers(clusterResource, node_0_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_0_1), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should be 0
@@ -2244,7 +2244,7 @@ public void testLocalityConstraints() throws Exception {
     // node_1_1  
     // Shouldn't allocate since RR(rack_1) = relax: false
     a.assignContainers(clusterResource, node_1_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_0_1), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should be 0
@@ -2275,7 +2275,7 @@ public void testLocalityConstraints() throws Exception {
     // node_1_1  
     // Shouldn't allocate since node_1_1 is blacklisted
     a.assignContainers(clusterResource, node_1_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_1_1), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should be 0
@@ -2304,7 +2304,7 @@ public void testLocalityConstraints() throws Exception {
     // node_1_1  
     // Shouldn't allocate since rack_1 is blacklisted
     a.assignContainers(clusterResource, node_1_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0, never()).allocate(any(NodeType.class), eq(node_1_1), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); // should be 0
@@ -2331,7 +2331,7 @@ public void testLocalityConstraints() throws Exception {
 
     // Now, should allocate since RR(rack_1) = relax: true
     a.assignContainers(clusterResource, node_1_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0,never()).allocate(eq(NodeType.RACK_LOCAL), eq(node_1_1), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); 
@@ -2362,7 +2362,7 @@ public void testLocalityConstraints() throws Exception {
     // host_1_1: 7G
 
     a.assignContainers(clusterResource, node_1_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verify(app_0).allocate(eq(NodeType.NODE_LOCAL), eq(node_1_0), 
         any(Priority.class), any(ResourceRequest.class), any(Container.class));
     assertEquals(0, app_0.getSchedulingOpportunities(priority)); 
@@ -2445,7 +2445,7 @@ public void testAllocateContainerOnNodeWithoutOffSwitchSpecified()
 
     try {
       a.assignContainers(clusterResource, node_0, 
-          new ResourceLimits(clusterResource));
+          new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     } catch (NullPointerException e) {
       Assert.fail(""NPE when allocating container on node but ""
           + ""forget to set off-switch request should be handled"");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestNodeLabelContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestNodeLabelContainerAllocation.java
new file mode 100644
index 0000000000000..cf1b26f37e9cf
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestNodeLabelContainerAllocation.java
@@ -0,0 +1,1027 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.api.records.NodeId;
+import org.apache.hadoop.yarn.api.records.NodeLabel;
+import org.apache.hadoop.yarn.api.records.Priority;
+import org.apache.hadoop.yarn.api.records.ResourceRequest;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.server.resourcemanager.MockAM;
+import org.apache.hadoop.yarn.server.resourcemanager.MockNM;
+import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.NullRMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
+import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerState;
+import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppReport;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+public class TestNodeLabelContainerAllocation {
+  private final int GB = 1024;
+
+  private YarnConfiguration conf;
+  
+  RMNodeLabelsManager mgr;
+
+  @Before
+  public void setUp() throws Exception {
+    conf = new YarnConfiguration();
+    conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
+      ResourceScheduler.class);
+    mgr = new NullRMNodeLabelsManager();
+    mgr.init(conf);
+  }
+  
+  private Configuration getConfigurationWithQueueLabels(Configuration config) {
+    CapacitySchedulerConfiguration conf =
+        new CapacitySchedulerConfiguration(config);
+    
+    // Define top-level queues
+    conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] {""a"", ""b"", ""c""});
+    conf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""x"", 100);
+    conf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""y"", 100);
+
+    final String A = CapacitySchedulerConfiguration.ROOT + "".a"";
+    conf.setCapacity(A, 10);
+    conf.setMaximumCapacity(A, 15);
+    conf.setAccessibleNodeLabels(A, toSet(""x""));
+    conf.setCapacityByLabel(A, ""x"", 100);
+    
+    final String B = CapacitySchedulerConfiguration.ROOT + "".b"";
+    conf.setCapacity(B, 20);
+    conf.setAccessibleNodeLabels(B, toSet(""y""));
+    conf.setCapacityByLabel(B, ""y"", 100);
+    
+    final String C = CapacitySchedulerConfiguration.ROOT + "".c"";
+    conf.setCapacity(C, 70);
+    conf.setMaximumCapacity(C, 70);
+    conf.setAccessibleNodeLabels(C, RMNodeLabelsManager.EMPTY_STRING_SET);
+    
+    // Define 2nd-level queues
+    final String A1 = A + "".a1"";
+    conf.setQueues(A, new String[] {""a1""});
+    conf.setCapacity(A1, 100);
+    conf.setMaximumCapacity(A1, 100);
+    conf.setCapacityByLabel(A1, ""x"", 100);
+    
+    final String B1 = B + "".b1"";
+    conf.setQueues(B, new String[] {""b1""});
+    conf.setCapacity(B1, 100);
+    conf.setMaximumCapacity(B1, 100);
+    conf.setCapacityByLabel(B1, ""y"", 100);
+
+    final String C1 = C + "".c1"";
+    conf.setQueues(C, new String[] {""c1""});
+    conf.setCapacity(C1, 100);
+    conf.setMaximumCapacity(C1, 100);
+    
+    return conf;
+  }
+  
+  private void checkTaskContainersHost(ApplicationAttemptId attemptId,
+      ContainerId containerId, ResourceManager rm, String host) {
+    YarnScheduler scheduler = rm.getRMContext().getScheduler();
+    SchedulerAppReport appReport = scheduler.getSchedulerAppInfo(attemptId);
+
+    Assert.assertTrue(appReport.getLiveContainers().size() > 0);
+    for (RMContainer c : appReport.getLiveContainers()) {
+      if (c.getContainerId().equals(containerId)) {
+        Assert.assertEquals(host, c.getAllocatedNode().getHost());
+      }
+    }
+  }
+  
+  @SuppressWarnings(""unchecked"")
+  private <E> Set<E> toSet(E... elements) {
+    Set<E> set = Sets.newHashSet(elements);
+    return set;
+  }
+  
+  
+  @Test (timeout = 300000)
+  public void testContainerAllocationWithSingleUserLimits() throws Exception {
+    final RMNodeLabelsManager mgr = new NullRMNodeLabelsManager();
+    mgr.init(conf);
+
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x""),
+        NodeId.newInstance(""h2"", 0), toSet(""y"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithDefaultQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8000); // label = x
+    rm1.registerNode(""h2:1234"", 8000); // label = y
+    MockNM nm3 = rm1.registerNode(""h3:1234"", 8000); // label = <empty>
+
+    // launch an app to queue a1 (label = x), and check all container will
+    // be allocated in h1
+    RMApp app1 = rm1.submitApp(200, ""app"", ""user"", null, ""a1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
+    
+    // A has only 10% of x, so it can only allocate one container in label=empty
+    ContainerId containerId =
+        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
+    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), """");
+    Assert.assertTrue(rm1.waitForState(nm3, containerId,
+          RMContainerState.ALLOCATED, 10 * 1000));
+    // Cannot allocate 2nd label=empty container
+    containerId =
+        ContainerId.newContainerId(am1.getApplicationAttemptId(), 3);
+    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), """");
+    Assert.assertFalse(rm1.waitForState(nm3, containerId,
+          RMContainerState.ALLOCATED, 10 * 1000));
+
+    // A has default user limit = 100, so it can use all resource in label = x
+    // We can allocate floor(8000 / 1024) = 7 containers
+    for (int id = 3; id <= 8; id++) {
+      containerId =
+          ContainerId.newContainerId(am1.getApplicationAttemptId(), id);
+      am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""x"");
+      Assert.assertTrue(rm1.waitForState(nm1, containerId,
+          RMContainerState.ALLOCATED, 10 * 1000));
+    }
+    rm1.close();
+  }
+  
+  @Test(timeout = 300000)
+  public void testContainerAllocateWithComplexLabels() throws Exception {
+    /*
+     * Queue structure:
+     *                      root (*)
+     *                  ________________
+     *                 /                \
+     *               a x(100%), y(50%)   b y(50%), z(100%)
+     *               ________________    ______________
+     *              /                   /              \
+     *             a1 (x,y)         b1(no)              b2(y,z)
+     *               100%                          y = 100%, z = 100%
+     *                           
+     * Node structure:
+     * h1 : x
+     * h2 : y
+     * h3 : y
+     * h4 : z
+     * h5 : NO
+     * 
+     * Total resource:
+     * x: 4G
+     * y: 6G
+     * z: 2G
+     * *: 2G
+     * 
+     * Resource of
+     * a1: x=4G, y=3G, NO=0.2G
+     * b1: NO=0.9G (max=1G)
+     * b2: y=3, z=2G, NO=0.9G (max=1G)
+     * 
+     * Each node can only allocate two containers
+     */
+
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y"", ""z""));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0),
+        toSet(""x""), NodeId.newInstance(""h2"", 0), toSet(""y""),
+        NodeId.newInstance(""h3"", 0), toSet(""y""), NodeId.newInstance(""h4"", 0),
+        toSet(""z""), NodeId.newInstance(""h5"", 0),
+        RMNodeLabelsManager.EMPTY_STRING_SET));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getComplexConfigurationWithQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 2048);
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 2048);
+    MockNM nm3 = rm1.registerNode(""h3:1234"", 2048);
+    MockNM nm4 = rm1.registerNode(""h4:1234"", 2048);
+    MockNM nm5 = rm1.registerNode(""h5:1234"", 2048);
+    
+    ContainerId containerId;
+
+    // launch an app to queue a1 (label = x), and check all container will
+    // be allocated in h1
+    RMApp app1 = rm1.submitApp(1024, ""app"", ""user"", null, ""a1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
+
+    // request a container (label = y). can be allocated on nm2 
+    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""y"");
+    containerId =
+        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2L);
+    Assert.assertTrue(rm1.waitForState(nm2, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am1.getApplicationAttemptId(), containerId, rm1,
+        ""h2"");
+
+    // launch an app to queue b1 (label = y), and check all container will
+    // be allocated in h5
+    RMApp app2 = rm1.submitApp(1024, ""app"", ""user"", null, ""b1"");
+    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm5);
+
+    // request a container for AM, will succeed
+    // and now b1's queue capacity will be used, cannot allocate more containers
+    // (Maximum capacity reached)
+    am2.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
+    containerId = ContainerId.newContainerId(am2.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm4, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertFalse(rm1.waitForState(nm5, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    
+    // launch an app to queue b2
+    RMApp app3 = rm1.submitApp(1024, ""app"", ""user"", null, ""b2"");
+    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm5);
+
+    // request a container. try to allocate on nm1 (label = x) and nm3 (label =
+    // y,z). Will successfully allocate on nm3
+    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""y"");
+    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm1, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm3, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
+        ""h3"");
+    
+    // try to allocate container (request label = z) on nm4 (label = y,z). 
+    // Will successfully allocate on nm4 only.
+    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""z"");
+    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 3L);
+    Assert.assertTrue(rm1.waitForState(nm4, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
+        ""h4"");
+
+    rm1.close();
+  }
+
+  @Test (timeout = 120000)
+  public void testContainerAllocateWithLabels() throws Exception {
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x""),
+        NodeId.newInstance(""h2"", 0), toSet(""y"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(getConfigurationWithQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8000); // label = x
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 8000); // label = y
+    MockNM nm3 = rm1.registerNode(""h3:1234"", 8000); // label = <empty>
+    
+    ContainerId containerId;
+
+    // launch an app to queue a1 (label = x), and check all container will
+    // be allocated in h1
+    RMApp app1 = rm1.submitApp(200, ""app"", ""user"", null, ""a1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm3);
+
+    // request a container.
+    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""x"");
+    containerId =
+        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm2, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm1, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am1.getApplicationAttemptId(), containerId, rm1,
+        ""h1"");
+
+    // launch an app to queue b1 (label = y), and check all container will
+    // be allocated in h2
+    RMApp app2 = rm1.submitApp(200, ""app"", ""user"", null, ""b1"");
+    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm3);
+
+    // request a container.
+    am2.allocate(""*"", 1024, 1, new ArrayList<ContainerId>(), ""y"");
+    containerId = ContainerId.newContainerId(am2.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm1, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm2, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am2.getApplicationAttemptId(), containerId, rm1,
+        ""h2"");
+    
+    // launch an app to queue c1 (label = """"), and check all container will
+    // be allocated in h3
+    RMApp app3 = rm1.submitApp(200, ""app"", ""user"", null, ""c1"");
+    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm3);
+
+    // request a container.
+    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
+    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm2, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm3, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
+        ""h3"");
+
+    rm1.close();
+  }
+  
+  @Test (timeout = 120000)
+  public void testContainerAllocateWithDefaultQueueLabels() throws Exception {
+    // This test is pretty much similar to testContainerAllocateWithLabel.
+    // Difference is, this test doesn't specify label expression in ResourceRequest,
+    // instead, it uses default queue label expression
+
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x""),
+        NodeId.newInstance(""h2"", 0), toSet(""y"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithDefaultQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8000); // label = x
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 8000); // label = y
+    MockNM nm3 = rm1.registerNode(""h3:1234"", 8000); // label = <empty>
+    
+    ContainerId containerId;
+
+    // launch an app to queue a1 (label = x), and check all container will
+    // be allocated in h1
+    RMApp app1 = rm1.submitApp(200, ""app"", ""user"", null, ""a1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
+
+    // request a container.
+    am1.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
+    containerId =
+        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm3, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm1, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am1.getApplicationAttemptId(), containerId, rm1,
+        ""h1"");
+
+    // launch an app to queue b1 (label = y), and check all container will
+    // be allocated in h2
+    RMApp app2 = rm1.submitApp(200, ""app"", ""user"", null, ""b1"");
+    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm2);
+
+    // request a container.
+    am2.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
+    containerId = ContainerId.newContainerId(am2.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm3, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm2, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am2.getApplicationAttemptId(), containerId, rm1,
+        ""h2"");
+    
+    // launch an app to queue c1 (label = """"), and check all container will
+    // be allocated in h3
+    RMApp app3 = rm1.submitApp(200, ""app"", ""user"", null, ""c1"");
+    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm3);
+
+    // request a container.
+    am3.allocate(""*"", 1024, 1, new ArrayList<ContainerId>());
+    containerId = ContainerId.newContainerId(am3.getApplicationAttemptId(), 2);
+    Assert.assertFalse(rm1.waitForState(nm2, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    Assert.assertTrue(rm1.waitForState(nm3, containerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    checkTaskContainersHost(am3.getApplicationAttemptId(), containerId, rm1,
+        ""h3"");
+
+    rm1.close();
+  }
+  
+  private void checkPendingResource(MockRM rm, int priority,
+      ApplicationAttemptId attemptId, int memory) {
+    CapacityScheduler cs = (CapacityScheduler) rm.getRMContext().getScheduler();
+    FiCaSchedulerApp app = cs.getApplicationAttempt(attemptId);
+    ResourceRequest rr =
+        app.getAppSchedulingInfo().getResourceRequest(
+            Priority.newInstance(priority), ""*"");
+    Assert.assertEquals(memory,
+        rr.getCapability().getMemory() * rr.getNumContainers());
+  }
+  
+  private void checkLaunchedContainerNumOnNode(MockRM rm, NodeId nodeId,
+      int numContainers) {
+    CapacityScheduler cs = (CapacityScheduler) rm.getRMContext().getScheduler();
+    SchedulerNode node = cs.getSchedulerNode(nodeId);
+    Assert.assertEquals(numContainers, node.getNumContainers());
+  }
+  
+  @Test
+  public void testPreferenceOfNeedyAppsTowardsNodePartitions() throws Exception {
+    /**
+     * Test case: Submit two application to a queue (app1 first then app2), app1
+     * asked for no-label, app2 asked for label=x, when node1 has label=x
+     * doing heart beat, app2 will get allocation first, even if app2 submits later
+     * than app1
+     */
+    
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    // Makes y to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""y"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""y"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8 * GB); // label = y
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 100 * GB); // label = <empty>
+
+    // launch an app to queue b1 (label = y), AM container should be launched in nm2
+    RMApp app1 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm2);
+    
+    // launch another app to queue b1 (label = y), AM container should be launched in nm2
+    RMApp app2 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b1"");
+    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm2);
+
+    // request container and nm1 do heartbeat (nm2 has label=y), note that app1
+    // request non-labeled container, and app2 request labeled container, app2
+    // will get allocated first even if app1 submitted first.  
+    am1.allocate(""*"", 1 * GB, 8, new ArrayList<ContainerId>());
+    am2.allocate(""*"", 1 * GB, 8, new ArrayList<ContainerId>(), ""y"");
+    
+    CapacityScheduler cs = (CapacityScheduler) rm1.getResourceScheduler();
+    RMNode rmNode1 = rm1.getRMContext().getRMNodes().get(nm1.getNodeId());
+    RMNode rmNode2 = rm1.getRMContext().getRMNodes().get(nm2.getNodeId());
+    
+    // Do node heartbeats many times
+    for (int i = 0; i < 50; i++) {
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode1));
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode2));
+    }
+    
+    // App2 will get preference to be allocated on node1, and node1 will be all
+    // used by App2.
+    FiCaSchedulerApp schedulerApp1 = cs.getApplicationAttempt(am1.getApplicationAttemptId());
+    FiCaSchedulerApp schedulerApp2 = cs.getApplicationAttempt(am2.getApplicationAttemptId());
+    // app1 get nothing in nm1 (partition=y)
+    checkNumOfContainersInAnAppOnGivenNode(0, nm1.getNodeId(), schedulerApp1);
+    checkNumOfContainersInAnAppOnGivenNode(9, nm2.getNodeId(), schedulerApp1);
+    // app2 get all resource in nm1 (partition=y)
+    checkNumOfContainersInAnAppOnGivenNode(8, nm1.getNodeId(), schedulerApp2);
+    checkNumOfContainersInAnAppOnGivenNode(1, nm2.getNodeId(), schedulerApp2);
+    
+    rm1.close();
+  }
+  
+  private void checkNumOfContainersInAnAppOnGivenNode(int expectedNum,
+      NodeId nodeId, FiCaSchedulerApp app) {
+    int num = 0;
+    for (RMContainer container : app.getLiveContainers()) {
+      if (container.getAllocatedNode().equals(nodeId)) {
+        num++;
+      }
+    }
+    Assert.assertEquals(expectedNum, num);
+  }
+  
+  @Test
+  public void
+      testPreferenceOfNeedyPrioritiesUnderSameAppTowardsNodePartitions()
+          throws Exception {
+    /**
+     * Test case: Submit one application, it asks label="""" in priority=1 and
+     * label=""x"" in priority=2, when a node with label=x heartbeat, priority=2
+     * will get allocation first even if there're pending resource in priority=1
+     */
+    
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    // Makes y to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""y"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""y"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8 * GB); // label = y
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 100 * GB); // label = <empty>
+    
+    ContainerId nextContainerId;
+
+    // launch an app to queue b1 (label = y), AM container should be launched in nm3
+    RMApp app1 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm2);
+    
+    // request containers from am2, priority=1 asks for """" and priority=2 asks
+    // for ""y"", ""y"" container should be allocated first
+    nextContainerId =
+        ContainerId.newContainerId(am1.getApplicationAttemptId(), 2);
+    am1.allocate(""*"", 1 * GB, 1, 1, new ArrayList<ContainerId>(), """");
+    am1.allocate(""*"", 1 * GB, 1, 2, new ArrayList<ContainerId>(), ""y"");
+    Assert.assertTrue(rm1.waitForState(nm1, nextContainerId,
+        RMContainerState.ALLOCATED, 10 * 1000));
+    
+    // Check pending resource for am2, priority=1 doesn't get allocated before
+    // priority=2 allocated
+    checkPendingResource(rm1, 1, am1.getApplicationAttemptId(), 1 * GB);
+    checkPendingResource(rm1, 2, am1.getApplicationAttemptId(), 0 * GB);
+    
+    rm1.close();
+  }
+  
+  @Test
+  public void testNonLabeledResourceRequestGetPreferrenceToNonLabeledNode()
+      throws Exception {
+    /**
+     * Test case: Submit one application, it asks 6 label="""" containers, NM1
+     * with label=y and NM2 has no label, NM1/NM2 doing heartbeat together. Even
+     * if NM1 has idle resource, containers are all allocated to NM2 since
+     * non-labeled request should get allocation on non-labeled nodes first.
+     */
+    
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    // Makes x to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""x"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8 * GB); // label = y
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 100 * GB); // label = <empty>
+    
+    ContainerId nextContainerId;
+
+    // launch an app to queue b1 (label = y), AM container should be launched in nm3
+    RMApp app1 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm2);
+    
+    // request containers from am2, priority=1 asks for """" * 6 (id from 4 to 9),
+    // nm2/nm3 do
+    // heartbeat at the same time, check containers are always allocated to nm3.
+    // This is to verify when there's resource available in non-labeled
+    // partition, non-labeled resource should allocate to non-labeled partition
+    // first.
+    am1.allocate(""*"", 1 * GB, 6, 1, new ArrayList<ContainerId>(), """");
+    for (int i = 2; i < 2 + 6; i++) {
+      nextContainerId =
+          ContainerId.newContainerId(am1.getApplicationAttemptId(), i);
+      Assert.assertTrue(rm1.waitForState(Arrays.asList(nm1, nm2),
+          nextContainerId, RMContainerState.ALLOCATED, 10 * 1000));
+    }
+    // no more container allocated on nm1
+    checkLaunchedContainerNumOnNode(rm1, nm1.getNodeId(), 0);
+    // all 7 (1 AM container + 6 task container) containers allocated on nm2
+    checkLaunchedContainerNumOnNode(rm1, nm2.getNodeId(), 7);   
+    
+    rm1.close();
+  }
+
+  @Test
+  public void testPreferenceOfQueuesTowardsNodePartitions()
+      throws Exception {
+    /**
+     * Test case: have a following queue structure:
+     * 
+     * <pre>
+     *            root
+     *         /   |   \
+     *        a     b    c
+     *       / \   / \  /  \
+     *      a1 a2 b1 b2 c1 c2
+     *     (x)    (x)   (x)
+     * </pre>
+     * 
+     * Only a1, b1, c1 can access label=x, and their default label=x Each each
+     * has one application, asks for 5 containers. NM1 has label=x
+     * 
+     * NM1/NM2 doing heartbeat for 15 times, it should allocate all 15
+     * containers with label=x
+     */
+    
+    CapacitySchedulerConfiguration csConf =
+        new CapacitySchedulerConfiguration(this.conf);
+    
+    // Define top-level queues
+    csConf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] {""a"", ""b"", ""c""});
+    csConf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""x"", 100);
+
+    final String A = CapacitySchedulerConfiguration.ROOT + "".a"";
+    csConf.setCapacity(A, 33);
+    csConf.setAccessibleNodeLabels(A, toSet(""x""));
+    csConf.setCapacityByLabel(A, ""x"", 33);
+    csConf.setQueues(A, new String[] {""a1"", ""a2""});
+    
+    final String B = CapacitySchedulerConfiguration.ROOT + "".b"";
+    csConf.setCapacity(B, 33);
+    csConf.setAccessibleNodeLabels(B, toSet(""x""));
+    csConf.setCapacityByLabel(B, ""x"", 33);
+    csConf.setQueues(B, new String[] {""b1"", ""b2""});
+    
+    final String C = CapacitySchedulerConfiguration.ROOT + "".c"";
+    csConf.setCapacity(C, 34);
+    csConf.setAccessibleNodeLabels(C, toSet(""x""));
+    csConf.setCapacityByLabel(C, ""x"", 34);
+    csConf.setQueues(C, new String[] {""c1"", ""c2""});
+    
+    // Define 2nd-level queues
+    final String A1 = A + "".a1"";
+    csConf.setCapacity(A1, 50);
+    csConf.setCapacityByLabel(A1, ""x"", 100);
+    csConf.setDefaultNodeLabelExpression(A1, ""x"");
+    
+    final String A2 = A + "".a2"";
+    csConf.setCapacity(A2, 50);
+    csConf.setCapacityByLabel(A2, ""x"", 0);
+    
+    final String B1 = B + "".b1"";
+    csConf.setCapacity(B1, 50);
+    csConf.setCapacityByLabel(B1, ""x"", 100);
+    csConf.setDefaultNodeLabelExpression(B1, ""x"");
+    
+    final String B2 = B + "".b2"";
+    csConf.setCapacity(B2, 50);
+    csConf.setCapacityByLabel(B2, ""x"", 0);
+    
+    final String C1 = C + "".c1"";
+    csConf.setCapacity(C1, 50);
+    csConf.setCapacityByLabel(C1, ""x"", 100);
+    csConf.setDefaultNodeLabelExpression(C1, ""x"");
+    
+    final String C2 = C + "".c2"";
+    csConf.setCapacity(C2, 50);
+    csConf.setCapacityByLabel(C2, ""x"", 0);
+    
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    // Makes x to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""x"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(csConf) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 20 * GB); // label = x
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 100 * GB); // label = <empty>
+
+    // app1 -> a1
+    RMApp app1 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""a1"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm1);
+    
+    // app2 -> a2
+    RMApp app2 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""a2"");
+    MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm2);
+    
+    // app3 -> b1
+    RMApp app3 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b1"");
+    MockAM am3 = MockRM.launchAndRegisterAM(app3, rm1, nm1);
+    
+    // app4 -> b2
+    RMApp app4 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b2"");
+    MockAM am4 = MockRM.launchAndRegisterAM(app4, rm1, nm2);
+    
+    // app5 -> c1
+    RMApp app5 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""c1"");
+    MockAM am5 = MockRM.launchAndRegisterAM(app5, rm1, nm1);
+    
+    // app6 -> b2
+    RMApp app6 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""c2"");
+    MockAM am6 = MockRM.launchAndRegisterAM(app6, rm1, nm2);
+    
+    // Each application request 5 * 1GB container
+    am1.allocate(""*"", 1 * GB, 5, new ArrayList<ContainerId>());
+    am2.allocate(""*"", 1 * GB, 5, new ArrayList<ContainerId>());
+    am3.allocate(""*"", 1 * GB, 5, new ArrayList<ContainerId>());
+    am4.allocate(""*"", 1 * GB, 5, new ArrayList<ContainerId>());
+    am5.allocate(""*"", 1 * GB, 5, new ArrayList<ContainerId>());
+    am6.allocate(""*"", 1 * GB, 5, new ArrayList<ContainerId>());
+    
+    // NM1 do 15 heartbeats
+    CapacityScheduler cs = (CapacityScheduler) rm1.getResourceScheduler();
+    RMNode rmNode1 = rm1.getRMContext().getRMNodes().get(nm1.getNodeId());
+    for (int i = 0; i < 15; i++) {
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode1));
+    }
+    
+    // NM1 get 15 new containers (total is 18, 15 task containers and 3 AM
+    // containers)
+    checkLaunchedContainerNumOnNode(rm1, nm1.getNodeId(), 18);
+
+    // Check pending resource each application
+    // APP1/APP3/APP5 get satisfied, and APP2/APP2/APP3 get nothing.
+    checkPendingResource(rm1, 1, am1.getApplicationAttemptId(), 0 * GB);
+    checkPendingResource(rm1, 1, am2.getApplicationAttemptId(), 5 * GB);
+    checkPendingResource(rm1, 1, am3.getApplicationAttemptId(), 0 * GB);
+    checkPendingResource(rm1, 1, am4.getApplicationAttemptId(), 5 * GB);
+    checkPendingResource(rm1, 1, am5.getApplicationAttemptId(), 0 * GB);
+    checkPendingResource(rm1, 1, am6.getApplicationAttemptId(), 5 * GB);
+
+    rm1.close();
+  }
+  
+  @Test
+  public void testQueuesWithoutAccessUsingPartitionedNodes() throws Exception {
+    /**
+     * Test case: have a following queue structure:
+     * 
+     * <pre>
+     *            root
+     *         /      \
+     *        a        b
+     *        (x)
+     * </pre>
+     * 
+     * Only a can access label=x, two nodes in the cluster, n1 has x and n2 has
+     * no-label.
+     * 
+     * When user-limit-factor=5, submit one application in queue b and request
+     * for infinite containers should be able to use up all cluster resources.
+     */
+    
+    CapacitySchedulerConfiguration csConf =
+        new CapacitySchedulerConfiguration(this.conf);
+    
+    // Define top-level queues
+    csConf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] {""a"", ""b""});
+    csConf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""x"", 100);
+
+    final String A = CapacitySchedulerConfiguration.ROOT + "".a"";
+    csConf.setCapacity(A, 50);
+    csConf.setAccessibleNodeLabels(A, toSet(""x""));
+    csConf.setCapacityByLabel(A, ""x"", 100);
+    
+    final String B = CapacitySchedulerConfiguration.ROOT + "".b"";
+    csConf.setCapacity(B, 50);
+    csConf.setAccessibleNodeLabels(B, new HashSet<String>());
+    csConf.setUserLimitFactor(B, 5);
+    
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x""));
+    // Makes x to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""x"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(csConf) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 10 * GB); // label = x
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 10 * GB); // label = <empty>
+
+    // app1 -> b
+    RMApp app1 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm2);
+    
+    // Each application request 5 * 1GB container
+    am1.allocate(""*"", 1 * GB, 50, new ArrayList<ContainerId>());
+    
+    // NM1 do 50 heartbeats
+    CapacityScheduler cs = (CapacityScheduler) rm1.getResourceScheduler();
+    RMNode rmNode1 = rm1.getRMContext().getRMNodes().get(nm1.getNodeId());
+    RMNode rmNode2 = rm1.getRMContext().getRMNodes().get(nm2.getNodeId());
+    
+    SchedulerNode schedulerNode1 = cs.getSchedulerNode(nm1.getNodeId());
+    
+    // How much cycles we waited to be allocated when available resource only on
+    // partitioned node
+    int cycleWaited = 0;
+    for (int i = 0; i < 50; i++) {
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode1));
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode2));
+      if (schedulerNode1.getNumContainers() == 0) {
+        cycleWaited++;
+      }
+    }
+    // We will will 10 cycles before get allocated on partitioned node
+    // NM2 can allocate 10 containers totally, exclude already allocated AM
+    // container, we will wait 9 to fulfill non-partitioned node, and need wait
+    // one more cycle before allocating to non-partitioned node 
+    Assert.assertEquals(10, cycleWaited);
+    
+    // Both NM1/NM2 launched 10 containers, cluster resource is exhausted
+    checkLaunchedContainerNumOnNode(rm1, nm1.getNodeId(), 10);
+    checkLaunchedContainerNumOnNode(rm1, nm2.getNodeId(), 10);
+
+    rm1.close();
+  }
+  
+  @Test
+  public void testAMContainerAllocationWillAlwaysBeExclusive()
+      throws Exception {
+    /**
+     * Test case: Submit one application without partition, trying to allocate a
+     * node has partition=x, it should fail to allocate since AM container will
+     * always respect exclusivity for partitions
+     */
+    
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x"", ""y""));
+    // Makes x to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""x"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(TestUtils.getConfigurationWithQueueLabels(conf)) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 8 * GB); // label = x
+
+    // launch an app to queue b1 (label = y), AM container should be launched in nm3
+    rm1.submitApp(1 * GB, ""app"", ""user"", null, ""b1"");
+   
+    CapacityScheduler cs = (CapacityScheduler) rm1.getResourceScheduler();
+    RMNode rmNode1 = rm1.getRMContext().getRMNodes().get(nm1.getNodeId());
+    
+    // Heartbeat for many times, app1 should get nothing
+    for (int i = 0; i < 50; i++) {
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode1));
+    }
+    
+    Assert.assertEquals(0, cs.getSchedulerNode(nm1.getNodeId())
+        .getNumContainers());
+    
+    rm1.close();
+  }
+  
+  @Test
+  public void
+      testQueueMaxCapacitiesWillNotBeHonoredWhenNotRespectingExclusivity()
+          throws Exception {
+    /**
+     * Test case: have a following queue structure:
+     * 
+     * <pre>
+     *            root
+     *         /      \
+     *        a        b
+     *        (x)     (x)
+     * </pre>
+     * 
+     * a/b can access x, both of them has max-capacity-on-x = 50
+     * 
+     * When doing non-exclusive allocation, app in a (or b) can use 100% of x
+     * resource.
+     */
+
+    CapacitySchedulerConfiguration csConf =
+        new CapacitySchedulerConfiguration(this.conf);
+
+    // Define top-level queues
+    csConf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { ""a"",
+        ""b"" });
+    csConf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, ""x"", 100);
+
+    final String A = CapacitySchedulerConfiguration.ROOT + "".a"";
+    csConf.setCapacity(A, 50);
+    csConf.setAccessibleNodeLabels(A, toSet(""x""));
+    csConf.setCapacityByLabel(A, ""x"", 50);
+    csConf.setMaximumCapacityByLabel(A, ""x"", 50);
+
+    final String B = CapacitySchedulerConfiguration.ROOT + "".b"";
+    csConf.setCapacity(B, 50);
+    csConf.setAccessibleNodeLabels(B, toSet(""x""));
+    csConf.setCapacityByLabel(B, ""x"", 50);
+    csConf.setMaximumCapacityByLabel(B, ""x"", 50);
+
+    // set node -> label
+    mgr.addToCluserNodeLabels(ImmutableSet.of(""x""));
+    // Makes x to be non-exclusive node labels
+    mgr.updateNodeLabels(Arrays.asList(NodeLabel.newInstance(""x"", false)));
+    mgr.addLabelsToNode(ImmutableMap.of(NodeId.newInstance(""h1"", 0), toSet(""x"")));
+
+    // inject node label manager
+    MockRM rm1 = new MockRM(csConf) {
+      @Override
+      public RMNodeLabelsManager createNodeLabelManager() {
+        return mgr;
+      }
+    };
+
+    rm1.getRMContext().setNodeLabelManager(mgr);
+    rm1.start();
+    MockNM nm1 = rm1.registerNode(""h1:1234"", 10 * GB); // label = x
+    MockNM nm2 = rm1.registerNode(""h2:1234"", 10 * GB); // label = <empty>
+
+    // app1 -> a
+    RMApp app1 = rm1.submitApp(1 * GB, ""app"", ""user"", null, ""a"");
+    MockAM am1 = MockRM.launchAndRegisterAM(app1, rm1, nm2);
+
+    // app1 asks for 10 partition= containers
+    am1.allocate(""*"", 1 * GB, 10, new ArrayList<ContainerId>());
+
+    // NM1 do 50 heartbeats
+    CapacityScheduler cs = (CapacityScheduler) rm1.getResourceScheduler();
+    RMNode rmNode1 = rm1.getRMContext().getRMNodes().get(nm1.getNodeId());
+
+    SchedulerNode schedulerNode1 = cs.getSchedulerNode(nm1.getNodeId());
+
+    for (int i = 0; i < 50; i++) {
+      cs.handle(new NodeUpdateSchedulerEvent(rmNode1));
+    }
+    
+    // app1 gets all resource in partition=x
+    Assert.assertEquals(10, schedulerNode1.getNumContainers());
+
+    rm1.close();
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java
index 7da1c97fec0ef..52d0bc1241bed 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java
@@ -23,7 +23,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
@@ -45,6 +44,7 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.security.YarnAuthorizationProvider;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceLimits;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
@@ -146,7 +146,7 @@ public CSAssignment answer(InvocationOnMock invocation) throws Throwable {
         final Resource allocatedResource = Resources.createResource(allocation);
         if (queue instanceof ParentQueue) {
           ((ParentQueue)queue).allocateResource(clusterResource, 
-              allocatedResource, null);
+              allocatedResource, RMNodeLabelsManager.NO_LABEL);
         } else {
           FiCaSchedulerApp app1 = getMockApplication(0, """");
           ((LeafQueue)queue).allocateResource(clusterResource, app1, 
@@ -157,7 +157,7 @@ public CSAssignment answer(InvocationOnMock invocation) throws Throwable {
         if (allocation > 0) {
           doReturn(new CSAssignment(Resources.none(), type)).when(queue)
               .assignContainers(eq(clusterResource), eq(node),
-                  any(ResourceLimits.class));
+                  any(ResourceLimits.class), any(SchedulingMode.class));
 
           // Mock the node's resource availability
           Resource available = node.getAvailableResource();
@@ -168,7 +168,7 @@ public CSAssignment answer(InvocationOnMock invocation) throws Throwable {
         return new CSAssignment(allocatedResource, type);
       }
     }).when(queue).assignContainers(eq(clusterResource), eq(node),
-        any(ResourceLimits.class));
+        any(ResourceLimits.class), any(SchedulingMode.class));
   }
   
   private float computeQueueAbsoluteUsedCapacity(CSQueue queue, 
@@ -228,11 +228,16 @@ public void testSingleLevelQueues() throws Exception {
     LeafQueue a = (LeafQueue)queues.get(A);
     LeafQueue b = (LeafQueue)queues.get(B);
     
+    a.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    b.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    queues.get(CapacitySchedulerConfiguration.ROOT).getQueueResourceUsage()
+    .incPending(Resources.createResource(1 * GB));
+    
     // Simulate B returning a container on node_0
     stubQueueAllocation(a, clusterResource, node_0, 0*GB);
     stubQueueAllocation(b, clusterResource, node_0, 1*GB);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(a, 0*GB, clusterResource);
     verifyQueueMetrics(b, 1*GB, clusterResource);
     
@@ -240,12 +245,12 @@ public void testSingleLevelQueues() throws Exception {
     stubQueueAllocation(a, clusterResource, node_1, 2*GB);
     stubQueueAllocation(b, clusterResource, node_1, 1*GB);
     root.assignContainers(clusterResource, node_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     InOrder allocationOrder = inOrder(a, b);
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 2*GB, clusterResource);
     verifyQueueMetrics(b, 2*GB, clusterResource);
 
@@ -254,12 +259,12 @@ public void testSingleLevelQueues() throws Exception {
     stubQueueAllocation(a, clusterResource, node_0, 1*GB);
     stubQueueAllocation(b, clusterResource, node_0, 2*GB);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     allocationOrder = inOrder(b, a);
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 3*GB, clusterResource);
     verifyQueueMetrics(b, 4*GB, clusterResource);
 
@@ -268,12 +273,12 @@ public void testSingleLevelQueues() throws Exception {
     stubQueueAllocation(a, clusterResource, node_0, 0*GB);
     stubQueueAllocation(b, clusterResource, node_0, 4*GB);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     allocationOrder = inOrder(b, a);
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 3*GB, clusterResource);
     verifyQueueMetrics(b, 8*GB, clusterResource);
 
@@ -282,12 +287,12 @@ public void testSingleLevelQueues() throws Exception {
     stubQueueAllocation(a, clusterResource, node_1, 1*GB);
     stubQueueAllocation(b, clusterResource, node_1, 1*GB);
     root.assignContainers(clusterResource, node_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     allocationOrder = inOrder(a, b);
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 4*GB, clusterResource);
     verifyQueueMetrics(b, 9*GB, clusterResource);
   }
@@ -448,16 +453,27 @@ public void testMultiLevelQueues() throws Exception {
 
     // Start testing
     CSQueue a = queues.get(A);
+    a.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     CSQueue b = queues.get(B);
+    b.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     CSQueue c = queues.get(C);
+    c.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     CSQueue d = queues.get(D);
+    d.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
 
     CSQueue a1 = queues.get(A1);
+    a1.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     CSQueue a2 = queues.get(A2);
+    a2.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
 
     CSQueue b1 = queues.get(B1);
+    b1.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     CSQueue b2 = queues.get(B2);
+    b2.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     CSQueue b3 = queues.get(B3);
+    b3.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    queues.get(CapacitySchedulerConfiguration.ROOT).getQueueResourceUsage()
+    .incPending(Resources.createResource(1 * GB));
 
     // Simulate C returning a container on node_0
     stubQueueAllocation(a, clusterResource, node_0, 0*GB);
@@ -465,7 +481,7 @@ public void testMultiLevelQueues() throws Exception {
     stubQueueAllocation(c, clusterResource, node_0, 1*GB);
     stubQueueAllocation(d, clusterResource, node_0, 0*GB);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(a, 0*GB, clusterResource);
     verifyQueueMetrics(b, 0*GB, clusterResource);
     verifyQueueMetrics(c, 1*GB, clusterResource);
@@ -478,7 +494,7 @@ public void testMultiLevelQueues() throws Exception {
     stubQueueAllocation(b2, clusterResource, node_1, 4*GB);
     stubQueueAllocation(c, clusterResource, node_1, 0*GB);
     root.assignContainers(clusterResource, node_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(a, 0*GB, clusterResource);
     verifyQueueMetrics(b, 4*GB, clusterResource);
     verifyQueueMetrics(c, 1*GB, clusterResource);
@@ -490,14 +506,14 @@ public void testMultiLevelQueues() throws Exception {
     stubQueueAllocation(b3, clusterResource, node_0, 2*GB);
     stubQueueAllocation(c, clusterResource, node_0, 2*GB);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     InOrder allocationOrder = inOrder(a, c, b);
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(c).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 1*GB, clusterResource);
     verifyQueueMetrics(b, 6*GB, clusterResource);
     verifyQueueMetrics(c, 3*GB, clusterResource);
@@ -517,16 +533,16 @@ public void testMultiLevelQueues() throws Exception {
     stubQueueAllocation(b1, clusterResource, node_2, 1*GB);
     stubQueueAllocation(c, clusterResource, node_2, 1*GB);
     root.assignContainers(clusterResource, node_2, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     allocationOrder = inOrder(a, a2, a1, b, c);
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(a2).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(c).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 3*GB, clusterResource);
     verifyQueueMetrics(b, 8*GB, clusterResource);
     verifyQueueMetrics(c, 4*GB, clusterResource);
@@ -622,12 +638,16 @@ public void testOffSwitchScheduling() throws Exception {
     // Start testing
     LeafQueue a = (LeafQueue)queues.get(A);
     LeafQueue b = (LeafQueue)queues.get(B);
+    a.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    b.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    queues.get(CapacitySchedulerConfiguration.ROOT).getQueueResourceUsage()
+    .incPending(Resources.createResource(1 * GB));
     
     // Simulate B returning a container on node_0
     stubQueueAllocation(a, clusterResource, node_0, 0*GB, NodeType.OFF_SWITCH);
     stubQueueAllocation(b, clusterResource, node_0, 1*GB, NodeType.OFF_SWITCH);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(a, 0*GB, clusterResource);
     verifyQueueMetrics(b, 1*GB, clusterResource);
     
@@ -636,12 +656,12 @@ public void testOffSwitchScheduling() throws Exception {
     stubQueueAllocation(a, clusterResource, node_1, 2*GB, NodeType.RACK_LOCAL);
     stubQueueAllocation(b, clusterResource, node_1, 1*GB, NodeType.OFF_SWITCH);
     root.assignContainers(clusterResource, node_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     InOrder allocationOrder = inOrder(a, b);
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 2*GB, clusterResource);
     verifyQueueMetrics(b, 2*GB, clusterResource);
     
@@ -651,12 +671,12 @@ public void testOffSwitchScheduling() throws Exception {
     stubQueueAllocation(a, clusterResource, node_0, 1*GB, NodeType.NODE_LOCAL);
     stubQueueAllocation(b, clusterResource, node_0, 2*GB, NodeType.OFF_SWITCH);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     allocationOrder = inOrder(b, a);
     allocationOrder.verify(b).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(a).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(a, 2*GB, clusterResource);
     verifyQueueMetrics(b, 4*GB, clusterResource);
 
@@ -691,12 +711,19 @@ public void testOffSwitchSchedulingMultiLevelQueues() throws Exception {
     // Start testing
     LeafQueue b3 = (LeafQueue)queues.get(B3);
     LeafQueue b2 = (LeafQueue)queues.get(B2);
+    b2.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    b3.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
+    queues.get(CapacitySchedulerConfiguration.ROOT).getQueueResourceUsage()
+    .incPending(Resources.createResource(1 * GB));
+    
+    CSQueue b = queues.get(B);
+    b.getQueueResourceUsage().incPending(Resources.createResource(1 * GB));
     
     // Simulate B3 returning a container on node_0
     stubQueueAllocation(b2, clusterResource, node_0, 0*GB, NodeType.OFF_SWITCH);
     stubQueueAllocation(b3, clusterResource, node_0, 1*GB, NodeType.OFF_SWITCH);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     verifyQueueMetrics(b2, 0*GB, clusterResource);
     verifyQueueMetrics(b3, 1*GB, clusterResource);
     
@@ -705,12 +732,12 @@ public void testOffSwitchSchedulingMultiLevelQueues() throws Exception {
     stubQueueAllocation(b2, clusterResource, node_1, 1*GB, NodeType.RACK_LOCAL);
     stubQueueAllocation(b3, clusterResource, node_1, 1*GB, NodeType.OFF_SWITCH);
     root.assignContainers(clusterResource, node_1, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     InOrder allocationOrder = inOrder(b2, b3);
     allocationOrder.verify(b2).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(b3).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(b2, 1*GB, clusterResource);
     verifyQueueMetrics(b3, 2*GB, clusterResource);
     
@@ -720,12 +747,12 @@ public void testOffSwitchSchedulingMultiLevelQueues() throws Exception {
     stubQueueAllocation(b2, clusterResource, node_0, 1*GB, NodeType.NODE_LOCAL);
     stubQueueAllocation(b3, clusterResource, node_0, 1*GB, NodeType.OFF_SWITCH);
     root.assignContainers(clusterResource, node_0, 
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     allocationOrder = inOrder(b3, b2);
     allocationOrder.verify(b3).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     allocationOrder.verify(b2).assignContainers(eq(clusterResource), 
-        any(FiCaSchedulerNode.class), anyResourceLimits());
+        any(FiCaSchedulerNode.class), anyResourceLimits(), any(SchedulingMode.class));
     verifyQueueMetrics(b2, 1*GB, clusterResource);
     verifyQueueMetrics(b3, 3*GB, clusterResource);
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
index e8a8243203365..47be61809881f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
@@ -48,10 +48,10 @@
 import org.apache.hadoop.yarn.event.DrainDispatcher;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
 import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter;
 import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsPublisher;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
@@ -266,7 +266,7 @@ public void testReservation() throws Exception {
     // Start testing...
     // Only AM
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2 * GB, a.getUsedResources().getMemory());
     assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -278,7 +278,7 @@ public void testReservation() throws Exception {
 
     // Only 1 map - simulating reduce
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5 * GB, a.getUsedResources().getMemory());
     assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -290,7 +290,7 @@ public void testReservation() throws Exception {
 
     // Only 1 map to other node - simulating reduce
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -305,7 +305,7 @@ public void testReservation() throws Exception {
 
     // try to assign reducer (5G on node 0 and should reserve)
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -321,7 +321,7 @@ public void testReservation() throws Exception {
 
     // assign reducer to node 2
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(18 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -338,7 +338,7 @@ public void testReservation() throws Exception {
     // node_1 heartbeat and unreserves from node_0 in order to allocate
     // on node_1
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(18 * GB, a.getUsedResources().getMemory());
     assertEquals(18 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -422,7 +422,7 @@ public void testReservationNoContinueLook() throws Exception {
     // Start testing...
     // Only AM
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2 * GB, a.getUsedResources().getMemory());
     assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -434,7 +434,7 @@ public void testReservationNoContinueLook() throws Exception {
 
     // Only 1 map - simulating reduce
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5 * GB, a.getUsedResources().getMemory());
     assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -446,7 +446,7 @@ public void testReservationNoContinueLook() throws Exception {
 
     // Only 1 map to other node - simulating reduce
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -461,7 +461,7 @@ public void testReservationNoContinueLook() throws Exception {
 
     // try to assign reducer (5G on node 0 and should reserve)
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -477,7 +477,7 @@ public void testReservationNoContinueLook() throws Exception {
 
     // assign reducer to node 2
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(18 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -494,7 +494,7 @@ public void testReservationNoContinueLook() throws Exception {
     // node_1 heartbeat and won't unreserve from node_0, potentially stuck
     // if AM doesn't handle
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(18 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -570,7 +570,7 @@ public void testAssignContainersNeedToUnreserve() throws Exception {
     // Start testing...
     // Only AM
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2 * GB, a.getUsedResources().getMemory());
     assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -581,7 +581,7 @@ public void testAssignContainersNeedToUnreserve() throws Exception {
 
     // Only 1 map - simulating reduce
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5 * GB, a.getUsedResources().getMemory());
     assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -592,7 +592,7 @@ public void testAssignContainersNeedToUnreserve() throws Exception {
 
     // Only 1 map to other node - simulating reduce
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -606,7 +606,7 @@ public void testAssignContainersNeedToUnreserve() throws Exception {
 
     // try to assign reducer (5G on node 0 and should reserve)
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -621,7 +621,7 @@ public void testAssignContainersNeedToUnreserve() throws Exception {
 
     // could allocate but told need to unreserve first
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -823,7 +823,7 @@ public void testAssignToQueue() throws Exception {
     // Start testing...
     // Only AM
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2 * GB, a.getUsedResources().getMemory());
     assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -834,7 +834,7 @@ public void testAssignToQueue() throws Exception {
 
     // Only 1 map - simulating reduce
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5 * GB, a.getUsedResources().getMemory());
     assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -845,7 +845,7 @@ public void testAssignToQueue() throws Exception {
 
     // Only 1 map to other node - simulating reduce
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -860,15 +860,16 @@ public void testAssignToQueue() throws Exception {
     Resource capability = Resources.createResource(32 * GB, 0);
     boolean res =
         a.canAssignToThisQueue(clusterResource,
-            CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
-                clusterResource), capability, Resources.none());
+            RMNodeLabelsManager.NO_LABEL, new ResourceLimits(
+                clusterResource), capability, Resources.none(),
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertFalse(res);
 
     // now add in reservations and make sure it continues if config set
     // allocate to queue so that the potential new capacity is greater then
     // absoluteMaxCapacity
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, a.getMetrics().getReservedMB());
@@ -881,16 +882,17 @@ CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
     capability = Resources.createResource(5 * GB, 0);
     res =
         a.canAssignToThisQueue(clusterResource,
-            CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
-                clusterResource), capability, Resources
-                .createResource(5 * GB));
+            RMNodeLabelsManager.NO_LABEL, new ResourceLimits(
+                clusterResource), capability, Resources.createResource(5 * GB),
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertTrue(res);
 
     // tell to not check reservations
     res =
         a.canAssignToThisQueue(clusterResource,
-            CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
-                clusterResource), capability, Resources.none());
+            RMNodeLabelsManager.NO_LABEL, new ResourceLimits(
+                clusterResource), capability, Resources.none(),
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertFalse(res);
 
     refreshQueuesTurnOffReservationsContLook(a, csConf);
@@ -899,15 +901,16 @@ CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
     // in since feature is off
     res =
         a.canAssignToThisQueue(clusterResource,
-            CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
-                clusterResource), capability, Resources.none());
+            RMNodeLabelsManager.NO_LABEL, new ResourceLimits(
+                clusterResource), capability, Resources.none(),
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertFalse(res);
 
     res =
         a.canAssignToThisQueue(clusterResource,
-            CommonNodeLabelsManager.EMPTY_STRING_SET, new ResourceLimits(
-                clusterResource), capability, Resources
-                .createResource(5 * GB));
+            RMNodeLabelsManager.NO_LABEL, new ResourceLimits(
+                clusterResource), capability, Resources.createResource(5 * GB),
+            SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertFalse(res);
   }
 
@@ -1008,7 +1011,7 @@ public void testAssignToUser() throws Exception {
     // Start testing...
     // Only AM
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2 * GB, a.getUsedResources().getMemory());
     assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1019,7 +1022,7 @@ public void testAssignToUser() throws Exception {
 
     // Only 1 map - simulating reduce
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5 * GB, a.getUsedResources().getMemory());
     assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1030,7 +1033,7 @@ public void testAssignToUser() throws Exception {
 
     // Only 1 map to other node - simulating reduce
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1044,7 +1047,7 @@ public void testAssignToUser() throws Exception {
     // allocate to queue so that the potential new capacity is greater then
     // absoluteMaxCapacity
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(5 * GB, app_0.getCurrentReservation().getMemory());
@@ -1059,18 +1062,18 @@ public void testAssignToUser() throws Exception {
     // set limit so subtrace reservations it can continue
     Resource limit = Resources.createResource(12 * GB, 0);
     boolean res = a.canAssignToUser(clusterResource, user_0, limit, app_0,
-        true, null);
+        true, """");
     assertTrue(res);
 
     // tell it not to check for reservations and should fail as already over
     // limit
-    res = a.canAssignToUser(clusterResource, user_0, limit, app_0, false, null);
+    res = a.canAssignToUser(clusterResource, user_0, limit, app_0, false, """");
     assertFalse(res);
 
     refreshQueuesTurnOffReservationsContLook(a, csConf);
 
     // should now return false since feature off
-    res = a.canAssignToUser(clusterResource, user_0, limit, app_0, true, null);
+    res = a.canAssignToUser(clusterResource, user_0, limit, app_0, true, """");
     assertFalse(res);
   }
 
@@ -1143,7 +1146,7 @@ public void testReservationsNoneAvailable() throws Exception {
     // Start testing...
     // Only AM
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(2 * GB, a.getUsedResources().getMemory());
     assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1155,7 +1158,7 @@ public void testReservationsNoneAvailable() throws Exception {
 
     // Only 1 map - simulating reduce
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(5 * GB, a.getUsedResources().getMemory());
     assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1167,7 +1170,7 @@ public void testReservationsNoneAvailable() throws Exception {
 
     // Only 1 map to other node - simulating reduce
     a.assignContainers(clusterResource, node_1,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1183,7 +1186,7 @@ public void testReservationsNoneAvailable() throws Exception {
     // some resource. Even with continous reservation looking, we don't allow 
     // unreserve resource to reserve container.
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(Resources.createResource(10 * GB)));
+        new ResourceLimits(Resources.createResource(10 * GB)), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1199,7 +1202,7 @@ public void testReservationsNoneAvailable() throws Exception {
     // used (8G) + required (5G). It will not reserved since it has to unreserve
     // some resource. Unfortunately, there's nothing to unreserve.
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(Resources.createResource(10 * GB)));
+        new ResourceLimits(Resources.createResource(10 * GB)), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(8 * GB, a.getUsedResources().getMemory());
     assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1213,7 +1216,7 @@ public void testReservationsNoneAvailable() throws Exception {
 
     // let it assign 5G to node_2
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(13 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(0 * GB, a.getMetrics().getReservedMB());
@@ -1226,7 +1229,7 @@ public void testReservationsNoneAvailable() throws Exception {
 
     // reserve 8G node_0
     a.assignContainers(clusterResource, node_0,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(21 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(8 * GB, a.getMetrics().getReservedMB());
@@ -1241,7 +1244,7 @@ public void testReservationsNoneAvailable() throws Exception {
     // continued to try due to having reservation above,
     // but hits queue limits so can't reserve anymore.
     a.assignContainers(clusterResource, node_2,
-        new ResourceLimits(clusterResource));
+        new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
     assertEquals(21 * GB, a.getUsedResources().getMemory());
     assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
     assertEquals(8 * GB, a.getMetrics().getReservedMB());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java
index 62135b91df4d7..84abf4e5445bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java
@@ -160,6 +160,7 @@ public static ResourceRequest createResourceRequest(
     request.setCapability(capability);
     request.setRelaxLocality(relaxLocality);
     request.setPriority(priority);
+    request.setNodeLabelExpression(RMNodeLabelsManager.NO_LABEL);
     return request;
   }
   
@@ -273,6 +274,7 @@ public static Configuration getConfigurationWithQueueLabels(Configuration config
     conf.setCapacity(B1, 100);
     conf.setMaximumCapacity(B1, 100);
     conf.setCapacityByLabel(B1, ""y"", 100);
+    conf.setMaximumApplicationMasterResourcePerQueuePercent(B1, 1f);
 
     final String C1 = C + "".c1"";
     conf.setQueues(C, new String[] {""c1""});"
2ea800d7cf8bb3d5455402af7291bac9deb2fe46,orientdb,Index in tx: Fixed issue 468 about deletion--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java b/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java
index 7d58afbf789..1df1d18a50a 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java
@@ -886,6 +886,9 @@ public ORecordAbstract<Object> setDirty() {
 					e.setDirty();
 			}
 		}
+		// THIS IS IMPORTANT TO BE SURE THAT FIELDS ARE LOADED BEFORE IT'S TOO LATE AND THE RECORD _SOURCE IS NULL
+		checkForFields();
+		
 		return super.setDirty();
 	}"
f16e39ecb1dcb4d5964235ef94d84ab4d70ac314,hadoop,Merge -c 1529538 from trunk to branch-2 to fix- YARN-1090. Fixed CS UI to better reflect applications as non-schedulable and- not as pending. Contributed by Jian He.--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529539 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6a997b42ecf8d..4babceb873418 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -166,6 +166,9 @@ Release 2.1.2 - UNRELEASED
 
     YARN-1032. Fixed NPE in RackResolver. (Lohit Vijayarenu via acmurthy)
 
+    YARN-1090. Fixed CS UI to better reflect applications as non-schedulable
+    and not as pending. (Jian He via acmurthy)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
index 9d2c739e480cf..8a030952504fb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
@@ -73,7 +73,7 @@ public class QueueMetrics implements MetricsSource {
   @Metric(""Reserved CPU in virtual cores"") MutableGaugeInt reservedVCores;
   @Metric(""# of reserved containers"") MutableGaugeInt reservedContainers;
   @Metric(""# of active users"") MutableGaugeInt activeUsers;
-  @Metric(""# of active users"") MutableGaugeInt activeApplications;
+  @Metric(""# of active applications"") MutableGaugeInt activeApplications;
   private final MutableGaugeInt[] runningTime;
   private TimeBucketMetrics<ApplicationId> runBuckets;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
index 0bf851722e218..900c1a62ddade 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
@@ -98,24 +98,25 @@ protected void render(Block html) {
       for (UserInfo entry: users) {
         activeUserList.append(entry.getUsername()).append("" &lt;"")
           .append(getPercentage(entry.getResourcesUsed(), usedResources))
-          .append("", Active Apps: "" + entry.getNumActiveApplications())
-          .append("", Pending Apps: "" + entry.getNumPendingApplications())
+          .append("", Schedulable Apps: "" + entry.getNumActiveApplications())
+          .append("", Non-Schedulable Apps: "" + entry.getNumPendingApplications())
           .append(""&gt;<br style='display:block'>""); //Force line break
       }
 
       ResponseInfo ri = info(""\'"" + lqinfo.getQueuePath().substring(5) + ""\' Queue Status"").
           _(""Queue State:"", lqinfo.getQueueState()).
           _(""Used Capacity:"", percent(lqinfo.getUsedCapacity() / 100)).
+          _(""Absolute Used Capacity:"", percent(lqinfo.getAbsoluteUsedCapacity() / 100)).
           _(""Absolute Capacity:"", percent(lqinfo.getAbsoluteCapacity() / 100)).
           _(""Absolute Max Capacity:"", percent(lqinfo.getAbsoluteMaxCapacity() / 100)).
           _(""Used Resources:"", StringEscapeUtils.escapeHtml(lqinfo.getUsedResources().toString())).
-          _(""Num Active Applications:"", Integer.toString(lqinfo.getNumActiveApplications())).
-          _(""Num Pending Applications:"", Integer.toString(lqinfo.getNumPendingApplications())).
+          _(""Num Schedulable Applications:"", Integer.toString(lqinfo.getNumActiveApplications())).
+          _(""Num Non-Schedulable Applications:"", Integer.toString(lqinfo.getNumPendingApplications())).
           _(""Num Containers:"", Integer.toString(lqinfo.getNumContainers())).
           _(""Max Applications:"", Integer.toString(lqinfo.getMaxApplications())).
           _(""Max Applications Per User:"", Integer.toString(lqinfo.getMaxApplicationsPerUser())).
-          _(""Max Active Applications:"", Integer.toString(lqinfo.getMaxActiveApplications())).
-          _(""Max Active Applications Per User:"", Integer.toString(lqinfo.getMaxActiveApplicationsPerUser())).
+          _(""Max Schedulable Applications:"", Integer.toString(lqinfo.getMaxActiveApplications())).
+          _(""Max Schedulable Applications Per User:"", Integer.toString(lqinfo.getMaxActiveApplicationsPerUser())).
           _(""Configured Capacity:"", percent(lqinfo.getCapacity() / 100)).
           _(""Configured Max Capacity:"", percent(lqinfo.getMaxCapacity() / 100)).
           _(""Configured Minimum User Limit Percent:"", Integer.toString(lqinfo.getUserLimit()) + ""%"")."
2c95c42e94bb4cb51d2bc9e09f09686a6adf162d,Vala,"libsoup-2.4: fix arguments to several methods which take delegates
",c,https://github.com/GNOME/vala/,"diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 55ef7e543d..78291b4159 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -58,8 +58,8 @@ namespace Soup {
 		public bool covers (Soup.Message msg);
 		public unowned string get_realm ();
 		public void remove_path (string path);
-		public void set_filter (Soup.AuthDomainFilter filter, void* filter_data, GLib.DestroyNotify dnotify);
-		public void set_generic_auth_callback (Soup.AuthDomainGenericAuthCallback auth_callback, void* auth_data, GLib.DestroyNotify dnotify);
+		public void set_filter (owned Soup.AuthDomainFilter filter);
+		public void set_generic_auth_callback (owned Soup.AuthDomainGenericAuthCallback auth_callback);
 		public bool try_generic_auth_callback (Soup.Message msg, string username);
 		[NoAccessorMethod]
 		public void* filter { get; set; }
@@ -77,7 +77,7 @@ namespace Soup {
 	public class AuthDomainBasic : Soup.AuthDomain {
 		[CCode (type = ""SoupAuthDomain*"", has_construct_function = false)]
 		public AuthDomainBasic (string optname1);
-		public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, GLib.DestroyNotify dnotify);
+		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainBasicAuthCallback callback);
 		[NoAccessorMethod]
 		public void* auth_callback { get; set; }
 		[NoAccessorMethod]
@@ -88,7 +88,7 @@ namespace Soup {
 		[CCode (type = ""SoupAuthDomain*"", has_construct_function = false)]
 		public AuthDomainDigest (string optname1);
 		public static unowned string encode_password (string username, string realm, string password);
-		public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
+		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainDigestAuthCallback callback);
 		[NoAccessorMethod]
 		public void* auth_callback { get; set; }
 		[NoAccessorMethod]
@@ -198,9 +198,9 @@ namespace Soup {
 	public class Logger : GLib.Object, Soup.SessionFeature {
 		[CCode (has_construct_function = false)]
 		public Logger (Soup.LoggerLogLevel level, int max_body_size);
-		public void set_printer (Soup.LoggerPrinter printer, void* printer_data, GLib.DestroyNotify destroy);
-		public void set_request_filter (Soup.LoggerFilter request_filter, void* filter_data, GLib.DestroyNotify destroy);
-		public void set_response_filter (Soup.LoggerFilter response_filter, void* filter_data, GLib.DestroyNotify destroy);
+		public void set_printer (owned Soup.LoggerPrinter printer);
+		public void set_request_filter (owned Soup.LoggerFilter request_filter);
+		public void set_response_filter (owned Soup.LoggerFilter response_filter);
 	}
 	[CCode (cheader_filename = ""libsoup/soup.h"")]
 	public class Message : GLib.Object {
@@ -219,7 +219,7 @@ namespace Soup {
 		public Soup.HTTPVersion get_http_version ();
 		public unowned Soup.URI get_uri ();
 		public bool is_keepalive ();
-		public void set_chunk_allocator (Soup.ChunkAllocator allocator, GLib.DestroyNotify destroy_notify);
+		public void set_chunk_allocator (owned Soup.ChunkAllocator allocator);
 		public void set_flags (Soup.MessageFlags flags);
 		public void set_http_version (Soup.HTTPVersion version);
 		public void set_request (string content_type, Soup.MemoryUse req_use, string req_body, size_t req_length);
diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
index 8bc6707f0b..38a275447f 100644
--- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
+++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
@@ -4,10 +4,29 @@ soup_auth_is_authenticated hidden=""1""
 soup_auth_is_for_proxy hidden=""1""
 SoupAuthDomain:add-path hidden=""1""
 SoupAuthDomain:remove-path hidden=""1""
+soup_auth_domain_set_filter.filter transfer_ownership=""1""
+soup_auth_domain_set_filter.filter_data hidden=""1""
+soup_auth_domain_set_filter.dnotify hidden=""1""
+soup_auth_domain_set_generic_auth_callback.auth_callback transfer_ownership=""1""
+soup_auth_domain_set_generic_auth_callback.auth_data hidden=""1""
+soup_auth_domain_set_generic_auth_callback.dnotify hidden=""1""
+soup_auth_domain_basic_set_auth_callback.callback transfer_ownership=""1""
+soup_auth_domain_basic_set_auth_callback.dnotify hidden=""1""
+soup_auth_domain_digest_set_auth_callback.callback transfer_ownership=""1""
+soup_auth_domain_digest_set_auth_callback.dnotify hidden=""1""
 SoupBuffer ref_function=""soup_buffer_copy"" unref_function=""soup_buffer_free""
 soup_buffer_copy transfer_ownership=""1""
 soup_cookie_copy transfer_ownership=""1""
 soup_date_copy transfer_ownership=""1""
+soup_logger_set_printer.printer transfer_ownership=""1""
+soup_logger_set_printer.printer_data hidden=""1""
+soup_logger_set_printer.destroy hidden=""1""
+soup_logger_set_request_filter.request_filter transfer_ownership=""1""
+soup_logger_set_request_filter.filter_data hidden=""1""
+soup_logger_set_request_filter.destroy hidden=""1""
+soup_logger_set_response_filter.response_filter transfer_ownership=""1""
+soup_logger_set_response_filter.filter_data hidden=""1""
+soup_logger_set_response_filter.destroy hidden=""1""
 SoupMessage::finished has_emitter=""1""
 SoupMessage::got_body has_emitter=""1""
 SoupMessage::got_chunk has_emitter=""1""
@@ -22,6 +41,8 @@ SoupMessage::wrote_informational has_emitter=""1""
 soup_message_headers_get_content_disposition.disposition transfer_ownership=""1""
 soup_message_headers_get_content_disposition.params is_out=""1"" transfer_ownership=""1"" nullable=""1""
 soup_message_headers_get_content_type.params is_out=""1"" transfer_ownership=""1"" nullable=""1""
+soup_message_set_chunk_allocator.allocator transfer_ownership=""1""
+soup_message_set_chunk_allocator.destroy_notify hidden=""1""
 SoupMessageBody.data type_name=""uint8"" is_array=""1""
 soup_server_new ellipsis=""1""
 soup_server_add_handler.destroy hidden=""1"""
81e6ff51623792ebe9cb7c277fccd044bdd432b9,elasticsearch,Allow for plugins to register REST filter (better- support with async execution and some renaming),p,https://github.com/elastic/elasticsearch,"diff --git a/src/main/java/org/elasticsearch/http/HttpServer.java b/src/main/java/org/elasticsearch/http/HttpServer.java
index 6ad5b876404de..0e5fb51f0ff12 100644
--- a/src/main/java/org/elasticsearch/http/HttpServer.java
+++ b/src/main/java/org/elasticsearch/http/HttpServer.java
@@ -51,6 +51,8 @@ public class HttpServer extends AbstractLifecycleComponent<HttpServer> {
 
     private final boolean disableSites;
 
+    private final PluginSiteFilter pluginSiteFilter = new PluginSiteFilter();
+
     @Inject
     public HttpServer(Settings settings, Environment environment, HttpServerTransport transport,
                       RestController restController,
@@ -111,33 +113,33 @@ public HttpStats stats() {
 
     public void internalDispatchRequest(final HttpRequest request, final HttpChannel channel) {
         if (request.rawPath().startsWith(""/_plugin/"")) {
-            for (RestPreProcessor preProcessor : restController.preProcessors()) {
-                if (!preProcessor.handleExternal()) {
-                    continue;
-                }
-                if (!preProcessor.process(request, channel)) {
-                    return;
-                }
-            }
-            handlePluginSite(request, channel);
+            RestFilterChain filterChain = restController.filterChain(pluginSiteFilter);
+            filterChain.continueProcessing(request, channel);
             return;
         }
-        if (!restController.dispatchRequest(request, channel)) {
-            if (request.method() == RestRequest.Method.OPTIONS) {
-                // when we have OPTIONS request, simply send OK by default (with the Access Control Origin header which gets automatically added)
-                StringRestResponse response = new StringRestResponse(OK);
-                channel.sendResponse(response);
-            } else {
-                channel.sendResponse(new StringRestResponse(BAD_REQUEST, ""No handler found for uri ["" + request.uri() + ""] and method ["" + request.method() + ""]""));
-            }
+        restController.dispatchRequest(request, channel);
+    }
+
+
+    class PluginSiteFilter extends RestFilter {
+
+        @Override
+        public void process(RestRequest request, RestChannel channel, RestFilterChain filterChain) {
+            handlePluginSite((HttpRequest) request, (HttpChannel) channel);
         }
     }
 
-    private void handlePluginSite(HttpRequest request, HttpChannel channel) {
+    void handlePluginSite(HttpRequest request, HttpChannel channel) {
         if (disableSites) {
             channel.sendResponse(new StringRestResponse(FORBIDDEN));
             return;
         }
+        if (request.method() == RestRequest.Method.OPTIONS) {
+            // when we have OPTIONS request, simply send OK by default (with the Access Control Origin header which gets automatically added)
+            StringRestResponse response = new StringRestResponse(OK);
+            channel.sendResponse(response);
+            return;
+        }
         if (request.method() != RestRequest.Method.GET) {
             channel.sendResponse(new StringRestResponse(FORBIDDEN));
             return;
diff --git a/src/main/java/org/elasticsearch/rest/RestController.java b/src/main/java/org/elasticsearch/rest/RestController.java
index 30926d0fdba2a..e852e76c2f539 100644
--- a/src/main/java/org/elasticsearch/rest/RestController.java
+++ b/src/main/java/org/elasticsearch/rest/RestController.java
@@ -21,6 +21,8 @@
 
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
+import org.elasticsearch.ElasticSearchIllegalStateException;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.path.PathTrie;
@@ -31,6 +33,9 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
+import static org.elasticsearch.rest.RestStatus.BAD_REQUEST;
+import static org.elasticsearch.rest.RestStatus.OK;
+
 /**
  *
  */
@@ -43,8 +48,10 @@ public class RestController extends AbstractLifecycleComponent<RestController> {
     private final PathTrie<RestHandler> headHandlers = new PathTrie<RestHandler>(RestUtils.REST_DECODER);
     private final PathTrie<RestHandler> optionsHandlers = new PathTrie<RestHandler>(RestUtils.REST_DECODER);
 
+    private final RestHandlerFilter handlerFilter = new RestHandlerFilter();
+
     // non volatile since the assumption is that pre processors are registered on startup
-    private RestPreProcessor[] preProcessors = new RestPreProcessor[0];
+    private RestFilter[] filters = new RestFilter[0];
 
     @Inject
     public RestController(Settings settings) {
@@ -61,22 +68,25 @@ protected void doStop() throws ElasticSearchException {
 
     @Override
     protected void doClose() throws ElasticSearchException {
+        for (RestFilter filter : filters) {
+            filter.close();
+        }
     }
 
     /**
      * Registers a pre processor to be executed before the rest request is actually handled.
      */
-    public synchronized void registerPreProcessor(RestPreProcessor preProcessor) {
-        RestPreProcessor[] copy = new RestPreProcessor[preProcessors.length + 1];
-        System.arraycopy(preProcessors, 0, copy, 0, preProcessors.length);
-        copy[preProcessors.length] = preProcessor;
-        Arrays.sort(copy, new Comparator<RestPreProcessor>() {
+    public synchronized void registerFilter(RestFilter preProcessor) {
+        RestFilter[] copy = new RestFilter[filters.length + 1];
+        System.arraycopy(filters, 0, copy, 0, filters.length);
+        copy[filters.length] = preProcessor;
+        Arrays.sort(copy, new Comparator<RestFilter>() {
             @Override
-            public int compare(RestPreProcessor o1, RestPreProcessor o2) {
+            public int compare(RestFilter o1, RestFilter o2) {
                 return o2.order() - o1.order();
             }
         });
-        preProcessors = copy;
+        filters = copy;
     }
 
     /**
@@ -107,30 +117,55 @@ public void registerHandler(RestRequest.Method method, String path, RestHandler
         }
     }
 
-    public RestPreProcessor[] preProcessors() {
-        return preProcessors;
+    /**
+     * Returns a filter chain (if needed) to execute. If this method returns null, simply execute
+     * as usual.
+     */
+    @Nullable
+    public RestFilterChain filterChainOrNull(RestFilter executionFilter) {
+        if (filters.length == 0) {
+            return null;
+        }
+        return new ControllerFilterChain(executionFilter);
+    }
+
+    /**
+     * Returns a filter chain with the final filter being the provided filter.
+     */
+    public RestFilterChain filterChain(RestFilter executionFilter) {
+        return new ControllerFilterChain(executionFilter);
     }
 
-    public boolean dispatchRequest(final RestRequest request, final RestChannel channel) {
-        try {
-            for (RestPreProcessor preProcessor : preProcessors) {
-                if (!preProcessor.process(request, channel)) {
-                    return true;
+    public void dispatchRequest(final RestRequest request, final RestChannel channel) {
+        if (filters.length == 0) {
+            try {
+                executeHandler(request, channel);
+            } catch (Exception e) {
+                try {
+                    channel.sendResponse(new XContentThrowableRestResponse(request, e));
+                } catch (IOException e1) {
+                    logger.error(""Failed to send failure response for uri ["" + request.uri() + ""]"", e1);
                 }
             }
-            final RestHandler handler = getHandler(request);
-            if (handler == null) {
-                return false;
-            }
+        } else {
+            ControllerFilterChain filterChain = new ControllerFilterChain(handlerFilter);
+            filterChain.continueProcessing(request, channel);
+        }
+    }
+
+    void executeHandler(RestRequest request, RestChannel channel) {
+        final RestHandler handler = getHandler(request);
+        if (handler != null) {
             handler.handleRequest(request, channel);
-        } catch (Exception e) {
-            try {
-                channel.sendResponse(new XContentThrowableRestResponse(request, e));
-            } catch (IOException e1) {
-                logger.error(""Failed to send failure response for uri ["" + request.uri() + ""]"", e1);
+        } else {
+            if (request.method() == RestRequest.Method.OPTIONS) {
+                // when we have OPTIONS request, simply send OK by default (with the Access Control Origin header which gets automatically added)
+                StringRestResponse response = new StringRestResponse(OK);
+                channel.sendResponse(response);
+            } else {
+                channel.sendResponse(new StringRestResponse(BAD_REQUEST, ""No handler found for uri ["" + request.uri() + ""] and method ["" + request.method() + ""]""));
             }
         }
-        return true;
     }
 
     private RestHandler getHandler(RestRequest request) {
@@ -159,4 +194,45 @@ private String getPath(RestRequest request) {
         // my_index/my_type/http%3A%2F%2Fwww.google.com
         return request.rawPath();
     }
+
+    class ControllerFilterChain implements RestFilterChain {
+
+        private final RestFilter executionFilter;
+
+        private volatile int index;
+
+        ControllerFilterChain(RestFilter executionFilter) {
+            this.executionFilter = executionFilter;
+        }
+
+        @Override
+        public void continueProcessing(RestRequest request, RestChannel channel) {
+            try {
+                int loc = index;
+                if (loc > filters.length) {
+                    throw new ElasticSearchIllegalStateException(""filter continueProcessing was called more than expected"");
+                } else if (loc == filters.length) {
+                    executionFilter.process(request, channel, this);
+                } else {
+                    RestFilter preProcessor = filters[loc];
+                    preProcessor.process(request, channel, this);
+                }
+                index++;
+            } catch (Exception e) {
+                try {
+                    channel.sendResponse(new XContentThrowableRestResponse(request, e));
+                } catch (IOException e1) {
+                    logger.error(""Failed to send failure response for uri ["" + request.uri() + ""]"", e1);
+                }
+            }
+        }
+    }
+
+    class RestHandlerFilter extends RestFilter {
+
+        @Override
+        public void process(RestRequest request, RestChannel channel, RestFilterChain filterChain) {
+            executeHandler(request, channel);
+        }
+    }
 }
diff --git a/src/main/java/org/elasticsearch/rest/RestPreProcessor.java b/src/main/java/org/elasticsearch/rest/RestFilter.java
similarity index 53%
rename from src/main/java/org/elasticsearch/rest/RestPreProcessor.java
rename to src/main/java/org/elasticsearch/rest/RestFilter.java
index 273fbd5ca19fd..cf71e9f9734c8 100644
--- a/src/main/java/org/elasticsearch/rest/RestPreProcessor.java
+++ b/src/main/java/org/elasticsearch/rest/RestFilter.java
@@ -19,30 +19,30 @@
 
 package org.elasticsearch.rest;
 
+import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.common.component.CloseableComponent;
+
 /**
- * Rest pre processor allowing to pre process REST requests.
- * <p/>
- * Experimental interface.
+ * A filter allowing to filter rest operations.
  */
-public interface RestPreProcessor {
+public abstract class RestFilter implements CloseableComponent {
 
     /**
-     * Optionally, the order the processor will work on. Execution is done from lowest value to highest.
-     * It is a good practice to allow to configure this for the relevant processor.
+     * Optionally, the order of the filter. Execution is done from lowest value to highest.
+     * It is a good practice to allow to configure this for the relevant filter.
      */
-    int order();
+    public int order() {
+        return 0;
+    }
 
-    /**
-     * Should this processor also process external (non REST) requests, like plugin site requests.
-     */
-    boolean handleExternal();
+    @Override
+    public void close() throws ElasticSearchException {
+        // a no op
+    }
 
     /**
-     * Process the request, returning <tt>false</tt> if no further processing should be done. Note,
-     * make sure to send a response if returning <tt>false</tt>, otherwise, no response will be sent.
-     * <p/>
-     * It is recommended that the process method will not do blocking calls, or heavily cache data
-     * if a blocking call is done.
+     * Process the rest request. Using the channel to send a response, or the filter chain to continue
+     * processing the request.
      */
-    boolean process(RestRequest request, RestChannel channel);
+    public abstract void process(RestRequest request, RestChannel channel, RestFilterChain filterChain);
 }
diff --git a/src/main/java/org/elasticsearch/rest/RestFilterChain.java b/src/main/java/org/elasticsearch/rest/RestFilterChain.java
new file mode 100644
index 0000000000000..564e43af6f4cf
--- /dev/null
+++ b/src/main/java/org/elasticsearch/rest/RestFilterChain.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to ElasticSearch and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. ElasticSearch licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.rest;
+
+/**
+ * A filter chain allowing to continue and process the rest request.
+ */
+public interface RestFilterChain {
+
+    /**
+     * Continue processing the request. Should only be called if a response has not been sent
+     * through the channel.
+     */
+    void continueProcessing(RestRequest request, RestChannel channel);
+}"
f38296da61ed21544ad45609c52d950adf913dca,elasticsearch,Percolator response now always returns the- `matches` key.--Closes -4881-,c,https://github.com/elastic/elasticsearch,"diff --git a/rest-api-spec/test/percolate/17_empty.yaml b/rest-api-spec/test/percolate/17_empty.yaml
new file mode 100644
index 0000000000000..0cd1ac5bb8d32
--- /dev/null
+++ b/rest-api-spec/test/percolate/17_empty.yaml
@@ -0,0 +1,31 @@
+---
+""Basic percolation tests on an empty cluster"":
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      indices.refresh: {}
+
+  - do:
+      percolate:
+        index: test_index
+        type:  test_type
+        body:
+          doc:
+            foo: bar
+
+  - match: {'total': 0}
+  - match: {'matches': []}
+
+  - do:
+      count_percolate:
+        index: test_index
+        type:  test_type
+        body:
+          doc:
+            foo: bar
+
+  - is_false:  matches
+  - match: {'total': 0}
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java b/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
index dd2edcfb83d12..c6ae1d0d4c384 100644
--- a/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
+++ b/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
@@ -42,7 +42,7 @@
  */
 public class PercolateResponse extends BroadcastOperationResponse implements Iterable<PercolateResponse.Match>, ToXContent {
 
-    private static final Match[] EMPTY = new Match[0];
+    public static final Match[] EMPTY = new Match[0];
 
     private long tookInMillis;
     private Match[] matches;
@@ -60,10 +60,10 @@ public PercolateResponse(int totalShards, int successfulShards, int failedShards
         this.aggregations = aggregations;
     }
 
-    public PercolateResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures, long tookInMillis) {
+    public PercolateResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures, long tookInMillis, Match[] matches) {
         super(totalShards, successfulShards, failedShards, shardFailures);
         this.tookInMillis = tookInMillis;
-        this.matches = EMPTY;
+        this.matches = matches;
     }
 
     PercolateResponse() {
@@ -87,18 +87,30 @@ public long getTookInMillis() {
         return tookInMillis;
     }
 
+    /**
+     * @return The queries that match with the document being percolated. This can return <code>null</code> if th.
+     */
     public Match[] getMatches() {
         return this.matches;
     }
 
+    /**
+     * @return The total number of queries that have matched with the document being percolated.
+     */
     public long getCount() {
         return count;
     }
 
+    /**
+     * @return Any facet that has been executed on the query metadata. This can return <code>null</code>.
+     */
     public InternalFacets getFacets() {
         return facets;
     }
 
+    /**
+     * @return Any aggregations that has been executed on the query metadata. This can return <code>null</code>.
+     */
     public InternalAggregations getAggregations() {
         return aggregations;
     }
@@ -116,7 +128,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         RestActions.buildBroadcastShardsHeader(builder, this);
 
         builder.field(Fields.TOTAL, count);
-        if (matches.length != 0) {
+        if (matches != null) {
             builder.startArray(Fields.MATCHES);
             boolean justIds = ""ids"".equals(params.param(""percolate_format""));
             if (justIds) {
@@ -171,10 +183,12 @@ public void readFrom(StreamInput in) throws IOException {
         tookInMillis = in.readVLong();
         count = in.readVLong();
         int size = in.readVInt();
-        matches = new Match[size];
-        for (int i = 0; i < size; i++) {
-            matches[i] = new Match();
-            matches[i].readFrom(in);
+        if (size != -1) {
+            matches = new Match[size];
+            for (int i = 0; i < size; i++) {
+                matches[i] = new Match();
+                matches[i].readFrom(in);
+            }
         }
         facets = InternalFacets.readOptionalFacets(in);
         aggregations = InternalAggregations.readOptionalAggregations(in);
@@ -185,9 +199,13 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeVLong(tookInMillis);
         out.writeVLong(count);
-        out.writeVInt(matches.length);
-        for (Match match : matches) {
-            match.writeTo(out);
+        if (matches == null) {
+            out.writeVInt(-1);
+        } else {
+            out.writeVInt(matches.length);
+            for (Match match : matches) {
+                match.writeTo(out);
+            }
         }
         out.writeOptionalStreamable(facets);
         out.writeOptionalStreamable(aggregations);
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
index 0a27d598b3911..f8bc3776742f7 100644
--- a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
+++ b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
@@ -155,7 +155,8 @@ public static PercolateResponse reduce(PercolateRequest request, AtomicReference
 
         if (shardResults == null) {
             long tookInMillis = System.currentTimeMillis() - request.startTime;
-            return new PercolateResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures, tookInMillis);
+            PercolateResponse.Match[] matches = request.onlyCount() ? null : PercolateResponse.EMPTY;
+            return new PercolateResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures, tookInMillis, matches);
         } else {
             PercolatorService.ReduceResult result = percolatorService.reduce(percolatorTypeId, shardResults);
             long tookInMillis = System.currentTimeMillis() - request.startTime;
diff --git a/src/main/java/org/elasticsearch/percolator/PercolatorService.java b/src/main/java/org/elasticsearch/percolator/PercolatorService.java
index e89498bce497a..9b90880539f52 100644
--- a/src/main/java/org/elasticsearch/percolator/PercolatorService.java
+++ b/src/main/java/org/elasticsearch/percolator/PercolatorService.java
@@ -795,8 +795,6 @@ private void queryBasedPercolating(Engine.Searcher percolatorSearcher, Percolate
 
     public final static class ReduceResult {
 
-        private static PercolateResponse.Match[] EMPTY = new PercolateResponse.Match[0];
-
         private final long count;
         private final PercolateResponse.Match[] matches;
         private final InternalFacets reducedFacets;
@@ -811,7 +809,7 @@ public final static class ReduceResult {
 
         public ReduceResult(long count, InternalFacets reducedFacets, InternalAggregations reducedAggregations) {
             this.count = count;
-            this.matches = EMPTY;
+            this.matches = null;
             this.reducedFacets = reducedFacets;
             this.reducedAggregations = reducedAggregations;
         }
diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
index 4e6b873bf93ca..4247a0e8a2f61 100644
--- a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
+++ b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
@@ -931,7 +931,7 @@ public void testCountPercolation() throws Exception {
                 .setPercolateDoc(docBuilder().setDoc(jsonBuilder().startObject().field(""field1"", ""b"").endObject()))
                 .execute().actionGet();
         assertMatchCount(response, 2l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate doc with field1=c"");
         response = client().preparePercolate()
@@ -939,7 +939,7 @@ public void testCountPercolation() throws Exception {
                 .setPercolateDoc(docBuilder().setDoc(yamlBuilder().startObject().field(""field1"", ""c"").endObject()))
                 .execute().actionGet();
         assertMatchCount(response, 2l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate doc with field1=b c"");
         response = client().preparePercolate()
@@ -947,7 +947,7 @@ public void testCountPercolation() throws Exception {
                 .setPercolateDoc(docBuilder().setDoc(smileBuilder().startObject().field(""field1"", ""b c"").endObject()))
                 .execute().actionGet();
         assertMatchCount(response, 4l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate doc with field1=d"");
         response = client().preparePercolate()
@@ -955,7 +955,7 @@ public void testCountPercolation() throws Exception {
                 .setPercolateDoc(docBuilder().setDoc(jsonBuilder().startObject().field(""field1"", ""d"").endObject()))
                 .execute().actionGet();
         assertMatchCount(response, 1l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate non existing doc"");
         try {
@@ -1003,7 +1003,7 @@ public void testCountPercolatingExistingDocs() throws Exception {
                 .setGetRequest(Requests.getRequest(""test"").type(""type"").id(""1""))
                 .execute().actionGet();
         assertMatchCount(response, 2l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate existing doc with id 2"");
         response = client().preparePercolate()
@@ -1011,7 +1011,7 @@ public void testCountPercolatingExistingDocs() throws Exception {
                 .setGetRequest(Requests.getRequest(""test"").type(""type"").id(""2""))
                 .execute().actionGet();
         assertMatchCount(response, 2l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate existing doc with id 3"");
         response = client().preparePercolate()
@@ -1019,7 +1019,7 @@ public void testCountPercolatingExistingDocs() throws Exception {
                 .setGetRequest(Requests.getRequest(""test"").type(""type"").id(""3""))
                 .execute().actionGet();
         assertMatchCount(response, 4l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
 
         logger.info(""--> Count percolate existing doc with id 4"");
         response = client().preparePercolate()
@@ -1027,7 +1027,7 @@ public void testCountPercolatingExistingDocs() throws Exception {
                 .setGetRequest(Requests.getRequest(""test"").type(""type"").id(""4""))
                 .execute().actionGet();
         assertMatchCount(response, 1l);
-        assertThat(response.getMatches(), emptyArray());
+        assertThat(response.getMatches(), nullValue());
     }
 
     @Test"
cbf015fc3fce478a794c1c2542633c11328c60f7,Vala,"vapigen: Support overriding memory management functions in metadata

Fixes bug 589307.
",a,https://github.com/GNOME/vala/,"diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index b4426ea669..70a2019120 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -462,6 +462,12 @@ public class Vala.GIdlParser : CodeVisitor {
 
 			current_data_type = null;
 		} else {
+			bool ref_function_void = false;
+			string ref_function = null;
+			string unref_function = null;
+			string copy_function = null;
+			string free_function = null;
+
 			var cl = ns.scope.lookup (name) as Class;
 			if (cl == null) {
 				string base_class = null;
@@ -494,6 +500,18 @@ public class Vala.GIdlParser : CodeVisitor {
 							if (eval (nv[1]) == ""1"") {
 								cl.is_abstract = true;
 							}
+						} else if (nv[0] == ""free_function"") {
+							free_function = eval (nv[1]);
+						} else if (nv[0] == ""ref_function"") {
+							ref_function = eval (nv[1]);
+						} else if (nv[0] == ""unref_function"") {
+							unref_function = eval (nv[1]);
+						} else if (nv[0] == ""copy_function"") {
+							copy_function = eval (nv[1]);
+						} else if (nv[0] == ""ref_function_void"") {
+							if (eval (nv[1]) == ""1"") {
+								ref_function_void = true;
+							}
 						}
 					}
 				}
@@ -509,23 +527,17 @@ public class Vala.GIdlParser : CodeVisitor {
 
 			current_data_type = cl;
 
-			bool ref_function_void = false;
-			string ref_function = null;
-			string unref_function = null;
-			string copy_function = null;
-			string free_function = null;
-
 			foreach (weak IdlNode member in st_node.members) {
 				if (member.type == IdlNodeTypeId.FUNCTION) {
-					if (member.name == ""ref"") {
+					if ((ref_function == null) && (member.name == ""ref"")) {
 						ref_function = ((IdlNodeFunction) member).symbol;
 						ref_function_void = (parse_type (((IdlNodeFunction) member).result.type) is VoidType);
-					} else if (member.name == ""unref"") {
+					} else if ((unref_function == null) && (member.name == ""unref"")) {
 						unref_function = ((IdlNodeFunction) member).symbol;
-					} else if (member.name == ""free"" || member.name == ""destroy"") {
+					} else if ((free_function == null) && (member.name == ""free"" || member.name == ""destroy"")) {
 						free_function = ((IdlNodeFunction) member).symbol;
 					} else {
-						if (member.name == ""copy"") {
+						if ((copy_function == null) && (member.name == ""copy"")) {
 							copy_function = ((IdlNodeFunction) member).symbol;
 						}
 						var m = parse_function ((IdlNodeFunction) member);"
ebb08cddcf8511e6a62ffbf0fff675e9627cd376,hbase,HBASE-1866 Scan(Scan) copy constructor does not- copy value of cacheBlocks--git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@818656 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hbase,"diff --git a/CHANGES.txt b/CHANGES.txt
index 3df60cc6deb9..c08e89a1bfb4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -45,6 +45,8 @@ Release 0.21.0 - Unreleased
    HBASE-1809  NPE thrown in BoundedRangeFileInputStream
    HBASE-1859  Misc shell fixes patch (Kyle Oba via Stack)
    HBASE-1865  0.20.0 TableInputFormatBase NPE
+   HBASE-1866  Scan(Scan) copy constructor does not copy value of
+               cacheBlocks
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/java/org/apache/hadoop/hbase/client/Scan.java b/src/java/org/apache/hadoop/hbase/client/Scan.java
index ab2a36452a8f..7aef19ade474 100644
--- a/src/java/org/apache/hadoop/hbase/client/Scan.java
+++ b/src/java/org/apache/hadoop/hbase/client/Scan.java
@@ -124,6 +124,7 @@ public Scan(Scan scan) throws IOException {
     stopRow  = scan.getStopRow();
     maxVersions = scan.getMaxVersions();
     caching = scan.getCaching();
+    cacheBlocks = scan.getCacheBlocks();
     filter = scan.getFilter(); // clone?
     TimeRange ctr = scan.getTimeRange();
     tr = new TimeRange(ctr.getMin(), ctr.getMax());
@@ -380,6 +381,8 @@ public String toString() {
     sb.append("""" + this.maxVersions);
     sb.append("", caching="");
     sb.append("""" + this.caching);
+    sb.append("", cacheBlocks="");
+    sb.append("""" + this.cacheBlocks);
     sb.append("", timeRange="");
     sb.append(""["" + this.tr.getMin() + "","" + this.tr.getMax() + "")"");
     sb.append("", families="");"
ca6ac1997f045f8093a563fb58b79c01bf7d01c3,hadoop,HDFS-7144. Fix findbugs warnings in- RamDiskReplicaTracker. (Contributed by Tsz Wo Nicholas Sze)--Conflicts:-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java
index 0899e703a9698..78080034ae8c7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java
@@ -40,6 +40,16 @@ private class RamDiskReplicaLru extends RamDiskReplica {
     private RamDiskReplicaLru(String bpid, long blockId, FsVolumeImpl ramDiskVolume) {
       super(bpid, blockId, ramDiskVolume);
     }
+
+    @Override
+    public int hashCode() {
+      return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      return super.equals(other);
+    }
   }
 
   /**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaTracker.java
index 03fc06802747a..24014247377d8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaTracker.java
@@ -19,6 +19,9 @@
 package org.apache.hadoop.hdfs.server.datanode.fsdataset.impl;
 
 import com.google.common.base.Preconditions;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -31,6 +34,7 @@
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public abstract class RamDiskReplicaTracker {
+  static final Log LOG = LogFactory.getLog(RamDiskReplicaTracker.class);
 
   FsDatasetImpl fsDataset;
 
@@ -117,18 +121,18 @@ public boolean equals(Object other) {
     // Delete the saved meta and block files. Failure to delete can be
     // ignored, the directory scanner will retry the deletion later.
     void deleteSavedFiles() {
-      try {
-        if (savedBlockFile != null) {
-          savedBlockFile.delete();
-          savedBlockFile = null;
+      if (savedBlockFile != null) {
+        if (!savedBlockFile.delete()) {
+          LOG.warn(""Failed to delete block file "" + savedBlockFile);
         }
+        savedBlockFile = null;
+      }
 
-        if (savedMetaFile != null) {
-          savedMetaFile.delete();
-          savedMetaFile = null;
+      if (savedMetaFile != null) {
+        if (!savedMetaFile.delete()) {
+          LOG.warn(""Failed to delete meta file "" + savedMetaFile);
         }
-      } catch (Throwable t) {
-        // Ignore any exceptions.
+        savedMetaFile = null;
       }
     }"
f0f7133a3ae5cff39e4f13643c346fe3b234a8ac,camel,CAMEL-751 fixed the spring configuration url- error--git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@679379 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/camel,"diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
index a0b3593b42a5c..1e9da2e0d1b90 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
@@ -30,7 +30,7 @@
 
 public class ErrorHandlerTest extends SpringTestSupport {
     protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext(""org/apache/camel/spring/errorHandler.xml"");
+        return new ClassPathXmlApplicationContext(""org/apache/camel/spring/config/errorHandler.xml"");
     }
 
     public void testEndpointConfiguration() throws Exception {"
2a7b848740cfe8eba6005803cf0167f54490c754,Vala,"Add more used attributes

Fixes bug 741089
",a,https://github.com/GNOME/vala/,"diff --git a/vala/valausedattr.vala b/vala/valausedattr.vala
index cdf895d5cc..9d0f18c8dc 100644
--- a/vala/valausedattr.vala
+++ b/vala/valausedattr.vala
@@ -50,6 +50,8 @@ public class Vala.UsedAttr : CodeVisitor {
 		""GenericAccessors"", """",
 		""Diagnostics"", """",
 		""NoAccessorMethod"", """",
+		""HasEmitter"", """",
+		""ReturnsModifiedPointer"", """",
 		""Deprecated"", ""since"", ""replacement"", """",
 		
 		""IntegerType"", ""rank"", ""min"", ""max"", """",
@@ -58,6 +60,10 @@ public class Vala.UsedAttr : CodeVisitor {
 		""SimpleType"", """",
 		""PrintfFormat"", """",
 		""ScanfFormat"", """",
+
+		""GtkChild"", ""name"", ""internal"", """",
+		""GtkTemplate"", ""ui"", """",
+		""GtkCallback"", ""name"", """",
 		
 		""GIR"", ""name"", """""
5ab247e291e7cf872be19b8141b7fe85af866d48,Valadoc,"gtkdoc-importer: Add support for sections
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index a437a663be..a91e1f5089 100644
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -882,12 +882,6 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 
 		LinkedList<Block> content = new LinkedList<Block> ();
 
-		if (current.type == TokenType.XML_OPEN && current.content == ""title"") {
-			append_block_content_not_null (content, parse_docbook_title ());
-			parse_docbook_spaces ();
-		}
-
-
 		content.add_all (parse_mixed_content ());
 
 		/*
@@ -932,11 +926,6 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 
 		LinkedList<Block> content = new LinkedList<Block> ();
 
-		if (current.type == TokenType.XML_OPEN && current.content == ""title"") {
-			append_block_content_not_null (content, parse_docbook_title ());
-			parse_docbook_spaces ();
-		}
-
 		this.append_block_content_not_null_all (content, parse_mixed_content ());
 
 		if (!check_xml_close_tag (""refsect2"")) {
@@ -1196,6 +1185,23 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		return table;
 	}
 
+	private LinkedList<Block> parse_docbook_section () {
+		if (!check_xml_open_tag (""section"")) {
+		}
+		string id = current.attributes.get (""id"");
+		next ();
+
+		LinkedList<Block> content = parse_mixed_content ();
+
+		if (!check_xml_close_tag (""section"")) {
+			this.report_unexpected_token (current, ""</section>"");
+			return content;
+		}
+
+		next ();
+		return content;
+	}
+
 	private LinkedList<Block> parse_block_content () {
 		LinkedList<Block> content = new LinkedList<Block> ();
 
@@ -1226,6 +1232,10 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 				this.append_block_content_not_null_all (content, parse_docbook_refsect2 ());
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""figure"") {
 				this.append_block_content_not_null_all (content, parse_docbook_figure ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""title"") {
+				this.append_block_content_not_null (content, parse_docbook_title ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""section"") {
+				this.append_block_content_not_null_all (content, parse_docbook_section ());
 			} else if (current.type == TokenType.GTKDOC_PARAGRAPH) {
 				this.append_block_content_not_null (content, parse_gtkdoc_paragraph ());
 			} else if (current.type == TokenType.GTKDOC_SOURCE_OPEN) {"
770ee735efa935a21b9992090eb063732e826ba5,ReactiveX-RxJava,Add unit tests for recursive scheduler usage--These tests came from @mairbek at https://github.com/Netflix/RxJava/pull/229-issuecomment-16115941-,p,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-core/src/test/java/rx/concurrency/TestSchedulers.java b/rxjava-core/src/test/java/rx/concurrency/TestSchedulers.java
index ec247d0b95..a4760ff65e 100644
--- a/rxjava-core/src/test/java/rx/concurrency/TestSchedulers.java
+++ b/rxjava-core/src/test/java/rx/concurrency/TestSchedulers.java
@@ -16,20 +16,24 @@
 package rx.concurrency;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 
 import rx.Observable;
 import rx.Observer;
+import rx.Scheduler;
 import rx.Subscription;
+import rx.subscriptions.BooleanSubscription;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action1;
 import rx.util.functions.Func1;
+import rx.util.functions.Func2;
 
 public class TestSchedulers {
 
@@ -245,4 +249,114 @@ public void call(Integer t) {
         assertEquals(5, count.get());
     }
 
+    @Test
+    public void testRecursiveScheduler1() {
+        Observable<Integer> obs = Observable.create(new Func1<Observer<Integer>, Subscription>() {
+            @Override
+            public Subscription call(final Observer<Integer> observer) {
+                return Schedulers.currentThread().schedule(0, new Func2<Scheduler, Integer, Subscription>() {
+                    @Override
+                    public Subscription call(Scheduler scheduler, Integer i) {
+                        if (i > 42) {
+                            observer.onCompleted();
+                            return Subscriptions.empty();
+                        }
+
+                        observer.onNext(i);
+
+                        return scheduler.schedule(i + 1, this);
+                    }
+                });
+            }
+        });
+
+        final AtomicInteger lastValue = new AtomicInteger();
+        obs.forEach(new Action1<Integer>() {
+
+            @Override
+            public void call(Integer v) {
+                System.out.println(""Value: "" + v);
+                lastValue.set(v);
+            }
+        });
+
+        assertEquals(42, lastValue.get());
+    }
+
+    @Test
+    public void testRecursiveScheduler2() throws InterruptedException {
+        // use latches instead of Thread.sleep
+        final CountDownLatch latch = new CountDownLatch(10);
+        final CountDownLatch completionLatch = new CountDownLatch(1);
+
+        Observable<Integer> obs = Observable.create(new Func1<Observer<Integer>, Subscription>() {
+            @Override
+            public Subscription call(final Observer<Integer> observer) {
+
+                return Schedulers.threadPoolForComputation().schedule(new BooleanSubscription(), new Func2<Scheduler, BooleanSubscription, Subscription>() {
+                    @Override
+                    public Subscription call(Scheduler scheduler, BooleanSubscription cancel) {
+                        if (cancel.isUnsubscribed()) {
+                            observer.onCompleted();
+                            completionLatch.countDown();
+                            return Subscriptions.empty();
+                        }
+
+                        observer.onNext(42);
+                        latch.countDown();
+
+                        try {
+                            Thread.sleep(1);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+
+                        scheduler.schedule(cancel, this);
+
+                        return cancel;
+                    }
+                });
+            }
+        });
+
+        @SuppressWarnings(""unchecked"")
+        Observer<Integer> o = mock(Observer.class);
+
+        final AtomicInteger count = new AtomicInteger();
+        final AtomicBoolean completed = new AtomicBoolean(false);
+        Subscription subscribe = obs.subscribe(new Observer<Integer>() {
+            @Override
+            public void onCompleted() {
+                System.out.println(""Completed"");
+                completed.set(true);
+            }
+
+            @Override
+            public void onError(Exception e) {
+                System.out.println(""Error"");
+            }
+
+            @Override
+            public void onNext(Integer args) {
+                count.incrementAndGet();
+                System.out.println(args);
+            }
+        });
+
+        if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
+            fail(""Timed out waiting on onNext latch"");
+        }
+
+        // now unsubscribe and ensure it stops the recursive loop
+        subscribe.unsubscribe();
+        System.out.println(""unsubscribe"");
+
+        if (!completionLatch.await(5000, TimeUnit.MILLISECONDS)) {
+            fail(""Timed out waiting on completion latch"");
+        }
+
+        assertEquals(10, count.get()); // wondering if this could be 11 in a race condition (which would be okay due to how unsubscribe works ... just it would make this test non-deterministic)
+        assertTrue(completed.get());
+    }
+
 }"
738a0163a28eb7559ff9934ce0b15355055fdfc2,frontlinesms-credit$plugin-paymentview,"Modified functionality of PaymentService start requests.
",p,https://github.com/frontlinesms-credit/plugin-paymentview,"diff --git a/src/main/java/net/frontlinesms/plugins/payment/service/PaymentServiceStartRequest.java b/src/main/java/net/frontlinesms/plugins/payment/service/PaymentServiceStartRequest.java
index 527df73f..d89968a3 100644
--- a/src/main/java/net/frontlinesms/plugins/payment/service/PaymentServiceStartRequest.java
+++ b/src/main/java/net/frontlinesms/plugins/payment/service/PaymentServiceStartRequest.java
@@ -1,15 +1,16 @@
 package net.frontlinesms.plugins.payment.service;
 
+import net.frontlinesms.data.domain.PersistableSettings;
 import net.frontlinesms.events.FrontlineEventNotification;
 
 public class PaymentServiceStartRequest implements FrontlineEventNotification {
-	private final long settingsId;
+	private final PersistableSettings settings;
 	
-	public PaymentServiceStartRequest(long settingsId) {
-		this.settingsId = settingsId;
+	public PaymentServiceStartRequest(PersistableSettings settings) {
+		this.settings = settings;
 	}
 	
-	public long getSettingsId() {
-		return settingsId;
+	public PersistableSettings getSettings() {
+		return settings;
 	}
 }
diff --git a/src/main/java/org/creditsms/plugins/paymentview/PaymentViewPluginController.java b/src/main/java/org/creditsms/plugins/paymentview/PaymentViewPluginController.java
index 0fd6c734..9ded1ddc 100644
--- a/src/main/java/org/creditsms/plugins/paymentview/PaymentViewPluginController.java
+++ b/src/main/java/org/creditsms/plugins/paymentview/PaymentViewPluginController.java
@@ -244,13 +244,8 @@ public void clearStatusBar(String message) {
 
 	public void notify(final FrontlineEventNotification notification) {
 		if(notification instanceof PaymentServiceStartRequest) {
-			long settingsId = ((PaymentServiceStartRequest) notification).getSettingsId();
-			try {
-				PersistableSettings settings = paymentServiceSettingsDao.getById(settingsId);
-				startService(settings);
-			} catch(Exception ex) {
-				log.warn(""Failed to start service for settings with ID "" + settingsId, ex);
-			}
+			PersistableSettings settings = ((PaymentServiceStartRequest) notification).getSettings();
+			startService(settings);
 		} else if(notification instanceof DatabaseEntityNotification<?>) {
 			Object entity = ((DatabaseEntityNotification<?>) notification).getDatabaseEntity();
 			if(entity instanceof PersistableSettings) {
diff --git a/src/test/java/org/creditsms/plugins/paymentview/PaymentViewPluginControllerTest.java b/src/test/java/org/creditsms/plugins/paymentview/PaymentViewPluginControllerTest.java
index 3eef4ec4..e6a5303f 100644
--- a/src/test/java/org/creditsms/plugins/paymentview/PaymentViewPluginControllerTest.java
+++ b/src/test/java/org/creditsms/plugins/paymentview/PaymentViewPluginControllerTest.java
@@ -105,10 +105,9 @@ public void testRequestForServiceStartHonoured() {
 		// given
 		assertEquals(0, controller.getActiveServices().size());
 		PersistableSettings mockSettings = mockSettings();
-		when(settingsDao.getById(1)).thenReturn(mockSettings);
 		
 		// when
-		controller.notify(new PaymentServiceStartRequest(1));
+		controller.notify(new PaymentServiceStartRequest(mockSettings));
 		
 		// then
 		assertEquals(1, controller.getActiveServices().size());"
5cea1f83748ed49c4cf9d2612c55ab7101599186,fozziethebeat$s-space,"Changes based on Keith's review.  A few tweaks to EdgeSet to help tracking edge
removal
modified:   src/edu/ucla/sspace/common/Similarity.java
- Updated to use VectorMath.dotProduct for the Tanimoto coefficient
deleted:    src/edu/ucla/sspace/common/WordComparator.java
- Moved to SimpleNearestNeighborFinder
modified:   src/edu/ucla/sspace/dependency/SimpleDependencyPath.java
- Removed println
modified:   src/edu/ucla/sspace/graph/AbstractGraph.java
- Added missing implementation to Subgraph class so now all the unit tests pass
modified:   src/edu/ucla/sspace/graph/DirectedMultigraph.java
- Added missing implementation to Subgraph class so now all the unit tests pass
- Fixed bug for reporting the correct edge types after removal
- Removed dead code
modified:   src/edu/ucla/sspace/graph/EdgeSet.java
- Updated so that disconnect() now returns the number of edges that were removed
modified:   src/edu/ucla/sspace/graph/GenericEdgeSet.java
modified:   src/edu/ucla/sspace/graph/SparseDirectedEdgeSet.java
modified:   src/edu/ucla/sspace/graph/SparseDirectedTypedEdgeSet.java
modified:   src/edu/ucla/sspace/graph/SparseTypedEdgeSet.java
modified:   src/edu/ucla/sspace/graph/SparseUndirectedEdgeSet.java
modified:   src/edu/ucla/sspace/graph/SparseWeightedEdgeSet.java
- Updated to support EdgeSet interface change
deleted:    src/edu/ucla/sspace/graph/GraphRandomizer.java
- Removed dead class (functionality is in Graphs.java)
modified:   src/edu/ucla/sspace/graph/SimpleWeightedEdge.java
- Fixed hashCode()
deleted:    src/edu/ucla/sspace/graph/SparseSymmetricEdgeSet.java
- Removed dead class
modified:   src/edu/ucla/sspace/graph/UndirectedMultigraph.java
- Added missing implementation to Subgraph class so now all the unit tests pass
- Fixed bug for reporting the correct edge types after removal
- Removed dead code
modified:   src/edu/ucla/sspace/mains/FixedDurationTemporalRandomIndexingMain.java
- Updated to replace WordComparator with SimpleNearestNeighborFinder
modified:   src/edu/ucla/sspace/mains/LexSubWordsiMain.java
- Updated to replace WordComparator with SimpleNearestNeighborFinder
modified:   src/edu/ucla/sspace/text/LabeledParsedStringDocument.java
- Updated for new ParsedDocument interface
modified:   src/edu/ucla/sspace/text/ParsedDocument.java
- Updated to specify the format of text() as the tokens with white space delimiters.
- Added a new prettyPrintText() which is the attempt to nicely format the tokens
as they would have been originally.
modified:   src/edu/ucla/sspace/text/PukWaCDocumentIterator.java
- Fixed javadoc
modified:   src/edu/ucla/sspace/text/UkWaCDocumentIterator.java
- Added more class javadoc
modified:   src/edu/ucla/sspace/tools/NearestNeighborFinderTool.java
- Updated to use the class instances instead of the interface
modified:   src/edu/ucla/sspace/tools/SemanticSpaceExplorer.java
- Updated to replace WordComparator with PartitioningNearestNeighborFinder
modified:   src/edu/ucla/sspace/tools/SimilarityListGenerator.java
- Updated to replace WordComparator with PartitioningNearestNeighborFinder
modified:   src/edu/ucla/sspace/util/HashIndexer.java
- Fixed javadoc
modified:   src/edu/ucla/sspace/util/PairCounter.java
- Fixed javadoc
renamed:    src/edu/ucla/sspace/util/NearestNeighborFinder.java -> src/edu/ucla/sspace/util/PartitioningNearestNeighborFinder.java
- Moved so that NearestNeighborFinder can be an interface
modified:   src/edu/ucla/sspace/util/ReflectionUtil.java
- Removed dead code
modified:   src/edu/ucla/sspace/util/primitive/IntIntHashMultiMap.java
- Added javadoc
modified:   src/edu/ucla/sspace/util/primitive/IntIntMultiMap.java
- Added javadoc
modified:   test/edu/ucla/sspace/graph/DirectedMultigraphTests.java
- Uncommented out unit tests
modified:   test/edu/ucla/sspace/dependency/BreadthFirstPathIteratorTest.java
modified:   test/edu/ucla/sspace/dependency/CoNLLDependencyExtractorTest.java
modified:   test/edu/ucla/sspace/dependency/WaCKyDependencyExtractorTest.java
modified:   test/edu/ucla/sspace/text/corpora/PukWacDependencyCorpusReaderTest.java
modified:   test/edu/ucla/sspace/wordsi/DependencyContextExtractorTest.java
modified:   test/edu/ucla/sspace/wordsi/OccurrenceDependencyContextGeneratorTest.java
modified:   test/edu/ucla/sspace/wordsi/OrderingDependencyContextGeneratorTest.java
modified:   test/edu/ucla/sspace/wordsi/PartOfSpeechDependencyContextGeneratorTest.java
modified:   test/edu/ucla/sspace/wordsi/psd/PseudoWordDependencyContextExtractorTest.java
modified:   test/edu/ucla/sspace/wordsi/semeval/SemEvalDependencyContextExtractorTest.java
- Fixed unit tests to support proper tab-delimiting of the CoNLL format
",p,https://github.com/fozziethebeat/s-space,"diff --git a/src/edu/ucla/sspace/common/Similarity.java b/src/edu/ucla/sspace/common/Similarity.java
index d56934dd..8a46db3b 100644
--- a/src/edu/ucla/sspace/common/Similarity.java
+++ b/src/edu/ucla/sspace/common/Similarity.java
@@ -41,6 +41,7 @@
 import edu.ucla.sspace.vector.IntegerVector;
 import edu.ucla.sspace.vector.SparseVector;
 import edu.ucla.sspace.vector.Vector;
+import edu.ucla.sspace.vector.VectorMath;
 import edu.ucla.sspace.vector.Vectors;
 import edu.ucla.sspace.vector.SparseIntegerVector;
 
@@ -2187,7 +2188,7 @@ public static double tanimotoCoefficient(Vector a, Vector b) {
     public static double tanimotoCoefficient(DoubleVector a, DoubleVector b) {
         check(a,b);
 
-        // IMPLEMENTATION NOTE: The Tanimoto coefficient uses the squart of the
+        // IMPLEMENTATION NOTE: The Tanimoto coefficient uses the square of the
         // vector magnitudes, which we could compute by just summing the square
         // of the vector values.  This would save a .sqrt() call from the
         // .magnitude() call.  However, we expect that this method might be
@@ -2195,83 +2196,13 @@ public static double tanimotoCoefficient(DoubleVector a, DoubleVector b) {
         // should only be two multiplications instaned of |nz| multiplications
         // on the second call (assuming the vector instances cache their
         // magnitude, which almost all do).
-        double dotProduct = 0.0;
         double aMagnitude = a.magnitude();
         double bMagnitude = b.magnitude();
-
-        // Check whether both vectors support fast iteration over their non-zero
-        // values.  If so, use only the non-zero indices to speed up the
-        // computation by avoiding zero multiplications
-        if (a instanceof Iterable && b instanceof Iterable) {
-            // Check whether we can easily determine how many non-zero values
-            // are in each vector.  This value is used to select the iteration
-            // order, which affects the number of get(value) calls.
-            boolean useA =
-                (a instanceof SparseVector && b instanceof SparseVector)
-                && ((SparseVector)a).getNonZeroIndices().length <
-                   ((SparseVector)b).getNonZeroIndices().length;
-            
-            // Choose the smaller of the two to use in computing the dot
-            // product.  Because it would be more expensive to compute the
-            // intersection of the two sets, we assume that any potential
-            // misses would be less of a performance hit.
-            if (useA) {
-                for (DoubleEntry e : ((Iterable<DoubleEntry>)a)) {
-                    int index = e.index();                    
-                    double aValue = e.value();
-                    double bValue = b.get(index);
-                    dotProduct += aValue * bValue;
-                }
-            }
-            else {
-                for (DoubleEntry e : ((Iterable<DoubleEntry>)b)) {
-                    int index = e.index();                    
-                    double aValue = a.get(index);
-                    double bValue = e.value();
-                    dotProduct += aValue * bValue;
-                }
-            }            
-        }
-
-        // Check whether both vectors are sparse.  If so, use only the non-zero
-        // indices to speed up the computation by avoiding zero multiplications
-        else if (a instanceof SparseVector && b instanceof SparseVector) {
-            SparseVector svA = (SparseVector)a;
-            SparseVector svB = (SparseVector)b;
-            int[] nzA = svA.getNonZeroIndices();
-            int[] nzB = svB.getNonZeroIndices();
-            // Choose the smaller of the two to use in computing the dot
-            // product.  Because it would be more expensive to compute the
-            // intersection of the two sets, we assume that any potential
-            // misses would be less of a performance hit.
-            if (nzA.length < nzB.length) {
-                for (int nz : nzA) {
-                    double aValue = a.get(nz);
-                    double bValue = b.get(nz);
-                    dotProduct += aValue * bValue;
-                }
-            }
-            else {
-                for (int nz : nzB) {
-                    double aValue = a.get(nz);
-                    double bValue = b.get(nz);
-                    dotProduct += aValue * bValue;
-                }
-            }
-        }
-
-        // Otherwise, just assume both are dense and compute the full amount
-        else {
-            for (int i = 0; i < b.length(); i++) {
-                double aValue = a.get(i);
-                double bValue = b.get(i);
-                dotProduct += aValue * bValue;
-            }
-        }
-        
+       
         if (aMagnitude == 0 || bMagnitude == 0)
             return 0;
-        
+
+        double dotProduct = VectorMath.dotProduct(a, b);        
         double aMagSq = aMagnitude * aMagnitude;
         double bMagSq = bMagnitude * bMagnitude;
 
@@ -2297,82 +2228,13 @@ public static double tanimotoCoefficient(IntegerVector a, IntegerVector b) {
         // should only be two multiplications instaned of |nz| multiplications
         // on the second call (assuming the vector instances cache their
         // magnitude, which almost all do).
-        int dotProduct = 0;
         double aMagnitude = a.magnitude();
         double bMagnitude = b.magnitude();
 
-        // Check whether both vectors support fast iteration over their non-zero
-        // values.  If so, use only the non-zero indices to speed up the
-        // computation by avoiding zero multiplications
-        if (a instanceof Iterable && b instanceof Iterable) {
-            // Check whether we can easily determine how many non-zero values
-            // are in each vector.  This value is used to select the iteration
-            // order, which affects the number of get(value) calls.
-            boolean useA =
-                (a instanceof SparseVector && b instanceof SparseVector)
-                && ((SparseVector)a).getNonZeroIndices().length <
-                   ((SparseVector)b).getNonZeroIndices().length;
-            // Choose the smaller of the two to use in computing the dot
-            // product.  Because it would be more expensive to compute the
-            // intersection of the two sets, we assume that any potential
-            // misses would be less of a performance hit.
-            if (useA) {
-                for (IntegerEntry e : ((Iterable<IntegerEntry>)a)) {
-                    int index = e.index();                    
-                    int aValue = e.value();
-                    int bValue = b.get(index);
-                    dotProduct += aValue * bValue;
-                }
-            }
-            else {
-                for (IntegerEntry e : ((Iterable<IntegerEntry>)b)) {
-                    int index = e.index();                    
-                    int aValue = a.get(index);
-                    int bValue = e.value();
-                    dotProduct += aValue * bValue;
-                }
-            }            
-        }
-
-        // Check whether both vectors are sparse.  If so, use only the non-zero
-        // indices to speed up the computation by avoiding zero multiplications
-        else if (a instanceof SparseVector && b instanceof SparseVector) {
-            SparseVector svA = (SparseVector)a;
-            SparseVector svB = (SparseVector)b;
-            int[] nzA = svA.getNonZeroIndices();
-            int[] nzB = svB.getNonZeroIndices();
-            // Choose the smaller of the two to use in computing the dot
-            // product.  Because it would be more expensive to compute the
-            // intersection of the two sets, we assume that any potential
-            // misses would be less of a performance hit.
-            if (nzA.length < nzB.length) {
-                for (int nz : nzA) {
-                    int aValue = a.get(nz);
-                    int bValue = b.get(nz);
-                    dotProduct += aValue * bValue;
-                }
-            }
-            else {
-                for (int nz : nzB) {
-                    int aValue = a.get(nz);
-                    int bValue = b.get(nz);
-                    dotProduct += aValue * bValue;
-                }
-            }
-        }
-
-        // Otherwise, just assume both are dense and compute the full amount
-        else {
-            for (int i = 0; i < b.length(); i++) {
-                int aValue = a.get(i);
-                int bValue = b.get(i);
-                dotProduct += aValue * bValue;
-            }
-        }
-
         if (aMagnitude == 0 || bMagnitude == 0)
             return 0;
-        
+
+        int dotProduct = VectorMath.dotProduct(a, b);        
         double aMagSq = aMagnitude * aMagnitude;
         double bMagSq = bMagnitude * bMagnitude;
 
diff --git a/src/edu/ucla/sspace/common/WordComparator.java b/src/edu/ucla/sspace/common/WordComparator.java
deleted file mode 100644
index f6b76303..00000000
--- a/src/edu/ucla/sspace/common/WordComparator.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2009 David Jurgens
- *
- * This file is part of the S-Space package and is covered under the terms and
- * conditions therein.
- *
- * The S-Space package is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation and distributed hereunder to you.
- *
- * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
- * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
- * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
- * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
- * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
- * RIGHTS.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package edu.ucla.sspace.common;
-
-import edu.ucla.sspace.util.BoundedSortedMultiMap;
-import edu.ucla.sspace.util.MultiMap;
-import edu.ucla.sspace.util.SortedMultiMap;
-import edu.ucla.sspace.util.WorkQueue;
-
-import edu.ucla.sspace.vector.Vector;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
-
-/**
- * A utility class for finding the {@code k} most-similar words to a provided
- * word in a {@link SemanticSpace}.  The comparisons required for generating the
- * list maybe be run in parallel by configuring an instance of this class to use
- * multiple threads. <p>
- *
- * All instances of this class are thread-safe.
- * 
- * @author David Jurgens
- */
-public class WordComparator {
-
-    /**
-     * The {@link WorkQueue} from which worker threads run word-word comparisons
-     */
-    private final WorkQueue workQueue;
-    
-    /**
-     * Creates this {@code WordComparator} with as many threads as processors.
-     */
-    public WordComparator() {
-        this(Runtime.getRuntime().availableProcessors());
-    }
-    
-    /**
-     * Creates this {@code WordComparator} with the specified number of threads.
-     */
-    public WordComparator(int numThreads) {
-        workQueue = WorkQueue.getWorkQueue(numThreads);
-    }
-
-    /**
-     * Compares the provided word to all other words in the provided {@link
-     * SemanticSpace} and return the specified number of words that were most
-     * similar according to the specified similarity measure.
-     *
-     * @return the most similar words, or {@code null} if the provided word was
-     *         not in the semantic space.
-     */
-    public SortedMultiMap<Double,String> getMostSimilar(
-            final String word, final SemanticSpace sspace,
-            int numberOfSimilarWords, final Similarity.SimType similarityType) {
-
-        Vector v = sspace.getVector(word);
-
-        // if the semantic space did not have the word, then return null
-        if (v == null) {
-            return null;
-        }
-        
-        final Vector vector = v;
-        return getMostSimilar(v, sspace, numberOfSimilarWords, similarityType);
-    }
-
-    public SortedMultiMap<Double,String> getMostSimilar(
-            final Vector vector, final SemanticSpace sspace,
-            int numberOfSimilarWords, final Similarity.SimType similarityType) {
-        Set<String> words = sspace.getWords();
-        
-        // the most-similar set will automatically retain only a fixed number
-        // of elements
-        final SortedMultiMap<Double,String> mostSimilar =
-            new BoundedSortedMultiMap<Double,String>(numberOfSimilarWords,
-                                                     false);
-
-        Object key = workQueue.registerTaskGroup(words.size());
-
-        // loop through all the other words computing their similarity
-        for (final String other : words) {
-            workQueue.add(key, new Runnable() {
-                public void run() {
-                    Vector otherV = sspace.getVector(other);
-                    // Skip the comparison if the vectors are actually the same.
-                    if (otherV == vector)
-                        return;
-
-                    Double similarity = Similarity.getSimilarity(
-                        similarityType, vector, otherV);
-                    
-                    // lock on the Map, as it is not thread-safe
-                    synchronized(mostSimilar) {
-                        mostSimilar.put(similarity, other);
-                    }
-                }
-            });
-        }
-        
-        workQueue.await(key);
-        return mostSimilar;
-    }
-}
diff --git a/src/edu/ucla/sspace/dependency/SimpleDependencyPath.java b/src/edu/ucla/sspace/dependency/SimpleDependencyPath.java
index 576caa6f..51343ad8 100644
--- a/src/edu/ucla/sspace/dependency/SimpleDependencyPath.java
+++ b/src/edu/ucla/sspace/dependency/SimpleDependencyPath.java
@@ -73,7 +73,6 @@ public SimpleDependencyPath(List<DependencyRelation> path,
             nodes.add(next);
             cur = next;
         }
-        System.out.printf(""path: %s,%nnodes: %s%n"", path, nodes);
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/AbstractGraph.java b/src/edu/ucla/sspace/graph/AbstractGraph.java
index 2ffa38fe..d9189a42 100755
--- a/src/edu/ucla/sspace/graph/AbstractGraph.java
+++ b/src/edu/ucla/sspace/graph/AbstractGraph.java
@@ -967,8 +967,10 @@ public Set<T> getAdjacencyList(int vertex) {
          * {@inheritDoc}
          */
         public IntSet getNeighbors(int vertex) {
-             if (!vertexSubset.contains(vertex))
-                 return PrimitiveCollections.emptyIntSet();
+            return (!vertexSubset.contains(vertex))
+                ? PrimitiveCollections.emptyIntSet()
+                : new SubgraphNeighborsView(vertex);
+                /*
              // REMINDER: make this a view, rather than a created set
              IntSet neighbors = new TroveIntSet();
              IntIterator it = 
@@ -979,6 +981,7 @@ public IntSet getNeighbors(int vertex) {
                      neighbors.add(v);
              }
              return neighbors;
+                */
         }
         
         /**
@@ -1084,7 +1087,7 @@ public IntSet vertices() {
          * subgraph.  This class monitors for changes to edge set to update the
          * state of this graph
          */
-        private class SubgraphAdjacencyListView  extends AbstractSet<T> {
+        private class SubgraphAdjacencyListView extends AbstractSet<T> {
 
             private final int root;
 
@@ -1275,7 +1278,7 @@ public void remove() {
          * subview.  This view monitors for additions and removals to the set in
          * order to update the state of this {@code Subgraph}.
          */
-        private class SubgraphNeighborsView extends AbstractSet<Integer> {
+        private class SubgraphNeighborsView extends AbstractIntSet {
 
             private int root;
             
@@ -1285,15 +1288,20 @@ private class SubgraphNeighborsView extends AbstractSet<Integer> {
             public SubgraphNeighborsView(int root) {
                 this.root = root;
             }
+
+            public boolean add(int vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot add vertices to subgraph"");
+            }
             
-            /**
-             * Adds an edge to this vertex and adds the vertex to the graph if it
-             * was not present before.
-             */
             public boolean add(Integer vertex) {
                 throw new UnsupportedOperationException(
                     ""Cannot add vertices to subgraph"");
             }
+
+            public boolean contains(int vertex) {
+                return vertexSubset.contains(vertex) && checkVertex(vertex);
+            }
             
             public boolean contains(Object o) {
                 if (!(o instanceof Integer))
@@ -1309,12 +1317,18 @@ private boolean checkVertex(int i) {
                 return AbstractGraph.this.contains(i, root);
             }
 
-            public Iterator<Integer> iterator() {
+            public IntIterator iterator() {
                 return new SubgraphNeighborsIterator();
             }
             
-            public boolean remove(Object o) {
-                throw new UnsupportedOperationException();
+            public boolean remove(int vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot remove vertices from subgraph"");
+            }
+            
+            public boolean remove(Object vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot remove vertices from subgraph"");
             }
             
             public int size() {
@@ -1333,7 +1347,7 @@ public int size() {
              * vertices set, which keeps track of which neighboring vertices are
              * actually in this subview.
              */
-            private class SubgraphNeighborsIterator implements Iterator<Integer> {
+            private class SubgraphNeighborsIterator implements IntIterator {
 
                 private final IntIterator iter;
 
@@ -1368,6 +1382,10 @@ public Integer next() {
                     return cur;
                 }
 
+                public int nextInt() {
+                    return next();
+                }
+
                 /**
                  * Throws an {@link UnsupportedOperationException} if called.
                  */
diff --git a/src/edu/ucla/sspace/graph/DirectedMultigraph.java b/src/edu/ucla/sspace/graph/DirectedMultigraph.java
index 9a2b60c5..0792e9d1 100644
--- a/src/edu/ucla/sspace/graph/DirectedMultigraph.java
+++ b/src/edu/ucla/sspace/graph/DirectedMultigraph.java
@@ -43,6 +43,8 @@
 import edu.ucla.sspace.util.DisjointSets;
 import edu.ucla.sspace.util.SetDecorator;
 
+import edu.ucla.sspace.util.primitive.AbstractIntSet;
+import edu.ucla.sspace.util.primitive.IntIterator;
 import edu.ucla.sspace.util.primitive.IntSet;
 import edu.ucla.sspace.util.primitive.PrimitiveCollections;
 import edu.ucla.sspace.util.primitive.TroveIntSet;
@@ -51,8 +53,9 @@
 import gnu.trove.iterator.TIntIterator;
 import gnu.trove.iterator.TIntObjectIterator;
 import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.map.hash.TObjectIntHashMap;
 import gnu.trove.set.TIntSet;
 import gnu.trove.set.hash.TIntHashSet;
 
@@ -72,9 +75,9 @@ public class DirectedMultigraph<T>
     private static final long serialVersionUID = 1L;
    
     /**
-     * The set of types contained in this graph.
+     * The count of the type distribution for all edges in the graph.
      */
-    private final Set<T> types;
+    private final TObjectIntMap<T> typeCounts;
     
     /**
      * The set of vertices in this mutligraph.  This set is maintained
@@ -104,7 +107,7 @@ public class DirectedMultigraph<T>
      * Creates an empty graph with node edges
      */
     public DirectedMultigraph() { 
-        types = new HashSet<T>();
+        typeCounts = new TObjectIntHashMap<T>();
         vertexToEdges = new TIntObjectHashMap<SparseDirectedTypedEdgeSet<T>>();
         subgraphs = new ArrayList<WeakReference<Subgraph>>();
         size = 0;
@@ -143,7 +146,7 @@ public boolean add(DirectedTypedEdge<T> e) {
             vertexToEdges.put(e.from(), from);
         }
         if (from.add(e)) {
-            types.add(e.edgeType());
+            updateTypeCounts(e.edgeType(), 1);
             SparseDirectedTypedEdgeSet<T> to = vertexToEdges.get(e.to());
             if (to == null) {
                 to = new SparseDirectedTypedEdgeSet<T>(e.to());
@@ -161,7 +164,7 @@ public boolean add(DirectedTypedEdge<T> e) {
      */
     public void clear() {
         vertexToEdges.clear();
-        types.clear();
+        typeCounts.clear();
         size = 0;
     }
 
@@ -225,14 +228,10 @@ public DirectedMultigraph<T> copy(Set<Integer> toCopy) {
             return new DirectedMultigraph<T>(this);
 
         DirectedMultigraph<T> g = new DirectedMultigraph<T>();
-        //long s = System.currentTimeMillis();
         for (int v : toCopy) {
             if (!vertexToEdges.containsKey(v))
                 throw new IllegalArgumentException(
                     ""Request copy of non-present vertex: "" + v);
-//              SparseDirectedTypedEdgeSet<T> edges = vertexToEdges.get(v);
-//              g.vertexToEdges.put(v, edges.copy(toCopy));
-
             g.add(v);
             SparseDirectedTypedEdgeSet<T> edges = vertexToEdges.get(v);
             if (edges == null)
@@ -245,8 +244,6 @@ public DirectedMultigraph<T> copy(Set<Integer> toCopy) {
                         g.add(e);
             }
         }
-//         if (toCopy.size() > 0)
-//             System.out.printf(""Copy %d vertices (%d), %d edges%n"", g.order(), toCopy.size(), g.size());
         return g;
     }
 
@@ -284,7 +281,7 @@ public Set<DirectedTypedEdge<T>> edges(T t) {
      * Returns the set of edge types currently present in this graph.
      */
     public Set<T> edgeTypes() {
-        return Collections.unmodifiableSet(types);
+        return Collections.unmodifiableSet(typeCounts.keySet());
     }
 
     /**
@@ -293,7 +290,7 @@ public Set<T> edgeTypes() {
     @Override public boolean equals(Object o) {
         if (o instanceof DirectedMultigraph) {
             DirectedMultigraph<?> dm = (DirectedMultigraph<?>)(o);
-            if (dm.types.equals(types)) {
+            if (dm.typeCounts.equals(typeCounts)) {
                 return vertexToEdges.equals(dm.vertexToEdges);
             }
             return false;
@@ -301,7 +298,7 @@ public Set<T> edgeTypes() {
         else if (o instanceof Multigraph) {
             @SuppressWarnings(""unchecked"")
             Multigraph<?,TypedEdge<?>> m = (Multigraph<?,TypedEdge<?>>)o;
-            if (m.edgeTypes().equals(types)) {
+            if (m.edgeTypes().equals(typeCounts.keySet())) {
                 return m.order() == order()
                     && m.size() == size()
                     && m.vertices().equals(vertices())
@@ -372,7 +369,7 @@ public boolean hasCycles() {
      * {@inheritDoc}
      */
     public int hashCode() {
-        return vertexToEdges.keySet().hashCode() ^ (types.hashCode() * size);
+        return vertexToEdges.keySet().hashCode() ^ (typeCounts.hashCode() * size);
     }
 
     /**
@@ -448,6 +445,8 @@ public boolean remove(int vertex) {
             // Check whether removing this vertex has caused us to remove
             // the last edge for this type in the graph.  If so, the graph
             // no longer has this type and we need to update the state.
+            for (DirectedTypedEdge<T> e : edges)
+                updateTypeCounts(e.edgeType(), -1);
 
             // Update any of the subgraphs that had this vertex to notify them
             // that it was removed
@@ -467,7 +466,7 @@ public boolean remove(int vertex) {
                 if (s.vertexSubset.remove(vertex)) {
                     Iterator<T> subgraphTypesIter = s.validTypes.iterator();
                     while (subgraphTypesIter.hasNext()) {
-                        if (!types.contains(subgraphTypesIter.next()))
+                        if (!typeCounts.containsKey(subgraphTypesIter.next()))
                             subgraphTypesIter.remove();
                     }
                 }
@@ -488,25 +487,24 @@ public boolean remove(DirectedTypedEdge<T> edge) {
             // Check whether we've just removed the last edge for this type
             // in the graph.  If so, the graph no longer has this type and
             // we need to update the state.
-
-            // TODO !!
-
-
-            // Remove this edge type from all the subgraphs as well
-            Iterator<WeakReference<Subgraph>> sIt = subgraphs.iterator();
-            while (sIt.hasNext()) {
-                WeakReference<Subgraph> ref = sIt.next();
-                Subgraph s = ref.get();
-                // Check whether this subgraph was already gc'd (the
-                // subgraph was no longer in use) and if so, remove the
-                // ref from the list to avoid iterating over it again
-                if (s == null) {
-                    sIt.remove();
-                    continue;
+            updateTypeCounts(edge.edgeType(), -1);
+
+            if (!typeCounts.containsKey(edge.edgeType())) {
+                // Remove this edge type from all the subgraphs as well
+                Iterator<WeakReference<Subgraph>> sIt = subgraphs.iterator();
+                while (sIt.hasNext()) {
+                    WeakReference<Subgraph> ref = sIt.next();
+                    Subgraph s = ref.get();
+                    // Check whether this subgraph was already gc'd (the
+                    // subgraph was no longer in use) and if so, remove the
+                    // ref from the list to avoid iterating over it again
+                    if (s == null) {
+                        sIt.remove();
+                        continue;
+                    }
+                    s.validTypes.remove(edge.edgeType());
                 }
-                // FILL IN...
             }
-
             return true;
         }
         return false;
@@ -517,19 +515,6 @@ public boolean remove(DirectedTypedEdge<T> edge) {
      */
     public int size() {
         return size;
-//         CountingProcedure count = new CountingProcedure();
-//         vertexToEdges.forEachValue(count);
-//         return count.count / 2;
-    }
-
-    private class CountingProcedure 
-            implements TObjectProcedure<SparseDirectedTypedEdgeSet<T>> {
-
-        int count = 0;
-        public boolean execute(SparseDirectedTypedEdgeSet<T> edges) {
-            count += edges.size();
-            return true;
-        }
     }
 
     /**
@@ -546,7 +531,7 @@ public IntSet successors(int vertex) {
      * {@inheritDoc}
      */
     public DirectedMultigraph<T> subgraph(Set<Integer> subset) {
-        Subgraph sub = new Subgraph(types, subset);
+        Subgraph sub = new Subgraph(typeCounts.keySet(), subset);
         subgraphs.add(new WeakReference<Subgraph>(sub));
         return sub;
     }
@@ -557,7 +542,7 @@ public DirectedMultigraph<T> subgraph(Set<Integer> subset) {
     public DirectedMultigraph<T> subgraph(Set<Integer> subset, Set<T> edgeTypes) {
         if (edgeTypes.isEmpty()) 
             throw new IllegalArgumentException(""Must specify at least one type"");
-        if (!types.containsAll(edgeTypes)) {
+        if (!typeCounts.keySet().containsAll(edgeTypes)) {
             throw new IllegalArgumentException(
                 ""Cannot create subgraph with more types than exist"");
         }
@@ -574,12 +559,33 @@ public String toString() {
         return ""{ vertices: "" + vertices() + "", edges: "" + edges() + ""}"";
     }
 
+    /**
+     * Updates how many edges have this type in the graph
+     */
+    private void updateTypeCounts(T type, int delta) {
+        if (!typeCounts.containsKey(type)) {
+            assert delta > 0 
+                : ""removing edge type that was not originally present"";
+            typeCounts.put(type, delta);
+        }
+        else {
+            int curCount = typeCounts.get(type);
+            int newCount = curCount + delta;
+            assert newCount >= 0 
+                : ""removing edge type that was not originally present"";
+            if (newCount == 0)
+                typeCounts.remove(type);
+            else
+                typeCounts.put(type, newCount);
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
     public IntSet vertices() {
-        // TODO: make this unmodifiable
-        return TroveIntSet.wrap(vertexToEdges.keySet());
+        return PrimitiveCollections.unmodifiableSet(
+            TroveIntSet.wrap(vertexToEdges.keySet()));
     }
 
     /**
@@ -611,8 +617,8 @@ public Iterator<DirectedTypedEdge<T>> iterator() {
         public boolean remove(Object o) {
             if (o instanceof DirectedTypedEdge) {
                 DirectedTypedEdge<?> e = (DirectedTypedEdge<?>)o;
-                return DirectedMultigraph.this.types.
-                           contains(e.edgeType())
+                return DirectedMultigraph.this.typeCounts.
+                           containsKey(e.edgeType())
                     && DirectedMultigraph.this.remove((DirectedTypedEdge<T>)o);
             }
             return false;
@@ -933,7 +939,7 @@ public IntSet getNeighbors(int vertex) {
             SparseDirectedTypedEdgeSet<T> edges = vertexToEdges.get(vertex);
             return (edges == null) 
                 ? PrimitiveCollections.emptyIntSet()
-                : PrimitiveCollections.unmodifiableSet(edges.connected());
+                : new SubgraphNeighborsView(vertex);
         }
 
         /**
@@ -947,7 +953,7 @@ public boolean hasCycles() {
          * {@inheritDoc}
          */
         public int hashCode() {
-            return vertices().hashCode() ^ (types.hashCode() * size());
+            return vertices().hashCode() ^ (validTypes.hashCode() * size());
         }
 
         /**
@@ -1118,7 +1124,6 @@ public DirectedMultigraph<T> subgraph(Set<Integer> verts, Set<T> edgeTypes) {
          * {@inheritDoc}
          */
         public IntSet vertices() {
-            // Check that the vertices are up to date with the backing graph
             return PrimitiveCollections.unmodifiableSet(vertexSubset);
         }
 
@@ -1323,7 +1328,7 @@ public void remove() {
          * subview.  This view monitors for additions and removals to the set in
          * order to update the state of this {@code Subgraph}.
          */
-        private class SubgraphNeighborsView extends AbstractSet<Integer> {
+        private class SubgraphNeighborsView extends AbstractIntSet {
 
             private int root;
             
@@ -1333,15 +1338,21 @@ private class SubgraphNeighborsView extends AbstractSet<Integer> {
             public SubgraphNeighborsView(int root) {
                 this.root = root;
             }
+
+            public boolean add(int vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot add vertices to subgraph"");
+            }
             
-            /**
-             * Adds an edge to this vertex and adds the vertex to the graph if it
-             * was not present before.
-             */
             public boolean add(Integer vertex) {
                 throw new UnsupportedOperationException(
                     ""Cannot add vertices to subgraph"");
             }
+
+            public boolean contains(int vertex) {
+                return vertexSubset.contains(vertex) 
+                    && isNeighboringVertex(vertex);
+            }
             
             public boolean contains(Object o) {
                 if (!(o instanceof Integer))
@@ -1354,12 +1365,18 @@ private boolean isNeighboringVertex(Integer i) {
                 return Subgraph.this.contains(root, i);
             }
 
-            public Iterator<Integer> iterator() {
+            public IntIterator iterator() {
                 return new SubgraphNeighborsIterator();
             }
             
-            public boolean remove(Object o) {
-                throw new UnsupportedOperationException();
+            public boolean remove(int vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot remove vertices from subgraph"");
+            }
+            
+            public boolean remove(Object vertex) {
+                throw new UnsupportedOperationException(
+                    ""Cannot remove vertices from subgraph"");
             }
             
             public int size() {
@@ -1376,7 +1393,7 @@ public int size() {
              * vertices set, which keeps track of which neighboring vertices are
              * actually in this subview.
              */
-            private class SubgraphNeighborsIterator implements Iterator<Integer> {
+            private class SubgraphNeighborsIterator implements IntIterator {
 
                 private final Iterator<Integer> iter;
 
@@ -1411,6 +1428,10 @@ public Integer next() {
                     return cur;
                 }
 
+                public int nextInt() {
+                    return next();
+                }
+
                 /**
                  * Throws an {@link UnsupportedOperationException} if called.
                  */
diff --git a/src/edu/ucla/sspace/graph/EdgeSet.java b/src/edu/ucla/sspace/graph/EdgeSet.java
index 49facf17..eec197e7 100755
--- a/src/edu/ucla/sspace/graph/EdgeSet.java
+++ b/src/edu/ucla/sspace/graph/EdgeSet.java
@@ -64,9 +64,10 @@ public interface EdgeSet<T extends Edge> extends Set<T> {
     EdgeSet copy(IntSet vertices);       
 
     /**
-     * Removes all edges instances that connect to the specified vertex.
+     * Removes all edges instances that connect to the specified vertex,
+     * returning the number of edges that were removed, if any.
      */
-    boolean disconnect(int vertex);
+    int disconnect(int vertex);
 
     /**
      * Returns the set of {@link Edge} instances that connect the root vertex
diff --git a/src/edu/ucla/sspace/graph/GenericEdgeSet.java b/src/edu/ucla/sspace/graph/GenericEdgeSet.java
index 97ca6fe0..1674aee2 100644
--- a/src/edu/ucla/sspace/graph/GenericEdgeSet.java
+++ b/src/edu/ucla/sspace/graph/GenericEdgeSet.java
@@ -40,46 +40,34 @@
  * edges that may be contained within.  This class keeps track of which vertices
  * are in the set as well, allowing for efficient vertex-based operations.
  *
- * <p> Due not knowing the {@link Edge} type, this class prevents modification via
- * adding or removing vertices.
- *
  * @author David Jurgens
  *
  * @param T the type of edge to be stored in the set
  */
 public class GenericEdgeSet<T extends Edge> extends AbstractSet<T> 
-        implements EdgeSet<T> {
+        implements EdgeSet<T>, java.io.Serializable {
         
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The vertex to which all edges in the set are connected
+     */
     private final int rootVertex;
     
-//     private final BitSet vertices;
-    
-//     private final Set<T> edges;
-
+    /**
+     * A mapping from connected vertices to the edges that connect to them
+     */
     private final MultiMap<Integer,T> vertexToEdges ;
    
     public GenericEdgeSet(int rootVertex) {
         this.rootVertex = rootVertex;
-//         edges = new HashSet<T>();
-//         vertices = new BitSet();
         vertexToEdges = new HashMultiMap<Integer,T>();
     }
     
     /**
-     * Adds the edge to this set if one of the vertices is the root vertex and
-     * if the non-root vertex has a greater index that this vertex.
+     * {@inheritDoc}
      */
     public boolean add(T e) {
-//         if (e.from() == rootVertex && edges.add(e)) {
-//             connected.set(e.to());
-//             return true;
-//         }
-//         else if (e.to() == rootVertex && edges.add(e)) {
-//             connected.add(e.from());
-//             return true;
-//         }
-//         return false;
-
         return (e.from() == rootVertex && vertexToEdges.put(e.to(), e))
             || (e.to() == rootVertex && vertexToEdges.put(e.from(), e));
     }
@@ -96,15 +84,16 @@ public IntSet connected() {
      * {@inheritDoc}
      */
     public boolean connects(int vertex) {
-        return vertexToEdges.containsKey(vertex); //vertices.get(vertex);
+        return vertexToEdges.containsKey(vertex);
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public boolean disconnect(int vertex) {
-        return vertexToEdges.remove(vertex) != null;
+    public int disconnect(int vertex) {
+        Set<T> edges = vertexToEdges.remove(vertex);
+        return (edges == null) ? 0 : edges.size();
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/GraphRandomizer.java b/src/edu/ucla/sspace/graph/GraphRandomizer.java
deleted file mode 100644
index cb1f2f4a..00000000
--- a/src/edu/ucla/sspace/graph/GraphRandomizer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2011 David Jurgens
- *
- * This file is part of the S-Space package and is covered under the terms and
- * conditions therein.
- *
- * The S-Space package is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation and distributed hereunder to you.
- *
- * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
- * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
- * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
- * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
- * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
- * RIGHTS.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package edu.ucla.sspace.graph;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-
-public class GraphRandomizer {
-
-    public static <T extends Edge> void shufflePreserveDegreeInMemory(Graph<T> g) {
-        
-        List<T> edges = new ArrayList<T>(g.edges());
-
-        // Decide on number of iterations
-        int swapIterations = 3 * g.size();
-        for (int s = 0; s < swapIterations; ++s) {
-
-            // Pick two vertices from which the edges will be selected
-            int i = (int)(Math.random() * edges.size());
-            int j = i; 
-            // Pick another vertex that is not v1
-            while (i == j)
-                j = (int)(Math.random() * edges.size());
-
-            T e1 = edges.get(i);
-            T e2 = edges.get(j);
-            
-            // Swap their end points
-            T swapped1 = e1.<T>clone(e1.from(), e2.to());
-            T swapped2 = e2.<T>clone(e2.from(), e1.to());
-            
-            // Check that the new edges do not already exist in the graph
-            if (g.contains(swapped1) 
-                || g.contains(swapped2))
-                continue;
-            
-            // Remove the old edges
-            g.remove(e1);
-            g.remove(e2);
-            
-            // Put in the swapped-end-point edges
-            g.add(swapped1);
-            g.add(swapped2);
-
-            // Update the in-memory edges set so that if these edges are drawn
-            // again, they don't point to old edges
-            edges.set(i, swapped1);
-            edges.set(j, swapped2);
-        }
-    }
-
-    public static <T extends Edge> void shufflePreserveDegree(Graph<T> g) {
-
-        // Copy the vertices to a list to support random access
-        List<Integer> vertices = new ArrayList<Integer>(g.vertices());       
-
-        // Decide on number of iterations
-        int swapIterations = 3 * g.size();
-        for (int i = 0; i < swapIterations; ++i) {
-        
-            // Pick two vertices from which the edges will be selected
-            int v1 = vertices.get((int)(Math.random() * vertices.size()));
-            int v2 = v1; 
-            // Pick another vertex that is not v1
-            while (v1 == v2)
-                v2 = vertices.get((int)(Math.random() * vertices.size()));
-            
-            // From the two vertices, select an edge from each of their adjacency
-            // lists.
-            T e1 = getRandomEdge(g.getAdjacencyList(v1));
-            T e2 = getRandomEdge(g.getAdjacencyList(v2));
-            
-            // Swap their end points
-            T swapped1 = e1.<T>clone(e1.from(), e2.to());
-            T swapped2 = e2.<T>clone(e2.from(), e1.to());
-            
-            // Check that the new edges do not already exist in the graph
-            if (g.contains(swapped1) 
-                || g.contains(swapped2))
-                continue;
-            
-            // Remove the old edges
-            g.remove(e1);
-            g.remove(e2);
-            
-            // Put in the swapped-end-point edges
-            g.add(swapped1);
-            g.add(swapped2);
-        }
-    }
-
-    private static <T> T getRandomEdge(Set<T> edges) {
-        int edgeToSelect = (int)(edges.size() * Math.random());
-        Iterator<T> it = edges.iterator();
-        int i = 0;
-        while (it.hasNext()) {
-            T edge = it.next();
-            if (i == edgeToSelect)
-                return edge;
-            i++;
-        }
-        throw new AssertionError(""Random edge selection logic is incorrect"");
-    }
-}
\ No newline at end of file
diff --git a/src/edu/ucla/sspace/graph/SimpleWeightedEdge.java b/src/edu/ucla/sspace/graph/SimpleWeightedEdge.java
index eae597ea..c45988e2 100644
--- a/src/edu/ucla/sspace/graph/SimpleWeightedEdge.java
+++ b/src/edu/ucla/sspace/graph/SimpleWeightedEdge.java
@@ -70,8 +70,7 @@ public boolean equals(Object o) {
      * {@inheritDoc}
      */
     public int hashCode() {
-        long bits = Double.doubleToLongBits(weight);
-        return from ^ to ^ (int)(bits ^ (bits >>> 32));
+        return from ^ to;
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/SparseDirectedEdgeSet.java b/src/edu/ucla/sspace/graph/SparseDirectedEdgeSet.java
index a0dd1768..5b3ba736 100644
--- a/src/edu/ucla/sspace/graph/SparseDirectedEdgeSet.java
+++ b/src/edu/ucla/sspace/graph/SparseDirectedEdgeSet.java
@@ -43,7 +43,9 @@
  * @author David Jurgens
  */
 public class SparseDirectedEdgeSet extends AbstractSet<DirectedEdge> 
-        implements EdgeSet<DirectedEdge> {
+        implements EdgeSet<DirectedEdge>, java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
         
     /**
      * The vertex to which all edges in the set are connected
@@ -149,8 +151,13 @@ public SparseDirectedEdgeSet copy(IntSet vertices) {
     /**
      * {@inheritDoc}
      */
-    public boolean disconnect(int vertex) {
-        return inEdges.remove(vertex) | outEdges.remove(vertex);
+    public int disconnect(int vertex) {
+        int removed = 0;
+        if (inEdges.remove(vertex))
+            removed++;
+        if (outEdges.remove(vertex))
+            removed++;
+        return removed;
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/SparseDirectedTypedEdgeSet.java b/src/edu/ucla/sspace/graph/SparseDirectedTypedEdgeSet.java
index 2c6828a1..e267bddb 100644
--- a/src/edu/ucla/sspace/graph/SparseDirectedTypedEdgeSet.java
+++ b/src/edu/ucla/sspace/graph/SparseDirectedTypedEdgeSet.java
@@ -59,9 +59,10 @@
 
 
 /**
- * An {@link EdgeSet} implementation that stores {@link TypedEdge} instances for
- * a vertex.  This class provides additional methods beyond the {@code EdgeSet}
- * interface for interacting with edges on the basis of their type.
+ * An {@link EdgeSet} implementation that stores {@link DirectedTypedEdge}
+ * instances for a vertex.  This class provides additional methods beyond the
+ * {@code EdgeSet} interface for interacting with edges on the basis of their
+ * type and their orientation.
  */
 public class SparseDirectedTypedEdgeSet<T> 
         extends AbstractSet<DirectedTypedEdge<T>> 
@@ -305,6 +306,8 @@ public SparseDirectedTypedEdgeSet<T> copy(IntSet vertices) {
      * reasons.  I was hoping the DirectedMultigraph.copy() could be sped up by
      * copying the raw data faster than the Edge-based data, but this
      * implementation actually slows down DirectedMultigraph.copy() by 100X.
+     * It's being left in as a future study on how to fix it to speed up the
+     * copy operation.
      */
 
 //     public SparseDirectedTypedEdgeSet<T> copy(Set<Integer> vertices) {
@@ -340,19 +343,28 @@ public SparseDirectedTypedEdgeSet<T> copy(IntSet vertices) {
 //     }
 
     /**
-     * Removes all edges to {@code v}.
+     * {@inheritDoc}
      */
-    public boolean disconnect(int v) {
+    public int disconnect(int v) {
         if (connected.remove(v)) {
+            int removed = 0;
             BitSet b = inEdges.remove(v);
-            if (b != null)
-                size -= b.cardinality();
+            if (b != null) {
+                int edges = b.cardinality();
+                size -= edges;
+                removed += edges;
+            }
             b = outEdges.remove(v);
-            if (b != null)
-                size -= b.cardinality();
-            return true;
+            if (b != null) {
+                int edges = b.cardinality();
+                size -= edges;
+                removed += edges;
+            }
+            assert removed > 0 :
+                ""connected removed an edge that wasn't listed elsewhere"";
+            return removed;
         }
-        return false;
+        return 0;
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/SparseSymmetricEdgeSet.java b/src/edu/ucla/sspace/graph/SparseSymmetricEdgeSet.java
deleted file mode 100755
index 82a5e461..00000000
--- a/src/edu/ucla/sspace/graph/SparseSymmetricEdgeSet.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2011 David Jurgens
- *
- * This file is part of the S-Space package and is covered under the terms and
- * conditions therein.
- *
- * The S-Space package is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation and distributed hereunder to you.
- *
- * THIS SOFTWARE IS PROVIDED ""AS IS"" AND NO REPRESENTATIONS OR WARRANTIES,
- * EXPRESS OR IMPLIED ARE MADE.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, WE MAKE
- * NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY
- * PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE OR DOCUMENTATION
- * WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER
- * RIGHTS.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package edu.ucla.sspace.graph;
-
-import java.util.AbstractSet;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
-
-import edu.ucla.sspace.util.OpenIntSet;
-
-
-/**
- *
- */
-public class SparseSymmetricEdgeSet {
-        
-    private final int rootVertex;
-    
-    private final OpenIntSet edges;
-    
-    public SparseSymmetricEdgeSet(int rootVertex) {
-        this.rootVertex = rootVertex;
-        edges = new OpenIntSet();
-    }
-    
-    /**
-     * Adds the edge to this set if one of the vertices is the root vertex and
-     * if the non-root vertex has a greater index that this vertex.
-     */
-    public boolean add(Edge e) {
-        int toAdd = -1;
-        if (e.from() == rootVertex) {
-            toAdd = e.to();
-        }
-        else {
-            if (e.to() != rootVertex)
-                return false;
-            // else e.to() == rootVertex
-            toAdd = e.from();
-        }
-
-        // Only add the vertex if the index for it is greated than this vertex.
-        // In a set of EdgeSets, this ensure that for two indices i,j only one
-        // edge is ever present
-        if (rootVertex < toAdd)
-            return edges.add(toAdd);
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Set<Integer> connected() {
-        // REMINDER: wrap to prevent adding self edges?
-        return edges;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean connects(int vertex) {
-        return edges.contains(vertex);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean contains(Object o) {
-        if (o instanceof Edge) {
-            Edge e = (Edge)o;
-            if (e.to() == rootVertex) 
-                return e.from() > rootVertex && edges.contains(e.from());
-            else
-                return e.from() == rootVertex && edges.contains(e.to());
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean disconnect(int vertex) {
-        return edges.remove(vertex);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Set<Edge> getEdges(int vertex) {
-        return (edges.contains(vertex))
-            ? Collections.<Edge>singleton(new SimpleEdge(rootVertex, vertex))
-            : null;
-    }    
-
-    /**
-     * {@inheritDoc}
-     */
-    public int getRoot() {
-        return rootVertex;
-    }
-
-    /**
-     * {@inheritDoc}
-     */ 
-    public Iterator<Edge> iterator() {
-        return new EdgeIterator();
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public boolean remove(Object o) {
-        if (o instanceof Edge) {
-            Edge e = (Edge)o;
-            if (e.to() == rootVertex) 
-                return e.from() > rootVertex && edges.remove(e.from());
-            else
-                return e.from() == rootVertex && edges.remove(e.to());
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */    
-    public int size() {
-        return edges.size();
-    }
-
-    /**
-     * An iterator over the edges in this set that constructs {@link Edge}
-     * instances as it traverses through the set of connected vertices.
-     */
-    private class EdgeIterator implements Iterator<Edge> {
-
-        private Iterator<Integer> otherVertices;
-        
-        public EdgeIterator() {
-            otherVertices = edges.iterator();
-        }
-
-        public boolean hasNext() {
-            return otherVertices.hasNext();
-        }
-
-        public Edge next() {
-            Integer i = otherVertices.next();
-            return new SimpleEdge(rootVertex, i);
-        }
-
-        public void remove() {
-            otherVertices.remove();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/edu/ucla/sspace/graph/SparseTypedEdgeSet.java b/src/edu/ucla/sspace/graph/SparseTypedEdgeSet.java
index 56fc0271..1dffc854 100644
--- a/src/edu/ucla/sspace/graph/SparseTypedEdgeSet.java
+++ b/src/edu/ucla/sspace/graph/SparseTypedEdgeSet.java
@@ -278,15 +278,16 @@ public SparseTypedEdgeSet<T> copy(IntSet vertices) {
     }
 
     /**
-     * Removes all edges to {@code v}.
+     * {@inheritDoc}
      */
-    public boolean disconnect(int v) {
+    public int disconnect(int v) {
         BitSet b = edges.remove(v);
         if (b != null) {
-            size -= b.cardinality();
-            return true;
+            int edges = b.cardinality();
+            size -= edges;
+            return edges;
         }
-        return false;
+        return 0;
     }
 
     /**
@@ -518,7 +519,10 @@ else if (curIndex != oldIndex) {
         }
     }
 
-
+    /**
+     * A utility class for exposing the objects for types of the edges in this
+     * set, which are otherwise represented as bits.
+     */
     private class Types extends AbstractSet<T> {
         
         public boolean contains(Object o) {
diff --git a/src/edu/ucla/sspace/graph/SparseUndirectedEdgeSet.java b/src/edu/ucla/sspace/graph/SparseUndirectedEdgeSet.java
index 67c991c6..705fc71f 100644
--- a/src/edu/ucla/sspace/graph/SparseUndirectedEdgeSet.java
+++ b/src/edu/ucla/sspace/graph/SparseUndirectedEdgeSet.java
@@ -41,7 +41,9 @@
  * A {@link EdgeSet} implementation for holding {@link Edge} instances.
  */
 public class SparseUndirectedEdgeSet extends AbstractSet<Edge> 
-        implements EdgeSet<Edge> {
+        implements EdgeSet<Edge>, java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
         
     /**
      * The vertex that is connected to all the edges in this set
@@ -135,8 +137,8 @@ public SparseUndirectedEdgeSet copy(IntSet vertices) {
     /**
      * {@inheritDoc}
      */
-    public boolean disconnect(int vertex) {
-        return edges.remove(vertex);
+    public int disconnect(int vertex) {
+        return (edges.remove(vertex)) ? 1 : 0;
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/SparseWeightedEdgeSet.java b/src/edu/ucla/sspace/graph/SparseWeightedEdgeSet.java
index 448a0cec..bb022d0c 100644
--- a/src/edu/ucla/sspace/graph/SparseWeightedEdgeSet.java
+++ b/src/edu/ucla/sspace/graph/SparseWeightedEdgeSet.java
@@ -49,7 +49,7 @@
  * two vertices will only have at most one edge between them.  If an edge exists
  * for vertices {@code i} and {@code j} with weight {@code w}<sub>1</sub>, then
  * adding a new edge to the same vertices with weight {@code w}<sub>2</sub> will
- * not add a parallel edge and increase the set of this set, even though the
+ * not add a parallel edge and increase the size of this set, even though the
  * edges are not equal.  Rather, the weight on the edge between the two vertices
  * is changed to {@code w}<sub>2</sub>.  Similarly, any contains or removal
  * operation will return its value based on the {@code WeightedEdge}'s vertices
@@ -176,12 +176,12 @@ public SparseWeightedEdgeSet copy(IntSet vertices) {
     /**
      * {@inheritDoc}
      */
-    public boolean disconnect(int vertex) {
+    public int disconnect(int vertex) {
         if (edges.containsKey(vertex)) {
             edges.remove(vertex);
-            return true;
+            return 1;
         }
-        return false;
+        return 0;
     }
 
     /**
diff --git a/src/edu/ucla/sspace/graph/UndirectedMultigraph.java b/src/edu/ucla/sspace/graph/UndirectedMultigraph.java
index 90983a6c..f74e9b63 100644
--- a/src/edu/ucla/sspace/graph/UndirectedMultigraph.java
+++ b/src/edu/ucla/sspace/graph/UndirectedMultigraph.java
@@ -53,8 +53,9 @@
 import gnu.trove.iterator.TIntIterator;
 import gnu.trove.iterator.TIntObjectIterator;
 import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.map.hash.TObjectIntHashMap;
 import gnu.trove.set.TIntSet;
 import gnu.trove.set.hash.TIntHashSet;
 
@@ -73,9 +74,9 @@ public class UndirectedMultigraph<T>
     private static final long serialVersionUID = 1L;
    
     /**
-     * The set of types contained in this graph.
+     * The count of the type distribution for all edges in the graph.
      */
-    private final Set<T> types;
+    private final TObjectIntMap<T> typeCounts;
     
     /**
      * The set of vertices in this mutligraph.  This set is maintained
@@ -105,7 +106,7 @@ public class UndirectedMultigraph<T>
      * Creates an empty graph with node edges
      */
     public UndirectedMultigraph() { 
-        types = new HashSet<T>();
+        typeCounts = new TObjectIntHashMap<T>();
         vertexToEdges = new TIntObjectHashMap<SparseTypedEdgeSet<T>>();
         subgraphs = new ArrayList<WeakReference<Subgraph>>();
         size = 0;
@@ -144,7 +145,7 @@ public boolean add(TypedEdge<T> e) {
             vertexToEdges.put(e.from(), from);
         }
         if (from.add(e)) {
-            types.add(e.edgeType());
+            updateTypeCounts(e.edgeType(), 1);
             SparseTypedEdgeSet<T> to = vertexToEdges.get(e.to());
             if (to == null) {
                 to = new SparseTypedEdgeSet<T>(e.to());
@@ -162,7 +163,7 @@ public boolean add(TypedEdge<T> e) {
      */
     public void clear() {
         vertexToEdges.clear();
-        types.clear();
+        typeCounts.clear();
         size = 0;
     }
 
@@ -231,8 +232,6 @@ public UndirectedMultigraph<T> copy(Set<Integer> toCopy) {
             if (!vertexToEdges.containsKey(v))
                 throw new IllegalArgumentException(
                     ""Request copy of non-present vertex: "" + v);
-//              SparseTypedEdgeSet<T> edges = vertexToEdges.get(v);
-//              g.vertexToEdges.put(v, edges.copy(toCopy));
 
             g.add(v);
             SparseTypedEdgeSet<T> edges = vertexToEdges.get(v);
@@ -246,8 +245,6 @@ public UndirectedMultigraph<T> copy(Set<Integer> toCopy) {
                         g.add(e);
             }
         }
-//         if (toCopy.size() > 0)
-//             System.out.printf(""Copy %d vertices (%d), %d edges%n"", g.order(), toCopy.size(), g.size());
         return g;
     }
 
@@ -283,7 +280,7 @@ public Set<TypedEdge<T>> edges(T t) {
      * Returns the set of edge types currently present in this graph.
      */
     public Set<T> edgeTypes() {
-        return Collections.unmodifiableSet(types);
+        return Collections.unmodifiableSet(typeCounts.keySet());
     }
 
     /**
@@ -292,7 +289,7 @@ public Set<T> edgeTypes() {
     @Override public boolean equals(Object o) {
         if (o instanceof UndirectedMultigraph) {
             UndirectedMultigraph<?> dm = (UndirectedMultigraph<?>)(o);
-            if (dm.types.equals(types)) {
+            if (dm.typeCounts.equals(typeCounts)) {
                 return vertexToEdges.equals(dm.vertexToEdges);
             }
             return false;
@@ -300,7 +297,7 @@ public Set<T> edgeTypes() {
         else if (o instanceof Multigraph) {
             @SuppressWarnings(""unchecked"")
             Multigraph<?,TypedEdge<?>> m = (Multigraph<?,TypedEdge<?>>)o;
-            if (m.edgeTypes().equals(types)) {
+            if (m.edgeTypes().equals(typeCounts.keySet())) {
                 return m.order() == order()
                     && m.size() == size()
                     && m.vertices().equals(vertices())
@@ -371,7 +368,8 @@ public boolean hasCycles() {
      * {@inheritDoc}
      */
     public int hashCode() {
-        return vertexToEdges.keySet().hashCode() ^ (types.hashCode() * size);
+        return vertexToEdges.keySet().hashCode() ^ 
+            (typeCounts.keySet().hashCode() * size);
     }
 
     /**
@@ -397,6 +395,8 @@ public boolean remove(int vertex) {
             // Check whether removing this vertex has caused us to remove
             // the last edge for this type in the graph.  If so, the graph
             // no longer has this type and we need to update the state.
+            for (TypedEdge<T> e : edges)
+                updateTypeCounts(e.edgeType(), -1);
 
             // Update any of the subgraphs that had this vertex to notify them
             // that it was removed
@@ -416,7 +416,7 @@ public boolean remove(int vertex) {
                 if (s.vertexSubset.remove(vertex)) {
                     Iterator<T> subgraphTypesIter = s.validTypes.iterator();
                     while (subgraphTypesIter.hasNext()) {
-                        if (!types.contains(subgraphTypesIter.next()))
+                        if (!typeCounts.containsKey(subgraphTypesIter.next()))
                             subgraphTypesIter.remove();
                     }
                 }
@@ -434,26 +434,27 @@ public boolean remove(TypedEdge<T> edge) {
         if (edges != null && edges.remove(edge)) {
             vertexToEdges.get(edge.from()).remove(edge);
             size--;
+
             // Check whether we've just removed the last edge for this type
             // in the graph.  If so, the graph no longer has this type and
             // we need to update the state.
-
-            // TODO !!
-
-
-            // Remove this edge type from all the subgraphs as well
-            Iterator<WeakReference<Subgraph>> sIt = subgraphs.iterator();
-            while (sIt.hasNext()) {
-                WeakReference<Subgraph> ref = sIt.next();
-                Subgraph s = ref.get();
-                // Check whether this subgraph was already gc'd (the
-                // subgraph was no longer in use) and if so, remove the
-                // ref from the list to avoid iterating over it again
-                if (s == null) {
-                    sIt.remove();
-                    continue;
+            updateTypeCounts(edge.edgeType(), -1);
+
+            if (!typeCounts.containsKey(edge.edgeType())) {
+                // Remove this edge type from all the subgraphs as well
+                Iterator<WeakReference<Subgraph>> sIt = subgraphs.iterator();
+                while (sIt.hasNext()) {
+                    WeakReference<Subgraph> ref = sIt.next();
+                    Subgraph s = ref.get();
+                    // Check whether this subgraph was already gc'd (the
+                    // subgraph was no longer in use) and if so, remove the
+                    // ref from the list to avoid iterating over it again
+                    if (s == null) {
+                        sIt.remove();
+                        continue;
+                    }
+                    s.validTypes.remove(edge.edgeType());
                 }
-                // FILL IN...
             }
 
             return true;
@@ -466,26 +467,13 @@ public boolean remove(TypedEdge<T> edge) {
      */
     public int size() {
         return size;
-//         CountingProcedure count = new CountingProcedure();
-//         vertexToEdges.forEachValue(count);
-//         return count.count / 2;
-    }
-
-    private class CountingProcedure 
-            implements TObjectProcedure<SparseTypedEdgeSet<T>> {
-
-        int count = 0;
-        public boolean execute(SparseTypedEdgeSet<T> edges) {
-            count += edges.size();
-            return true;
-        }
     }
 
     /**
      * {@inheritDoc}
      */
     public UndirectedMultigraph<T> subgraph(Set<Integer> subset) {
-        Subgraph sub = new Subgraph(types, subset);
+        Subgraph sub = new Subgraph(typeCounts.keySet(), subset);
         subgraphs.add(new WeakReference<Subgraph>(sub));
         return sub;
     }
@@ -496,7 +484,7 @@ public UndirectedMultigraph<T> subgraph(Set<Integer> subset) {
     public UndirectedMultigraph<T> subgraph(Set<Integer> subset, Set<T> edgeTypes) {
         if (edgeTypes.isEmpty()) 
             throw new IllegalArgumentException(""Must specify at least one type"");
-        if (!types.containsAll(edgeTypes)) {
+        if (!typeCounts.keySet().containsAll(edgeTypes)) {
             throw new IllegalArgumentException(
                 ""Cannot create subgraph with more types than exist"");
         }
@@ -513,11 +501,31 @@ public String toString() {
         return ""{ vertices: "" + vertices() + "", edges: "" + edges() + ""}"";
     }
 
+    /**
+     * Updates how many edges have this type in the graph
+     */
+    private void updateTypeCounts(T type, int delta) {
+        if (!typeCounts.containsKey(type)) {
+            assert delta > 0 
+                : ""removing edge type that was not originally present"";
+            typeCounts.put(type, delta);
+        }
+        else {
+            int curCount = typeCounts.get(type);
+            int newCount = curCount + delta;
+            assert newCount >= 0 
+                : ""removing edge type that was not originally present"";
+            if (newCount == 0)
+                typeCounts.remove(type);
+            else
+                typeCounts.put(type, newCount);
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
     public IntSet vertices() {
-        // TODO: make this unmodifiable
         return PrimitiveCollections.unmodifiableSet(
             TroveIntSet.wrap(vertexToEdges.keySet()));
     }
@@ -551,8 +559,8 @@ public Iterator<TypedEdge<T>> iterator() {
         public boolean remove(Object o) {
             if (o instanceof TypedEdge) {
                 TypedEdge<?> e = (TypedEdge<?>)o;
-                return UndirectedMultigraph.this.types.
-                           contains(e.edgeType())
+                return UndirectedMultigraph.this.typeCounts.
+                           containsKey(e.edgeType())
                     && UndirectedMultigraph.this.remove((TypedEdge<T>)o);
             }
             return false;
@@ -886,7 +894,8 @@ public boolean hasCycles() {
          * {@inheritDoc}
          */
         public int hashCode() {
-            return vertices().hashCode() ^ (types.hashCode() * size());
+            return vertices().hashCode() ^ 
+                (validTypes.hashCode() * size());
         }
 
         /**
diff --git a/src/edu/ucla/sspace/mains/FixedDurationTemporalRandomIndexingMain.java b/src/edu/ucla/sspace/mains/FixedDurationTemporalRandomIndexingMain.java
index 53a3bf3e..8466e9a5 100644
--- a/src/edu/ucla/sspace/mains/FixedDurationTemporalRandomIndexingMain.java
+++ b/src/edu/ucla/sspace/mains/FixedDurationTemporalRandomIndexingMain.java
@@ -27,7 +27,6 @@
 import edu.ucla.sspace.common.SemanticSpaceIO.SSpaceFormat;
 import edu.ucla.sspace.common.Similarity;
 import edu.ucla.sspace.common.Similarity.SimType;
-import edu.ucla.sspace.common.WordComparator;
 
 import edu.ucla.sspace.ri.IndexVectorUtil;
 
@@ -43,6 +42,8 @@
 
 import edu.ucla.sspace.util.CombinedIterator;
 import edu.ucla.sspace.util.MultiMap;
+import edu.ucla.sspace.util.NearestNeighborFinder;
+import edu.ucla.sspace.util.SimpleNearestNeighborFinder;
 import edu.ucla.sspace.util.SortedMultiMap;
 import edu.ucla.sspace.util.TimeSpan;
 import edu.ucla.sspace.util.TreeMultiMap;
@@ -172,12 +173,6 @@ public class FixedDurationTemporalRandomIndexingMain {
      */
     private boolean printShiftRankings;
 
-    /**
-     * The word comparator used for computing similarity scores when calculating
-     * the semantic shift.
-     */
-    private WordComparator wordComparator;
-
     /**
      * A mapping from each word to the vectors that account for its temporal
      * semantics according to the specified time span
@@ -368,9 +363,6 @@ public void run(String[] args) throws Exception {
             numThreads = argOptions.getIntOption(""threads"");
         }
 
-        // initialize the word comparator based on the number of threads
-        wordComparator = new WordComparator(numThreads);
-
         overwrite = true;
         if (argOptions.hasOption(""overwrite"")) {
             overwrite = argOptions.getBooleanOption(""overwrite"");
@@ -680,12 +672,13 @@ private void printWordNeighbors(String dateString,
         LOGGER.info(""printing the most similar words for the semantic partition"" +
                     "" starting at: "" + dateString);
 
+        NearestNeighborFinder nnf = 
+            new SimpleNearestNeighborFinder(semanticPartition);
+
         // generate the similarity lists
         for (String toExamine : interestingWords) {
             SortedMultiMap<Double,String> mostSimilar = 
-                wordComparator.getMostSimilar(toExamine, semanticPartition,
-                                              interestingWordNeighbors,
-                                              Similarity.SimType.COSINE);
+                nnf.getMostSimilar(toExamine, interestingWordNeighbors);
 
             if (mostSimilar != null) {
                 File neighborFile = 
diff --git a/src/edu/ucla/sspace/mains/LexSubWordsiMain.java b/src/edu/ucla/sspace/mains/LexSubWordsiMain.java
index 262ac826..62d0a3a0 100644
--- a/src/edu/ucla/sspace/mains/LexSubWordsiMain.java
+++ b/src/edu/ucla/sspace/mains/LexSubWordsiMain.java
@@ -6,7 +6,6 @@
 import edu.ucla.sspace.common.Similarity;
 import edu.ucla.sspace.common.Similarity.SimType;
 import edu.ucla.sspace.common.StaticSemanticSpace;
-import edu.ucla.sspace.common.WordComparator;
 
 import edu.ucla.sspace.hal.LinearWeighting;
 
@@ -15,7 +14,9 @@
 import edu.ucla.sspace.text.corpora.SemEvalLexSubReader;
 
 import edu.ucla.sspace.util.MultiMap;
+import edu.ucla.sspace.util.NearestNeighborFinder;
 import edu.ucla.sspace.util.SerializableUtil;
+import edu.ucla.sspace.util.SimpleNearestNeighborFinder;
 
 import edu.ucla.sspace.vector.SparseDoubleVector;
 import edu.ucla.sspace.vector.Vector;
@@ -59,7 +60,7 @@ public static void main(String[] args) {
     }
 
     public static class LexSubWordsi implements Wordsi {
-        private final WordComparator comparator;
+        private final NearestNeighborFinder comparator;
 
         private final PrintWriter output;
 
@@ -67,9 +68,9 @@ public static class LexSubWordsi implements Wordsi {
 
         public LexSubWordsi(String outFile, String sspaceFile) {
             try {
-                comparator = new WordComparator();
                 output = new PrintWriter(outFile);
                 wordsiSpace = new StaticSemanticSpace(sspaceFile);
+                comparator = new SimpleNearestNeighborFinder(wordsiSpace);
             } catch (IOException ioe) {
                 throw new IOError(ioe);
             }
@@ -86,10 +87,9 @@ public void handleContextVector(String focus,
             System.err.printf(""Processing %s\n"", secondary);
             String bestSense = getBaseSense(focus, vector);
             if (bestSense == null)
-                return;
-
+                return;            
             MultiMap<Double, String> topWords = comparator.getMostSimilar(
-                    bestSense, wordsiSpace, 10, SimType.COSINE);
+                    bestSense, 10);
             output.printf(""%s ::"", secondary);
             for (String term : topWords.values())
                 output.printf("" %s"", term);
diff --git a/src/edu/ucla/sspace/text/LabeledParsedStringDocument.java b/src/edu/ucla/sspace/text/LabeledParsedStringDocument.java
index 2fe2ac90..acd25992 100644
--- a/src/edu/ucla/sspace/text/LabeledParsedStringDocument.java
+++ b/src/edu/ucla/sspace/text/LabeledParsedStringDocument.java
@@ -64,6 +64,21 @@ public DependencyTreeNode[] parsedDocument() {
      * {@inheritDoc}
      */
     public String text() {
+        DependencyTreeNode[] nodes = parsedDocument();
+        StringBuilder sb = new StringBuilder(nodes.length * 8);
+        for (int i = 0; i < nodes.length; ++i) {
+            String token = nodes[i].word();
+            sb.append(token);
+            if (i+1 < nodes.length)
+                sb.append(' ');
+        }
+        return sb.toString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String prettyPrintText() {
         Pattern punctuation = Pattern.compile(""[!,-.:;?`]"");
         DependencyTreeNode[] nodes = parsedDocument();
         StringBuilder sb = new StringBuilder(nodes.length * 8);
diff --git a/src/edu/ucla/sspace/text/ParsedDocument.java b/src/edu/ucla/sspace/text/ParsedDocument.java
index e5406df0..fcc9b566 100644
--- a/src/edu/ucla/sspace/text/ParsedDocument.java
+++ b/src/edu/ucla/sspace/text/ParsedDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 David Jurgens
+ * Copyright 2012 David Jurgens
  *
  * This file is part of the S-Space package and is covered under the terms and
  * conditions therein.
@@ -40,7 +40,18 @@ public interface ParsedDocument extends Document {
 
     /**
      * Returns the text of the parsed document without any of the
-     * parsing-related annotation.
+     * parsing-related annotation, with each parsed token separated by
+     * whitespace.
      */
     String text();
+
+    /**
+     * Returns a pretty-printed version of the document's text without any of
+     * the parsing-related annotation and using heuristics to appropriately
+     * space punctuation, quotes, and contractions.  This methods is intended as
+     * only a useful way to displaying the document's text in a more readable
+     * format than {@link #text()}, but makes no claims as to reproducing the
+     * original surface form of the document prior to parsing.
+     */
+    String prettyPrintText();
 }
diff --git a/src/edu/ucla/sspace/text/PukWaCDocumentIterator.java b/src/edu/ucla/sspace/text/PukWaCDocumentIterator.java
index 34e37664..7037e315 100644
--- a/src/edu/ucla/sspace/text/PukWaCDocumentIterator.java
+++ b/src/edu/ucla/sspace/text/PukWaCDocumentIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 David Jurgens
+ * Copyright 2012 David Jurgens
  *
  * This file is part of the S-Space package and is covered under the terms and
  * conditions therein.
@@ -36,12 +36,14 @@
  * An iterator implementation that returns {@link Document} containg a single
  * dependency parsed sentence given a file in the <a
  * href=""http://nextens.uvt.nl/depparse-wiki/DataFormat"">CoNLL Format</a> which
- * is contained in the XML format provided in the WaCkypedia corpus.
+ * is contained in the XML format provided in the WaCkypedia corpus.  See the <a
+ * href=""http://wacky.sslmit.unibo.it/doku.php?id=corpora"">WaCky</a> group's
+ * website for more information on the PukWaC.
  */
 public class PukWaCDocumentIterator implements Iterator<LabeledParsedDocument> {
 
     /**
-     * The extractor used to build trees from the pukWaC documents
+     * The extractor used to build trees from the PukWaC documents
      */
     private static final DependencyExtractor extractor = 
         new WaCKyDependencyExtractor();
@@ -65,7 +67,7 @@ public class PukWaCDocumentIterator implements Iterator<LabeledParsedDocument> {
      * Creates an {@code Iterator} over the file where each document returned
      * contains the sequence of dependency parsed words composing a sentence..
      *
-     * @param documentsFile the name of the pukWaC file containing dependency
+     * @param documentsFile the name of the PukWaC file containing dependency
      *        parsed sentences in the <a
      *        href=""http://nextens.uvt.nl/depparse-wiki/DataFormat"">CoNLL
      *        Format</a> separated by XML tags for the sentences and articles
@@ -100,7 +102,7 @@ else if (line.equals(""<s>"")) {
                 while ((line = documentsReader.readLine()) != null
                        && !line.equals(""</s>"")) {
 
-                    // Unfortunately, the XML of the pukWaC is broken and some
+                    // Unfortunately, the XML of the PukWaC is broken and some
                     // <text> elements are inside the <s> elements, so this code
                     // is needed to avoid putting those inside the CONLL data
                     if (line.contains(""<text"")) {
diff --git a/src/edu/ucla/sspace/text/UkWaCDocumentIterator.java b/src/edu/ucla/sspace/text/UkWaCDocumentIterator.java
index 1243d3bb..9a654563 100644
--- a/src/edu/ucla/sspace/text/UkWaCDocumentIterator.java
+++ b/src/edu/ucla/sspace/text/UkWaCDocumentIterator.java
@@ -31,13 +31,11 @@
 
 
 /**
- * An iterator implementation that returns {@link Document} containg a single
- * dependency parsed sentence given a file in the <a
- * href=""http://nextens.uvt.nl/depparse-wiki/DataFormat"">CoNLL Format</a>
- *
- * <p>
- *
- * This class is thread-safe.
+ * An iterator implementation that returns {@link Document} instances labled
+ * with the source URL from which its text was obtained, as specified in the
+ * ukWaC.  See the <a
+ * href=""http://wacky.sslmit.unibo.it/doku.php?id=corpora"">WaCky</a> group's
+ * website for more information on the ukWaC.
  */
 public class UkWaCDocumentIterator implements Iterator<LabeledDocument> {
 
diff --git a/src/edu/ucla/sspace/tools/NearestNeighborFinderTool.java b/src/edu/ucla/sspace/tools/NearestNeighborFinderTool.java
index 756b24d2..cb48efa0 100644
--- a/src/edu/ucla/sspace/tools/NearestNeighborFinderTool.java
+++ b/src/edu/ucla/sspace/tools/NearestNeighborFinderTool.java
@@ -28,6 +28,7 @@
 import edu.ucla.sspace.util.LoggerUtil;
 import edu.ucla.sspace.util.MultiMap;
 import edu.ucla.sspace.util.NearestNeighborFinder;
+import edu.ucla.sspace.util.PartitioningNearestNeighborFinder;
 import edu.ucla.sspace.util.SerializableUtil;
 
 import java.io.File;
@@ -93,27 +94,29 @@ public static void main(String[] args) {
                     SemanticSpaceIO.load(options.getStringOption('C'));
                 int numWords = sspace.getWords().size();
                 // See how many principle vectors to create
-                int principleVectors = -1;
+                int numPrincipleVectors = -1;
                 if  (options.hasOption('p')) {
-                    principleVectors = options.getIntOption('p');
-                    if (principleVectors > numWords) {
+                    numPrincipleVectors = options.getIntOption('p');
+                    if (numPrincipleVectors > numWords) {
                         throw new IllegalArgumentException(
                             ""Cannot have more principle vectors than "" +
-                            ""word vectors: "" + principleVectors);
+                            ""word vectors: "" + numPrincipleVectors);
                     }
-                    else if (principleVectors < 1) {
+                    else if (numPrincipleVectors < 1) {
                         throw new IllegalArgumentException(
                             ""Must have at least one principle vector"");
                     }
 
                 }
                 else {
-                    principleVectors = 
+                    numPrincipleVectors = 
                         Math.min((int)(Math.ceil(Math.log(numWords))), 1000);
                     System.err.printf(""Choosing a heuristically selected %d "" +
-                                      ""principle vectors%n"", principleVectors);
+                                      ""principle vectors%n"", 
+                                      numPrincipleVectors);
                 }
-                nnf = new NearestNeighborFinder(sspace, principleVectors);
+                nnf = new PartitioningNearestNeighborFinder(
+                    sspace, numPrincipleVectors);
             } catch (IOException ioe) {
                 throw new IOError(ioe);
             }
diff --git a/src/edu/ucla/sspace/tools/SemanticSpaceExplorer.java b/src/edu/ucla/sspace/tools/SemanticSpaceExplorer.java
index b22050f1..c7f697f1 100644
--- a/src/edu/ucla/sspace/tools/SemanticSpaceExplorer.java
+++ b/src/edu/ucla/sspace/tools/SemanticSpaceExplorer.java
@@ -26,10 +26,12 @@
 import edu.ucla.sspace.common.SemanticSpace;
 import edu.ucla.sspace.common.SemanticSpaceIO;
 import edu.ucla.sspace.common.Similarity;
-import edu.ucla.sspace.common.WordComparator;
 
 import edu.ucla.sspace.text.WordIterator;
 
+import edu.ucla.sspace.util.NearestNeighborFinder;
+import edu.ucla.sspace.util.PartitioningNearestNeighborFinder;
+
 import edu.ucla.sspace.vector.SparseVector;
 import edu.ucla.sspace.vector.Vector;
 import edu.ucla.sspace.vector.VectorIO;
@@ -102,12 +104,6 @@ private enum Command {
         }
     }
     
-    /**
-     * The comparator to be used when identifying the nearest neighbors to words
-     * in a semantic space.
-     */
-    private final WordComparator wordComparator;
-
     /**
      * The mapping from file name to the {@code SemanticSpace} that was loaded
      * from that file.
@@ -125,11 +121,16 @@ private enum Command {
      */
     private SemanticSpace current;
 
+    /** 
+     * The {@code NearestNeighborFinder} for the current {@code SemanticSpace}
+     * or {@code null} if the nearest terms have yet to be searched for.
+     */
+    private NearestNeighborFinder currentNnf;
+
     /**
      * Constructs an instance of {@code SemanticSpaceExplorer}.
      */
-    private SemanticSpaceExplorer() { 
-        this.wordComparator = new WordComparator();
+    private SemanticSpaceExplorer() {        
         fileNameToSSpace = new LinkedHashMap<String,SemanticSpace>();
         aliasToFileName = new HashMap<String,String>();
         current = null;
@@ -240,6 +241,7 @@ private boolean execute(Iterator<String> commandTokens, PrintStream out) {
             }
             fileNameToSSpace.put(sspaceFileName, sspace);
             current = sspace;
+            currentNnf = null;
             break;
         }
 
@@ -319,31 +321,16 @@ private boolean execute(Iterator<String> commandTokens, PrintStream out) {
                     return false;
                 }
             }
-            Similarity.SimType simType = Similarity.SimType.COSINE;
-            if (commandTokens.hasNext()) {
-                // Upper case since it's an enum
-                String simTypeStr = commandTokens.next().toUpperCase();
-                try {
-                    simType = Similarity.SimType.valueOf(simTypeStr);
-                } catch (IllegalArgumentException iae) {
-                    // See if the user provided a prefix of the similarity
-                    // measure's name
-                    for (Similarity.SimType t : Similarity.SimType.values())
-                        if (t.name().startsWith(simTypeStr)) 
-                            simType = t;
-                    // If no prefix was found, report an error
-                    if (simType == null) {
-                        out.println(""invalid similarity measure: "" +simTypeStr);
-                        return false;
-                    }
-                }
-            }
             
+            // If this is the first time the nearest neighbors have been
+            // searched for, construct a new NNF
+            if (currentNnf == null) 
+                currentNnf = new PartitioningNearestNeighborFinder(current);
+
             // Using the provided or default arguments find the closest
             // neighbors to the target word in the current semantic space
             SortedMultiMap<Double,String> mostSimilar =
-                wordComparator.getMostSimilar(focusWord, current, neighbors,
-                                              simType);
+                currentNnf.getMostSimilar(focusWord, neighbors);
 
             if (mostSimilar == null) {
                 out.println(focusWord + 
@@ -375,7 +362,7 @@ private boolean execute(Iterator<String> commandTokens, PrintStream out) {
                 out.println(""missing word argument"");
                 return false;
             }
-            String word2 = commandTokens.next();
+            String word2 = commandTokens.next();                      
 
             Similarity.SimType simType = Similarity.SimType.COSINE;
             if (commandTokens.hasNext()) {
diff --git a/src/edu/ucla/sspace/tools/SimilarityListGenerator.java b/src/edu/ucla/sspace/tools/SimilarityListGenerator.java
index a0dbb5fd..9703a36b 100644
--- a/src/edu/ucla/sspace/tools/SimilarityListGenerator.java
+++ b/src/edu/ucla/sspace/tools/SimilarityListGenerator.java
@@ -26,9 +26,10 @@
 import edu.ucla.sspace.common.Similarity.SimType;
 import edu.ucla.sspace.common.SemanticSpace;
 import edu.ucla.sspace.common.SemanticSpaceIO;
-import edu.ucla.sspace.common.WordComparator;
 
 import edu.ucla.sspace.util.BoundedSortedMap;
+import edu.ucla.sspace.util.NearestNeighborFinder;
+import edu.ucla.sspace.util.PartitioningNearestNeighborFinder;
 import edu.ucla.sspace.util.Pair;
 import edu.ucla.sspace.util.SortedMultiMap;
 
@@ -77,9 +78,10 @@ private void addOptions() {
                              ""whether to print the similarity score "" +
                              ""(default: false)"",
                              false, null, ""Program Options"");
-        argOptions.addOption('s', ""similarityFunction"",
-                             ""name of a similarity function (default: cosine)"",
-                             true, ""String"", ""Program Options"");
+        // dj: current unsupported; will be next release
+        //         argOptions.addOption('s', ""similarityFunction"",
+        //                              ""name of a similarity function (default: cosine)"",
+        //                              true, ""String"", ""Program Options"");
         argOptions.addOption('n', ""numSimilar"", ""the number of similar words "" +
                              ""to print (default: 10)"", true, ""String"", 
                              ""Program Options"");
@@ -153,12 +155,13 @@ public void run(String[] args) throws Exception {
         // load the behavior options
         final boolean printSimilarity = argOptions.hasOption('p');
 
-        String similarityTypeName = (argOptions.hasOption('s'))
-            ? argOptions.getStringOption('s').toUpperCase() : ""COSINE"";
+        // dj: setting the similarity type is currently unsupported but will be
+        //     in the next release
 
-        SimType similarityType = SimType.valueOf(similarityTypeName);
-        
-        LOGGER.fine(""using similarity measure: "" + similarityType);
+        //         String similarityTypeName = (argOptions.hasOption('s'))
+        //             ? argOptions.getStringOption('s').toUpperCase() : ""COSINE"";        
+        //         SimType similarityType = SimType.valueOf(similarityTypeName);        
+        //         LOGGER.fine(""using similarity measure: "" + similarityType);
         
         final int numSimilar = (argOptions.hasOption('n'))
             ? argOptions.getIntOption('n') : 10;
@@ -175,14 +178,14 @@ public void run(String[] args) throws Exception {
         final PrintWriter outputWriter = new PrintWriter(output);
             
         final Set<String> words = sspace.getWords();
-        WordComparator comparator = new WordComparator(numThreads);
+        NearestNeighborFinder nnf = 
+            new PartitioningNearestNeighborFinder(sspace);
 
 
         for (String word : words) {            
             // compute the k most-similar words to this word
             SortedMultiMap<Double,String> mostSimilar =
-                comparator.getMostSimilar(word, sspace, numSimilar,
-                                          similarityType);
+                nnf.getMostSimilar(word, numSimilar);
             
             // once processing has finished write the k most-similar words to
             // the output file.
diff --git a/src/edu/ucla/sspace/util/HashIndexer.java b/src/edu/ucla/sspace/util/HashIndexer.java
index 28a90a79..97807ca6 100644
--- a/src/edu/ucla/sspace/util/HashIndexer.java
+++ b/src/edu/ucla/sspace/util/HashIndexer.java
@@ -37,7 +37,7 @@
 
 /** 
  * A utility class for mapping a set of objects to unique indices based on
- * object equality.  The indices returned by this class will always being at
+ * object equality.  The indices returned by this class will always begin at
  * {@code 0}.
  *
  * <p> This implementation provides faster {@link #index(Object)} performance
diff --git a/src/edu/ucla/sspace/util/PairCounter.java b/src/edu/ucla/sspace/util/PairCounter.java
index 89b9f2d1..21591721 100644
--- a/src/edu/ucla/sspace/util/PairCounter.java
+++ b/src/edu/ucla/sspace/util/PairCounter.java
@@ -253,7 +253,7 @@ public Set<Pair<T>> items() {
     }
 
     /**
-     * Returns an interator over the pairs that have been counted thusfar and
+     * Returns an iterator over the pairs that have been counted thusfar and
      * their respective counts.
      */
     public Iterator<Map.Entry<Pair<T>,Integer>> iterator() {
diff --git a/src/edu/ucla/sspace/util/NearestNeighborFinder.java b/src/edu/ucla/sspace/util/PartitioningNearestNeighborFinder.java
similarity index 90%
rename from src/edu/ucla/sspace/util/NearestNeighborFinder.java
rename to src/edu/ucla/sspace/util/PartitioningNearestNeighborFinder.java
index c92c8bc4..be4db381 100644
--- a/src/edu/ucla/sspace/util/NearestNeighborFinder.java
+++ b/src/edu/ucla/sspace/util/PartitioningNearestNeighborFinder.java
@@ -65,10 +65,12 @@
  * A class for finding the <i>k</i>-nearest neighbors of one or more words.  The
  * {@code NearestNeighborFinder} operates by generating a set of <b>principle
  * vectors</b> that reflect average words in a {@link SemanticSpace} and then
- * identifying mapping each principle vector to the set of words to which it is
- * closest.  Finding the nearest neighbor then entails finding the
- * <i>k</i>-closest principle vectors and comparing only their words, rather
- * than all the words in the space.  This dramatically reduces the search space.
+ * mapping each principle vector to the set of words to which it is closest.
+ * Finding the nearest neighbor then entails finding the <i>k</i>-closest
+ * principle vectors and comparing only their words, rather than all the words
+ * in the space.  This dramatically reduces the search space by partitioning the
+ * vectors of the {@code SemanticSpace} into smaller sets, not all of which need
+ * to be searched.
  *
  * <p> The number of principle vectors is typically far less than the total
  * number of vectors in the {@code SemanticSpace}, but should be more than the
@@ -77,8 +79,14 @@
  * (|Sspace| / p))}, where {@code p} is the number of principle components,
  * {@code k} is the number of nearest neighbors to be found, and {@code
  * |Sspace|} is the size of the semantic space.
+ *
+ * <p> Instances of this class are also serializable.  If the backing {@code
+ * SemanticSpace} is also serializable, the space will be saved.  However, if
+ * the space is not serializable, its contents will be converted to a static
+ * version and saved as a copy.
  */
-public class NearestNeighborFinder implements java.io.Serializable {
+public class PartitioningNearestNeighborFinder 
+    implements NearestNeighborFinder, java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -86,7 +94,7 @@ public class NearestNeighborFinder implements java.io.Serializable {
      * The logger to which clustering status updates will be written.
      */
     private static final Logger LOGGER =
-        Logger.getLogger(NearestNeighborFinder.class.getName());
+        Logger.getLogger(PartitioningNearestNeighborFinder.class.getName());
 
     /**
      * The semantic space from which the principle vectors are derived
@@ -104,29 +112,41 @@ public class NearestNeighborFinder implements java.io.Serializable {
      */
     private transient WorkQueue workQueue;
 
+    /**
+     * Creates a new {@code NearestNeighborFinder} for the {@link
+     * SemanticSpace}, using log<sub>10</log>(|words|) principle vectors to
+     * efficiently search for neighbors.
+     *
+     * @param sspace a semantic space to search
+     */
+    public PartitioningNearestNeighborFinder(SemanticSpace sspace) {
+        this(sspace, (int)(Math.ceil(Math.log10(sspace.getWords().size()))));
+    }
+
     /**
      * Creates a new {@code NearestNeighborFinder} for the {@link
      * SemanticSpace}, using the specified number of principle vectors to
      * efficiently search for neighbors.
      *
      * @param sspace a semantic space to search
-     * @param principleVectors the number of principle vectors to use in
+     * @param numPrincipleVectors the number of principle vectors to use in
      *        representing the content of the space.
      */
-    public NearestNeighborFinder(SemanticSpace sspace, int principleVectors) {
+    public PartitioningNearestNeighborFinder(SemanticSpace sspace, 
+                                             int numPrincipleVectors) {
         if (sspace == null)
             throw new NullPointerException();
-        if (principleVectors > sspace.getWords().size()) 
+        if (numPrincipleVectors > sspace.getWords().size()) 
             throw new IllegalArgumentException(
                 ""Cannot have more principle vectors than "" +
-                ""word vectors: "" + principleVectors);    
-        else if (principleVectors < 1) 
+                ""word vectors: "" + numPrincipleVectors);    
+        else if (numPrincipleVectors < 1) 
             throw new IllegalArgumentException(
                 ""Must have at least one principle vector"");
         this.sspace = sspace;
         principleVectorToNearestTerms = new HashMultiMap<DoubleVector,String>();
         workQueue = new WorkQueue();
-        computePrincipleVectors(principleVectors);
+        computePrincipleVectors(numPrincipleVectors);
     }
 
     /**
@@ -193,7 +213,7 @@ public void run() {
                             // which it is closest
                             for (int i = sta; i < end; ++i) {
                                 DoubleVector v = termVectors.get(i);
-                                double highestSim = Double.NEGATIVE_INFINITY;
+                                double highestSim = -Double.MAX_VALUE;
                                 int pVec = -1;
                                 for (int j = 0; j < principles.length; ++j) {
                                     DoubleVector principle = principles[j];
@@ -246,12 +266,7 @@ public void run() {
     }
 
     /**
-     * Finds the <i>k</i> most similar words in the semantic space according to
-     * the cosine similarity, returning a mapping from their similarity to the
-     * word itself.
-     *
-     * @return the most similar words, or {@code null} if the provided word was
-     *         not in the semantic space.
+     * {@inheritDoc}
      */
     public SortedMultiMap<Double,String> getMostSimilar(
             final String word, int numberOfSimilarWords) {
@@ -276,12 +291,7 @@ public SortedMultiMap<Double,String> getMostSimilar(
     }
 
     /**
-     * Finds the <i>k</i> most similar words in the semantic space according to
-     * the cosine similarity, returning a mapping from their similarity to the
-     * word itself.
-     *
-     * @return the most similar words, or {@code null} if none of the provided
-     *         word were not in the semantic space.
+     * {@inheritDoc}
      */
     public SortedMultiMap<Double,String> getMostSimilar(
              Set<String> terms, int numberOfSimilarWords) {
@@ -323,13 +333,8 @@ public SortedMultiMap<Double,String> getMostSimilar(
         return mostSim;
     }
 
-
     /**
-     * Finds the <i>k</i> most similar words in the semantic space according to
-     * the cosine similarity, returning a mapping from their similarity to the
-     * word itself.
-     *
-     * @return the most similar words to the vector
+     * {@inheritDoc}
      */
     public SortedMultiMap<Double,String> getMostSimilar(
             final Vector v, int numberOfSimilarWords) {
@@ -434,5 +439,4 @@ private void writeObject(ObjectOutputStream out) throws IOException {
             out.writeObject(copy);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/edu/ucla/sspace/util/ReflectionUtil.java b/src/edu/ucla/sspace/util/ReflectionUtil.java
index a3d4ffb7..583f3b2b 100644
--- a/src/edu/ucla/sspace/util/ReflectionUtil.java
+++ b/src/edu/ucla/sspace/util/ReflectionUtil.java
@@ -48,8 +48,4 @@ public static <T> T getObjectInstance(String className) {
             throw new Error(e);
         }
     }
-
-//     public static <T> T[] newArrayInstance(Class<T> c, int length) {
-//         return Arrays.newInstance(c, length)
-//     }
 }
diff --git a/src/edu/ucla/sspace/util/primitive/IntIntHashMultiMap.java b/src/edu/ucla/sspace/util/primitive/IntIntHashMultiMap.java
index bcd6e9d3..6577e230 100644
--- a/src/edu/ucla/sspace/util/primitive/IntIntHashMultiMap.java
+++ b/src/edu/ucla/sspace/util/primitive/IntIntHashMultiMap.java
@@ -42,7 +42,11 @@
 import gnu.trove.procedure.TIntProcedure;
 
 /**
- *
+ * A {@link MultiMap} implementation for mapping {@code int} primitives as both
+ * keys and values using a hashing strategy.  This class offers a noticeable
+ * performance improvement over the equivalent {@code
+ * HashMultiMap&lt;Integer,Integer&gt;} by operating and representing the keys
+ * and values only in their primitive state.
  */
 public class IntIntHashMultiMap implements IntIntMultiMap {
 
diff --git a/src/edu/ucla/sspace/util/primitive/IntIntMultiMap.java b/src/edu/ucla/sspace/util/primitive/IntIntMultiMap.java
index 499a7527..f511b3df 100644
--- a/src/edu/ucla/sspace/util/primitive/IntIntMultiMap.java
+++ b/src/edu/ucla/sspace/util/primitive/IntIntMultiMap.java
@@ -35,7 +35,8 @@
 
 
 /**
- *
+ * A {@link MultiMap} subinterface for mapping {@code int} primitives as both
+ * keys and values.
  */
 public interface IntIntMultiMap extends MultiMap<Integer,Integer> {
 
diff --git a/test/edu/ucla/sspace/dependency/BreadthFirstPathIteratorTest.java b/test/edu/ucla/sspace/dependency/BreadthFirstPathIteratorTest.java
index 2d956032..bd88c5fc 100644
--- a/test/edu/ucla/sspace/dependency/BreadthFirstPathIteratorTest.java
+++ b/test/edu/ucla/sspace/dependency/BreadthFirstPathIteratorTest.java
@@ -38,29 +38,29 @@
 public class BreadthFirstPathIteratorTest extends PathIteratorTestBase {
     
     String conll =
-        ""Anarchism       anarchism       NN      1       2       SBJ\n"" +
-        ""is      be      VBZ     2       0       ROOT\n"" +
-        ""a       a       DT      3      5       NMOD\n"" +
-        ""political       political       JJ      4       5       NMOD\n"" +
-        ""philosophy     philosophy      NN      5       2       PRD\n"" +
-        ""encompassing    encompass       VVG     6       5       NMOD\n"" +
-        ""theories        theory  NNS     7       6       OBJ\n"" +
-        ""and     and     CC      8      7       CC\n"" +
-        ""attitudes       attitude        NNS     9       7       COORD\n"" +
-        ""which   which  WDT     10      11      SBJ\n"" +
-        ""consider        consider        VVP     11      9       NMOD\n"" +
-        ""the    the     DT      12      13      NMOD\n"" +
-        ""state   state   NN      13      15      SBJ\n"" +
-        ""to      t      TO      14      15      VMOD\n"" +
-        ""be      be      VB      15      11      OBJ\n"" +
-        ""unnecessary    unnecessary     JJ      16      15      PRD\n"" +
-        "",       ,       ,       17      16      P\n"" +
-        ""harmul harmful JJ      18      16      COORD\n"" +
-        "",       ,       ,       19      16      P\n"" +
-        ""and/    ad/    JJ      20      16      COORD\n"" +
-        ""or      or      CC      21      16      CC\n"" +
-        ""undesirable    undesirable     JJ      22      16      COORD\n"" +
-        "".       .       SENT    23      2       P\n"";
+        ""Anarchism\tanarchism\tNN\t1\t2\tSBJ\n"" +
+        ""is\tbe\tVBZ\t2\t0\tROOT\n"" +
+        ""a\ta\tDT\t3\t5\tNMOD\n"" +
+        ""political\tpolitical\tJJ\t4\t5\tNMOD\n"" +
+        ""philosophy\tphilosophy\tNN\t5\t2\tPRD\n"" +
+        ""encompassing\tencompass\tVVG\t6\t5\tNMOD\n"" +
+        ""theories\ttheory\tNNS\t7\t6\tOBJ\n"" +
+        ""and\tand\tCC\t8\t7\tCC\n""+
+        ""attitudes\tattitude\tNNS\t9\t7\tCOORD\n""+
+        ""which\twhich\tWDT\t10\t11\tSBJ\n""+
+        ""consider\tconsider\tVVP\t11\t9\tNMOD\n""+
+        ""the\tthe\tDT\t12\t13\tNMOD\n""+
+        ""state\tstate\tNN\t13\t15\tSBJ\n""+
+        ""to\tt\tTO\t14\t15\tVMOD\n""+
+        ""be\tbe\tVB\t15\t11\tOBJ\n""+
+        ""unnecessary\tunnecessary\tJJ\t16\t15\tPRD\n""+
+        "",\t,\t,\t17\t16\tP\n""+
+        ""harmul\tharmful\tJJ\t18\t16\tCOORD\n""+
+        "",\t,\t,\t19\t16\tP\n""+
+        ""and/\tad/\tJJ\t20\t16\tCOORD\n""+
+        ""or\tor\tCC\t21\t16\tCC\n""+
+        ""undesirable\tundesirable\tJJ\t22\t16\tCOORD\n""+
+        "".\t.\tSENT\t23\t2\tP\n"";
 
     static final Map<String,Integer> PATH_START_COUNTS
         = new TreeMap<String,Integer>();
diff --git a/test/edu/ucla/sspace/dependency/CoNLLDependencyExtractorTest.java b/test/edu/ucla/sspace/dependency/CoNLLDependencyExtractorTest.java
index f0667223..06e9ae30 100644
--- a/test/edu/ucla/sspace/dependency/CoNLLDependencyExtractorTest.java
+++ b/test/edu/ucla/sspace/dependency/CoNLLDependencyExtractorTest.java
@@ -24,6 +24,8 @@
 import edu.ucla.sspace.text.StringDocument;
 import edu.ucla.sspace.text.Document;
 
+import java.io.BufferedReader;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -99,6 +101,8 @@ protected void evaluateRelations(DependencyTreeNode node,
         // Check that all the neighbors are in the e
         for (DependencyRelation rel : node.neighbors()) {
             System.out.println(""relation: "" + rel);
+            if (!expectedRelations.contains(rel))
+                System.out.printf(""FAIL: %s does not contain %s%n"", expectedRelations, rel);
             assertTrue(expectedRelations.contains(rel));
             // Remove the relation from the list to double check that the
             // neighbors are a list of duplicate relations.
@@ -120,7 +124,7 @@ protected void testFirstRoot(DependencyTreeNode[] relations, int index) {
         DependencyRelation[] expectedRelations = new DependencyRelation[] {
             new SimpleDependencyRelation(new SimpleDependencyTreeNode(""is"", ""VBZ""),
                                          ""SBJ"",
-                                         new SimpleDependencyTreeNode(""holt"", ""NNP"")),
+                                         new SimpleDependencyTreeNode(""Holt"", ""NNP"")),
             new SimpleDependencyRelation(new SimpleDependencyTreeNode(""is"", ""VBZ""),
                                          ""PRD"",
                                          new SimpleDependencyTreeNode(""columnist"", ""NN"")),
@@ -145,7 +149,7 @@ protected void testSecondRoot(DependencyTreeNode[] relations, int index) {
         DependencyRelation[] expectedRelations = new DependencyRelation[] {
             new SimpleDependencyRelation(new SimpleDependencyTreeNode(""beskattning"", ""N""),
                                          ""AT"",
-                                         new SimpleDependencyTreeNode(""individuell"", ""AJ"")),
+                                         new SimpleDependencyTreeNode(""Individuell"", ""AJ"")),
             new SimpleDependencyRelation(new SimpleDependencyTreeNode(""beskattning"", ""N""),
                                          ""ET"",
                                          new SimpleDependencyTreeNode(""av"", ""PR""))
@@ -157,29 +161,29 @@ protected void testSecondRoot(DependencyTreeNode[] relations, int index) {
 
     @Test public void testSingleExtraction() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
-        Document doc = new StringDocument(SINGLE_PARSE);
+        Document doc = new StringDocument(toTabs(SINGLE_PARSE));
         DependencyTreeNode[] nodes = extractor.readNextTree(doc.reader());
 
         assertEquals(12, nodes.length);
 
         // Check the basics of the node.
-        assertEquals(""review"", nodes[8].word());
+        assertEquals(""Review"", nodes[8].word());
         assertEquals(""NNP"", nodes[8].pos());
 
         // Test expected relation for each of the links for ""Review"".
         DependencyRelation[] expectedRelations = new DependencyRelation[] {
-            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""review"", ""NNP""),
+            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""Review"", ""NNP""),
                                          ""NMOD"",
                                          new SimpleDependencyTreeNode(""the"", ""DT"")),
-            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""review"", ""NNP""),
+            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""Review"", ""NNP""),
                                          ""NMOD"",
-                                         new SimpleDependencyTreeNode(""literary"", ""NNP"")),
-            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""review"", ""NNP""),
+                                         new SimpleDependencyTreeNode(""Literary"", ""NNP"")),
+            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""Review"", ""NNP""),
                                          ""ADV"",
                                          new SimpleDependencyTreeNode(""in"", ""IN"")),
             new SimpleDependencyRelation(new SimpleDependencyTreeNode(""for"", ""IN""),
                                          ""PMOD"",
-                                         new SimpleDependencyTreeNode(""review"", ""NNP""))
+                                         new SimpleDependencyTreeNode(""Review"", ""NNP""))
         };
 
         evaluateRelations(nodes[8], new LinkedList<DependencyRelation>(Arrays.asList(expectedRelations)));
@@ -187,14 +191,18 @@ protected void testSecondRoot(DependencyTreeNode[] relations, int index) {
 
     @Test public void testDoubleExtraction() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
-        Document doc = new StringDocument(DOUBLE_PARSE);
-        DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
+        Document doc = new StringDocument(""\n\n"" +
+                                          toTabs(SINGLE_PARSE) +
+                                          ""\n"" +
+                                          toTabs(SECOND_PARSE));
+        BufferedReader reader = doc.reader();
+        DependencyTreeNode[] relations = extractor.readNextTree(reader);
         assertTrue(relations != null);
         assertEquals(12, relations.length);
 
         testFirstRoot(relations, 2);
 
-        relations = extractor.readNextTree(doc.reader());
+        relations = extractor.readNextTree(reader);
         assertTrue(relations != null);
         assertEquals(4, relations.length);
 
@@ -203,7 +211,7 @@ protected void testSecondRoot(DependencyTreeNode[] relations, int index) {
     
     @Test public void testRootNode() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
-        Document doc = new StringDocument(SINGLE_PARSE);
+        Document doc = new StringDocument(toTabs(SINGLE_PARSE));
         DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
 
         assertEquals(12, relations.length);
@@ -213,7 +221,7 @@ protected void testSecondRoot(DependencyTreeNode[] relations, int index) {
 
     @Test public void testConcatonatedTrees() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
-        Document doc = new StringDocument(CONCATONATED_PARSE);
+        Document doc = new StringDocument(toTabs(CONCATONATED_PARSE));
         DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
         
         assertEquals(16, relations.length);
@@ -223,11 +231,26 @@ protected void testSecondRoot(DependencyTreeNode[] relations, int index) {
 
     @Test public void testConcatonatedTreesZeroOffset() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
-        Document doc = new StringDocument(DOUBLE_ZERO_OFFSET_PARSE);
+        Document doc = new StringDocument(toTabs(DOUBLE_ZERO_OFFSET_PARSE));
         DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
         
         assertEquals(16, relations.length);
         testFirstRoot(relations, 2);
         testSecondRoot(relations, 13);
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/dependency/WaCKyDependencyExtractorTest.java b/test/edu/ucla/sspace/dependency/WaCKyDependencyExtractorTest.java
index 8f466cdc..74a1ebbe 100644
--- a/test/edu/ucla/sspace/dependency/WaCKyDependencyExtractorTest.java
+++ b/test/edu/ucla/sspace/dependency/WaCKyDependencyExtractorTest.java
@@ -24,6 +24,8 @@
 import edu.ucla.sspace.text.StringDocument;
 import edu.ucla.sspace.text.Document;
 
+import java.io.BufferedReader;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -90,29 +92,29 @@ public class WaCKyDependencyExtractorTest extends CoNLLDependencyExtractorTest {
  
     @Test public void testSingleExtraction() throws Exception {
         DependencyExtractor extractor = new WaCKyDependencyExtractor();
-        Document doc = new StringDocument(SINGLE_PARSE);
+        Document doc = new StringDocument(toTabs(SINGLE_PARSE));
         DependencyTreeNode[] nodes = extractor.readNextTree(doc.reader());
 
         assertEquals(12, nodes.length);
 
         // Check the basics of the node.
-        assertEquals(""review"", nodes[8].word());
+        assertEquals(""Review"", nodes[8].word());
         assertEquals(""NNP"", nodes[8].pos());
 
         // Test expected relation for each of the links for ""Review"".
         DependencyRelation[] expectedRelations = new DependencyRelation[] {
-            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""review"", ""NNP""),
+            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""Review"", ""NNP""),
                                          ""NMOD"",
                                          new SimpleDependencyTreeNode(""the"", ""DT"")),
-            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""review"", ""NNP""),
+            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""Review"", ""NNP""),
                                          ""NMOD"",
-                                         new SimpleDependencyTreeNode(""literary"", ""NNP"")),
-            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""review"", ""NNP""),
+                                         new SimpleDependencyTreeNode(""Literary"", ""NNP"")),
+            new SimpleDependencyRelation(new SimpleDependencyTreeNode(""Review"", ""NNP""),
                                          ""ADV"",
                                          new SimpleDependencyTreeNode(""in"", ""IN"")),
             new SimpleDependencyRelation(new SimpleDependencyTreeNode(""for"", ""IN""),
                                          ""PMOD"",
-                                         new SimpleDependencyTreeNode(""review"", ""NNP""))
+                                         new SimpleDependencyTreeNode(""Review"", ""NNP""))
         };
 
         evaluateRelations(nodes[8], new LinkedList<DependencyRelation>(Arrays.asList(expectedRelations)));
@@ -120,14 +122,15 @@ public class WaCKyDependencyExtractorTest extends CoNLLDependencyExtractorTest {
 
     @Test public void testDoubleExtraction() throws Exception {
         DependencyExtractor extractor = new WaCKyDependencyExtractor();
-        Document doc = new StringDocument(DOUBLE_PARSE);
-        DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
+        Document doc = new StringDocument(toTabs(DOUBLE_PARSE));
+        BufferedReader reader = doc.reader();
+        DependencyTreeNode[] relations = extractor.readNextTree(reader);
         assertTrue(relations != null);
         assertEquals(12, relations.length);
 
         testFirstRoot(relations, 2);
 
-        relations = extractor.readNextTree(doc.reader());
+        relations = extractor.readNextTree(reader);
         assertTrue(relations != null);
         assertEquals(4, relations.length);
 
@@ -136,7 +139,7 @@ public class WaCKyDependencyExtractorTest extends CoNLLDependencyExtractorTest {
     
     @Test public void testRootNode() throws Exception {
         DependencyExtractor extractor = new WaCKyDependencyExtractor();
-        Document doc = new StringDocument(SINGLE_PARSE);
+        Document doc = new StringDocument(toTabs(SINGLE_PARSE));
         DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
 
         assertEquals(12, relations.length);
@@ -146,7 +149,7 @@ public class WaCKyDependencyExtractorTest extends CoNLLDependencyExtractorTest {
 
     @Test public void testConcatonatedTrees() throws Exception {
         DependencyExtractor extractor = new WaCKyDependencyExtractor();
-        Document doc = new StringDocument(CONCATONATED_PARSE);
+        Document doc = new StringDocument(toTabs(CONCATONATED_PARSE));
         DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
         
         assertEquals(16, relations.length);
@@ -156,11 +159,26 @@ public class WaCKyDependencyExtractorTest extends CoNLLDependencyExtractorTest {
 
     @Test public void testConcatonatedTreesZeroOffset() throws Exception {
         DependencyExtractor extractor = new WaCKyDependencyExtractor();
-        Document doc = new StringDocument(DOUBLE_ZERO_OFFSET_PARSE);
+        Document doc = new StringDocument(toTabs(DOUBLE_ZERO_OFFSET_PARSE));
         DependencyTreeNode[] relations = extractor.readNextTree(doc.reader());
         
         assertEquals(16, relations.length);
         testFirstRoot(relations, 2);
         testSecondRoot(relations, 13);
     }
-}
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/test/edu/ucla/sspace/graph/DirectedMultigraphTests.java b/test/edu/ucla/sspace/graph/DirectedMultigraphTests.java
index eb6102f5..73424070 100644
--- a/test/edu/ucla/sspace/graph/DirectedMultigraphTests.java
+++ b/test/edu/ucla/sspace/graph/DirectedMultigraphTests.java
@@ -36,1182 +36,1182 @@
  */
 public class DirectedMultigraphTests { 
 
-//     @Test public void testConstructor() {
-//         Set<Integer> vertices = new HashSet<Integer>();
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         assertEquals(0, g.order());
-//         assertEquals(0, g.size());
-//     }
-
-//     @Test(expected=NullPointerException.class) public void testConstructor2NullArg() {
-//         Graph<Edge> g = new SparseUndirectedGraph((Graph<DirectedTypedEdge<String>>)null);
-//     }
-
-//     @Test public void testAdd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         assertTrue(g.add(0));
-//         assertEquals(1, g.order());
-//         assertTrue(g.contains(0));
-//         // second add should have no effect
-//         assertFalse(g.add(0));
-//         assertEquals(1, g.order());
-//         assertTrue(g.contains(0));
-
-//         assertTrue(g.add(1));
-//         assertEquals(2, g.order());
-//         assertTrue(g.contains(1));
-//     }
-
-//     @Test public void testEquals() {
-//         DirectedMultigraph<String> g1 = new DirectedMultigraph<String>();
-//         DirectedMultigraph<String> g2 = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 g1.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//                 g2.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//             }
-//         }
-//         assertEquals(g1, g2);
-
-//         g1 = new DirectedMultigraph<String>();
-//         g2 = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 g1.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//                 g2.add(new SimpleDirectedTypedEdge<String>(""type-1"",j, i));
-//             }
-//         }
-
-//         assertFalse(g1.equals(g2));
-//         assertFalse(g2.equals(g1));
-//     }
-
-//     @Test public void testEqualGeneric() {
-//         DirectedMultigraph<String> g1 = new DirectedMultigraph<String>();
-//         Graph<DirectedTypedEdge<String>> g2 = new GenericGraph<DirectedTypedEdge<String>>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 g1.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//                 g2.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//             }
-//         }
-//         assertEquals(g1, g2);
-//     }
-
-//     @Test public void testContainsEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 100; ++i)
-//             for (int j = i + 1; j < 100; ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-
-//         for (int i = 0; i < 100; ++i) {
-//             for (int j = i + 1; j < 100; ++j) {
-//                 g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//                 g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",j, i));
-//                 g.contains(i, j);
-//                 g.contains(j, i);
-//             }
-//         }
-//     }
-
-//     @Test public void testAddEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         assertTrue(g.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-//         assertEquals(2, g.order());
-//         assertEquals(1, g.size());
-//         assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-
-//         g.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 2));
-//         assertEquals(3, g.order());
-//         assertEquals(2, g.size());
-//         assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 2)));
-
-//         g.add(new SimpleDirectedTypedEdge<String>(""type-1"",3, 4));
-//         assertEquals(5, g.order());
-//         assertEquals(3, g.size());
-//         assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",3, 4)));
-//     }
-
-//     @Test public void testRemoveLesserVertexWithEdges() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         for (int i = 1; i < 100; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             g.add(e);
-//         }
+    @Test public void testConstructor() {
+        Set<Integer> vertices = new HashSet<Integer>();
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        assertEquals(0, g.order());
+        assertEquals(0, g.size());
+    }
+
+    @Test(expected=NullPointerException.class) public void testConstructor2NullArg() {
+        Graph<Edge> g = new SparseUndirectedGraph((Graph<DirectedTypedEdge<String>>)null);
+    }
+
+    @Test public void testAdd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        assertTrue(g.add(0));
+        assertEquals(1, g.order());
+        assertTrue(g.contains(0));
+        // second add should have no effect
+        assertFalse(g.add(0));
+        assertEquals(1, g.order());
+        assertTrue(g.contains(0));
+
+        assertTrue(g.add(1));
+        assertEquals(2, g.order());
+        assertTrue(g.contains(1));
+    }
+
+    @Test public void testEquals() {
+        DirectedMultigraph<String> g1 = new DirectedMultigraph<String>();
+        DirectedMultigraph<String> g2 = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                g1.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+                g2.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+            }
+        }
+        assertEquals(g1, g2);
+
+        g1 = new DirectedMultigraph<String>();
+        g2 = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                g1.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+                g2.add(new SimpleDirectedTypedEdge<String>(""type-1"",j, i));
+            }
+        }
+
+        assertFalse(g1.equals(g2));
+        assertFalse(g2.equals(g1));
+    }
+
+    @Test public void testEqualGeneric() {
+        DirectedMultigraph<String> g1 = new DirectedMultigraph<String>();
+        Graph<DirectedTypedEdge<String>> g2 = new GenericGraph<DirectedTypedEdge<String>>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                g1.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+                g2.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+            }
+        }
+        assertEquals(g1, g2);
+    }
+
+    @Test public void testContainsEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 100; ++i)
+            for (int j = i + 1; j < 100; ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+
+        for (int i = 0; i < 100; ++i) {
+            for (int j = i + 1; j < 100; ++j) {
+                g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+                g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",j, i));
+                g.contains(i, j);
+                g.contains(j, i);
+            }
+        }
+    }
+
+    @Test public void testAddEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        assertTrue(g.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+        assertEquals(2, g.order());
+        assertEquals(1, g.size());
+        assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+
+        g.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 2));
+        assertEquals(3, g.order());
+        assertEquals(2, g.size());
+        assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 2)));
+
+        g.add(new SimpleDirectedTypedEdge<String>(""type-1"",3, 4));
+        assertEquals(5, g.order());
+        assertEquals(3, g.size());
+        assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",3, 4)));
+    }
+
+    @Test public void testRemoveLesserVertexWithEdges() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        for (int i = 1; i < 100; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            g.add(e);
+        }
        
-//         assertTrue(g.contains(0));
-//         assertTrue(g.remove(0));
-//         assertEquals(99, g.order());
-//         assertEquals(0, g.size());
-//     }
-
-//     @Test public void testRemoveHigherVertexWithEdges() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         for (int i = 0; i < 99; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",100, i);
-//             g.add(e);
-//         }
+        assertTrue(g.contains(0));
+        assertTrue(g.remove(0));
+        assertEquals(99, g.order());
+        assertEquals(0, g.size());
+    }
+
+    @Test public void testRemoveHigherVertexWithEdges() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        for (int i = 0; i < 99; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",100, i);
+            g.add(e);
+        }
         
-//         assertTrue(g.contains(100));
-//         assertTrue(g.remove(100));
-//         assertEquals(99, g.order());
-//         assertEquals(0, g.size());
-//     }
-
-
-//     @Test public void testRemoveVertex() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//         }
-
-//         for (int i = 99; i >= 0; --i) {            
-//             assertTrue(g.remove(i));
-//             assertEquals(i, g.order());
-//             assertFalse(g.contains(i));
-//             assertFalse(g.remove(i));
-//         }
-//     }
-
-//     @Test public void testRemoveEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         for (int i = 1; i < 100; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             g.add(e);
-//         }
+        assertTrue(g.contains(100));
+        assertTrue(g.remove(100));
+        assertEquals(99, g.order());
+        assertEquals(0, g.size());
+    }
+
+
+    @Test public void testRemoveVertex() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+        }
+
+        for (int i = 99; i >= 0; --i) {            
+            assertTrue(g.remove(i));
+            assertEquals(i, g.order());
+            assertFalse(g.contains(i));
+            assertFalse(g.remove(i));
+        }
+    }
+
+    @Test public void testRemoveEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        for (int i = 1; i < 100; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            g.add(e);
+        }
         
-//         for (int i = 99; i > 0; --i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             assertTrue(g.remove(e));
-//             assertEquals(i-1, g.size());
-//             assertFalse(g.contains(e));
-//             assertFalse(g.remove(e));
-//         }
-//     }
-
-//     @Test public void testVertexIterator() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-//         assertEquals(control.size(), g.order());
-//         for (Integer i : g.vertices())
-//             assertTrue(control.contains(i));        
-//     }
-
-//     @Test public void testEdgeIterator() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 1; i <= 100; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             g.add(e);
-//             control.add(e);
-//         }
-
-//         assertEquals(control.size(), g.size());
-//         assertEquals(control.size(), g.edges().size());
-//         int returned = 0;
-//         for (Edge e : g.edges()) {
-//             assertTrue(control.remove(e));
-//             returned++;
-//         }
-//         assertEquals(g.size(), returned);
-//         assertEquals(0, control.size());
-//     }
-
-//     @Test public void testEdgeIteratorSmall() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 1; i <= 5; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             assertTrue(g.add(e));
-//             control.add(e);
-//         }
-
-//         assertEquals(control.size(), g.size());
-//         assertEquals(control.size(), g.edges().size());
-//         int returned = 0;
-//         for (Edge e : g.edges()) {
-//             System.out.println(e);
-//             assertTrue(control.contains(e));
-//             returned++;
-//         }
-//         assertEquals(control.size(), returned);
-//     }
-
-//     @Test public void testEdgeIteratorSmallReverse() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 1; i <= 5; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, 0);
-//             g.add(e);
-//             control.add(e);
-//         }
-
-//         assertEquals(control.size(), g.size());
-//         assertEquals(control.size(), g.edges().size());
-//         int returned = 0;
-//         for (Edge e : g.edges()) {
-//             System.out.println(e);
-//             assertTrue(control.contains(e));
-//             returned++;
-//         }
-//         assertEquals(control.size(), returned);
-//     }
-
-
-//     @Test public void testAdjacentEdges() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 1; i <= 100; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             g.add(e);
-//             control.add(e);
-//         }
+        for (int i = 99; i > 0; --i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            assertTrue(g.remove(e));
+            assertEquals(i-1, g.size());
+            assertFalse(g.contains(e));
+            assertFalse(g.remove(e));
+        }
+    }
+
+    @Test public void testVertexIterator() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+        assertEquals(control.size(), g.order());
+        for (Integer i : g.vertices())
+            assertTrue(control.contains(i));        
+    }
+
+    @Test public void testEdgeIterator() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            g.add(e);
+            control.add(e);
+        }
+
+        assertEquals(control.size(), g.size());
+        assertEquals(control.size(), g.edges().size());
+        int returned = 0;
+        for (Edge e : g.edges()) {
+            assertTrue(control.remove(e));
+            returned++;
+        }
+        assertEquals(g.size(), returned);
+        assertEquals(0, control.size());
+    }
+
+    @Test public void testEdgeIteratorSmall() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 1; i <= 5; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            assertTrue(g.add(e));
+            control.add(e);
+        }
+
+        assertEquals(control.size(), g.size());
+        assertEquals(control.size(), g.edges().size());
+        int returned = 0;
+        for (Edge e : g.edges()) {
+            System.out.println(e);
+            assertTrue(control.contains(e));
+            returned++;
+        }
+        assertEquals(control.size(), returned);
+    }
+
+    @Test public void testEdgeIteratorSmallReverse() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 1; i <= 5; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, 0);
+            g.add(e);
+            control.add(e);
+        }
+
+        assertEquals(control.size(), g.size());
+        assertEquals(control.size(), g.edges().size());
+        int returned = 0;
+        for (Edge e : g.edges()) {
+            System.out.println(e);
+            assertTrue(control.contains(e));
+            returned++;
+        }
+        assertEquals(control.size(), returned);
+    }
+
+
+    @Test public void testAdjacentEdges() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            g.add(e);
+            control.add(e);
+        }
         
-//         Set<DirectedTypedEdge<String>> test = g.getAdjacencyList(0);
-//         assertEquals(control, test);
-//     }
-
-//     @Test public void testAdjacencyListSize() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
+        Set<DirectedTypedEdge<String>> test = g.getAdjacencyList(0);
+        assertEquals(control, test);
+    }
+
+    @Test public void testAdjacencyListSize() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
         
-//         Set<DirectedTypedEdge<String>> adjList = g.getAdjacencyList(0);
-//         assertEquals(9, adjList.size());
+        Set<DirectedTypedEdge<String>> adjList = g.getAdjacencyList(0);
+        assertEquals(9, adjList.size());
 
-//         adjList = g.getAdjacencyList(1);
-//         assertEquals(9, adjList.size());
+        adjList = g.getAdjacencyList(1);
+        assertEquals(9, adjList.size());
 
-//         adjList = g.getAdjacencyList(2);
-//         assertEquals(9, adjList.size());
+        adjList = g.getAdjacencyList(2);
+        assertEquals(9, adjList.size());
 
-//         adjList = g.getAdjacencyList(3);
-//         assertEquals(9, adjList.size());
+        adjList = g.getAdjacencyList(3);
+        assertEquals(9, adjList.size());
 
-//         adjList = g.getAdjacencyList(5);
-//         assertEquals(9, adjList.size());
-//     }
+        adjList = g.getAdjacencyList(5);
+        assertEquals(9, adjList.size());
+    }
 
 
-//     @Test public void testAdjacentEdgesRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 1; i <= 100; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             g.add(e);
-//             control.add(e);
-//         }
+    @Test public void testAdjacentEdgesRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            g.add(e);
+            control.add(e);
+        }
         
-//         Set<DirectedTypedEdge<String>> test = g.getAdjacencyList(0);
-//         assertEquals(control, test);
-
-//         Edge removed = new SimpleDirectedTypedEdge<String>(""type-1"",0, 1);
-//         assertTrue(test.remove(removed));
-//         assertTrue(control.remove(removed));
-//         assertEquals(control, test);
-//         assertEquals(99, g.size());
-//     }
-
-//     @Test public void testAdjacentEdgesAdd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 1; i <= 100; ++i) {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
-//             g.add(e);
-//             control.add(e);
-//         }
+        Set<DirectedTypedEdge<String>> test = g.getAdjacencyList(0);
+        assertEquals(control, test);
+
+        Edge removed = new SimpleDirectedTypedEdge<String>(""type-1"",0, 1);
+        assertTrue(test.remove(removed));
+        assertTrue(control.remove(removed));
+        assertEquals(control, test);
+        assertEquals(99, g.size());
+    }
+
+    @Test public void testAdjacentEdgesAdd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 1; i <= 100; ++i) {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, i);
+            g.add(e);
+            control.add(e);
+        }
         
-//         Set<DirectedTypedEdge<String>> test = g.getAdjacencyList(0);
-//         assertEquals(control, test);
-
-//         DirectedTypedEdge<String> added = new SimpleDirectedTypedEdge<String>(""type-1"",0, 101);
-//         assertTrue(test.add(added));
-//         assertTrue(control.add(added));
-//         assertEquals(control, test);
-//         assertEquals(101, g.size());
-//         assertTrue(g.contains(added));
-//         assertTrue(g.contains(101));
-//         assertEquals(102, g.order());
-//     }
-
-//     @Test public void testClear() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         g.clear();
-//         assertEquals(0, g.size());
-//         assertEquals(0, g.order());
-//         assertEquals(0, g.vertices().size());
-//         assertEquals(0, g.edges().size());
+        Set<DirectedTypedEdge<String>> test = g.getAdjacencyList(0);
+        assertEquals(control, test);
+
+        DirectedTypedEdge<String> added = new SimpleDirectedTypedEdge<String>(""type-1"",0, 101);
+        assertTrue(test.add(added));
+        assertTrue(control.add(added));
+        assertEquals(control, test);
+        assertEquals(101, g.size());
+        assertTrue(g.contains(added));
+        assertTrue(g.contains(101));
+        assertEquals(102, g.order());
+    }
+
+    @Test public void testClear() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        g.clear();
+        assertEquals(0, g.size());
+        assertEquals(0, g.order());
+        assertEquals(0, g.vertices().size());
+        assertEquals(0, g.edges().size());
         
-//         // Error checking case for double-clear
-//         g.clear();
-//     }
-
-//     @Test public void testClearEdges() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         g.clearEdges();
-//         assertEquals(0, g.size());
-//         assertEquals(10, g.order());
-//         assertEquals(10, g.vertices().size());
-//         assertEquals(0, g.edges().size());
+        // Error checking case for double-clear
+        g.clear();
+    }
+
+    @Test public void testClearEdges() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        g.clearEdges();
+        assertEquals(0, g.size());
+        assertEquals(10, g.order());
+        assertEquals(10, g.vertices().size());
+        assertEquals(0, g.edges().size());
         
-//         // Error checking case for double-clear
-//         g.clearEdges();
-//     }
-
-//     @Test public void testToString() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i)
-//             for (int j = i + 1; j < 10; ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         g.toString();
-
-//         // only vertices
-//         g.clearEdges();
-//         g.toString();
-
-//         // empty graph
-//         g.clear();
-//         g.toString();
+        // Error checking case for double-clear
+        g.clearEdges();
+    }
+
+    @Test public void testToString() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 1; j < 10; ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        g.toString();
+
+        // only vertices
+        g.clearEdges();
+        g.toString();
+
+        // empty graph
+        g.clear();
+        g.toString();
         
-//     }
-
-//     /******************************************************************
-//      *
-//      *
-//      * VertexSet tests 
-//      *
-//      *
-//      ******************************************************************/
-
-//     @Test(expected=UnsupportedOperationException.class) public void testVertexSetAdd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         assertEquals(control.size(), vertices.size());
-//         assertTrue(vertices.add(100));
-//         assertTrue(g.contains(100));
-//         assertEquals(101, vertices.size());
-//         assertEquals(101, g.order());
+    }
+
+    /******************************************************************
+     *
+     *
+     * VertexSet tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetAdd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(vertices.add(100));
+        assertTrue(g.contains(100));
+        assertEquals(101, vertices.size());
+        assertEquals(101, g.order());
         
-//         // dupe
-//         assertFalse(vertices.add(100));
-//         assertEquals(101, vertices.size());
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testVertexSetAddFromGraph() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         assertEquals(control.size(), vertices.size());
-//         assertTrue(g.add(100));
-//         assertTrue(g.contains(100));
-//         assertTrue(vertices.contains(100));
-//         assertEquals(101, vertices.size());
-//         assertEquals(101, g.order());
+        // dupe
+        assertFalse(vertices.add(100));
+        assertEquals(101, vertices.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetAddFromGraph() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(g.add(100));
+        assertTrue(g.contains(100));
+        assertTrue(vertices.contains(100));
+        assertEquals(101, vertices.size());
+        assertEquals(101, g.order());
         
-//         // dupe
-//         assertFalse(vertices.add(100));
-//         assertEquals(101, vertices.size());
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testVertexSetRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         assertEquals(control.size(), vertices.size());
-//         assertTrue(g.contains(99));
-//         assertTrue(vertices.remove(99));
-//         assertFalse(g.contains(99));
-//         assertEquals(99, vertices.size());
-//         assertEquals(99, g.order());
+        // dupe
+        assertFalse(vertices.add(100));
+        assertEquals(101, vertices.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(g.contains(99));
+        assertTrue(vertices.remove(99));
+        assertFalse(g.contains(99));
+        assertEquals(99, vertices.size());
+        assertEquals(99, g.order());
         
-//         // dupe
-//         assertFalse(vertices.remove(99));
-//         assertEquals(99, vertices.size());
-//     }
-
-//     @Test public void testVertexSetRemoveFromGraph() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         assertEquals(control.size(), vertices.size());
-//         assertTrue(g.remove(99));
-
-//         assertFalse(g.contains(99));
-//         assertFalse(vertices.contains(99));
-//         assertEquals(99, vertices.size());
-//         assertEquals(99, g.order());        
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         assertEquals(control.size(), vertices.size());
-//         Iterator<Integer> iter = vertices.iterator();
-//         assertTrue(iter.hasNext());
-//         Integer toRemove = iter.next();
-//         assertTrue(g.contains(toRemove));
-//         assertTrue(vertices.contains(toRemove));
-//         iter.remove();
-//         assertFalse(g.contains(toRemove));
-//         assertFalse(vertices.contains(toRemove));
-//         assertEquals(g.order(), vertices.size());
-//     }
-
-//     @Test(expected=NoSuchElementException.class) public void testVertexSetIteratorTooFar() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         Iterator<Integer> iter = vertices.iterator();
-//         int i = 0;
-//         while (iter.hasNext()) {
-//             i++; 
-//             iter.next();
-//         }
-//         assertEquals(vertices.size(), i);
-//         iter.next();
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemoveTwice() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         Iterator<Integer> iter = vertices.iterator();
-//         assertTrue(iter.hasNext());
-//         Integer toRemove = iter.next();
-//         assertTrue(g.contains(toRemove));
-//         assertTrue(vertices.contains(toRemove));
-//         iter.remove();
-//         iter.remove();
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemoveEarly() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<Integer> control = new HashSet<Integer>();
-//         for (int i = 0; i < 100; ++i) {
-//             g.add(i);
-//             control.add(i);
-//         }
-
-//         Set<Integer> vertices = g.vertices();
-//         Iterator<Integer> iter = vertices.iterator();
-//         iter.remove();
-//     }
+        // dupe
+        assertFalse(vertices.remove(99));
+        assertEquals(99, vertices.size());
+    }
+
+    @Test public void testVertexSetRemoveFromGraph() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        assertTrue(g.remove(99));
+
+        assertFalse(g.contains(99));
+        assertFalse(vertices.contains(99));
+        assertEquals(99, vertices.size());
+        assertEquals(99, g.order());        
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        assertEquals(control.size(), vertices.size());
+        Iterator<Integer> iter = vertices.iterator();
+        assertTrue(iter.hasNext());
+        Integer toRemove = iter.next();
+        assertTrue(g.contains(toRemove));
+        assertTrue(vertices.contains(toRemove));
+        iter.remove();
+        assertFalse(g.contains(toRemove));
+        assertFalse(vertices.contains(toRemove));
+        assertEquals(g.order(), vertices.size());
+    }
+
+    @Test(expected=NoSuchElementException.class) public void testVertexSetIteratorTooFar() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        Iterator<Integer> iter = vertices.iterator();
+        int i = 0;
+        while (iter.hasNext()) {
+            i++; 
+            iter.next();
+        }
+        assertEquals(vertices.size(), i);
+        iter.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemoveTwice() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        Iterator<Integer> iter = vertices.iterator();
+        assertTrue(iter.hasNext());
+        Integer toRemove = iter.next();
+        assertTrue(g.contains(toRemove));
+        assertTrue(vertices.contains(toRemove));
+        iter.remove();
+        iter.remove();
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testVertexSetIteratorRemoveEarly() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<Integer> control = new HashSet<Integer>();
+        for (int i = 0; i < 100; ++i) {
+            g.add(i);
+            control.add(i);
+        }
+
+        Set<Integer> vertices = g.vertices();
+        Iterator<Integer> iter = vertices.iterator();
+        iter.remove();
+    }
     
 
-//     /******************************************************************
-//      *
-//      *
-//      * EdgeView tests 
-//      *
-//      *
-//      ******************************************************************/
-
-//     @Test public void testEdgeViewAdd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> edges = g.edges();
-//         assertEquals(g.size(), edges.size());
-//         edges.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1));
-//         assertEquals(2, g.order());
-//         assertEquals(1, g.size());
-//         assertEquals(1, edges.size());
-//         assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-//         assertTrue(edges.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-//     }
-
-//     @Test public void testEdgeViewRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> edges = g.edges();
-//         assertEquals(g.size(), edges.size());
-//         edges.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1));
-//         edges.remove(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1));
-//         assertEquals(2, g.order());
-//         assertEquals(0, g.size());
-//         assertEquals(0, edges.size());
-//         assertFalse(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-//         assertFalse(edges.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-//     }
-
-//     @Test public void testEdgeViewIterator() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> edges = g.edges();
-
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 0; i < 100; i += 2)  {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, i+1);
-//             g.add(e); // all disconnected
-//             control.add(e);
-//         }
+    /******************************************************************
+     *
+     *
+     * EdgeView tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testEdgeViewAdd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> edges = g.edges();
+        assertEquals(g.size(), edges.size());
+        edges.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1));
+        assertEquals(2, g.order());
+        assertEquals(1, g.size());
+        assertEquals(1, edges.size());
+        assertTrue(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+        assertTrue(edges.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+    }
+
+    @Test public void testEdgeViewRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> edges = g.edges();
+        assertEquals(g.size(), edges.size());
+        edges.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1));
+        edges.remove(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1));
+        assertEquals(2, g.order());
+        assertEquals(0, g.size());
+        assertEquals(0, edges.size());
+        assertFalse(g.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+        assertFalse(edges.contains(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+    }
+
+    @Test public void testEdgeViewIterator() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> edges = g.edges();
+
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 0; i < 100; i += 2)  {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, i+1);
+            g.add(e); // all disconnected
+            control.add(e);
+        }
     
 
-//         assertEquals(100, g.order());
-//         assertEquals(50, g.size());
-//         assertEquals(50, edges.size());
+        assertEquals(100, g.order());
+        assertEquals(50, g.size());
+        assertEquals(50, edges.size());
         
-//         Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
-//         for (DirectedTypedEdge<String> e : edges)
-//             test.add(e);
-//         assertEquals(control.size(), test.size());
-//         for (Edge e : test)
-//             assertTrue(control.contains(e));        
-//     }
-
-//     @Test public void testEdgeViewIteratorRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> edges = g.edges();
-
-//         Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
-//         for (int i = 0; i < 10; i += 2)  {
-//             DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, i+1);
-//             g.add(e); // all disconnected
-//             control.add(e);
-//         }
+        Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
+        for (DirectedTypedEdge<String> e : edges)
+            test.add(e);
+        assertEquals(control.size(), test.size());
+        for (Edge e : test)
+            assertTrue(control.contains(e));        
+    }
+
+    @Test public void testEdgeViewIteratorRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> edges = g.edges();
+
+        Set<DirectedTypedEdge<String>> control = new HashSet<DirectedTypedEdge<String>>();
+        for (int i = 0; i < 10; i += 2)  {
+            DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, i+1);
+            g.add(e); // all disconnected
+            control.add(e);
+        }
     
-//         assertEquals(10, g.order());
-//         assertEquals(5, g.size());
-//         assertEquals(5, edges.size());
+        assertEquals(10, g.order());
+        assertEquals(5, g.size());
+        assertEquals(5, edges.size());
         
-//         Iterator<DirectedTypedEdge<String>> iter = edges.iterator();
-//         while (iter.hasNext()) {
-//             iter.next();
-//             iter.remove();
-//         }
-//         assertEquals(0, g.size());
-//         assertFalse(g.edges().iterator().hasNext());
-//         assertEquals(0, edges.size());
-//         assertEquals(10, g.order());            
-//     }
-
-//     /******************************************************************
-//      *
-//      *
-//      * AdjacencyListView tests 
-//      *
-//      *
-//      ******************************************************************/
-
-//     @Test public void testAdjacencyList() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i)
-//             for (int j = i + 1; j < 10; ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-
-//         for (int i = 0; i < 10; ++i) {
-//             Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(i);
-//             assertEquals(9, adjacencyList.size());
+        Iterator<DirectedTypedEdge<String>> iter = edges.iterator();
+        while (iter.hasNext()) {
+            iter.next();
+            iter.remove();
+        }
+        assertEquals(0, g.size());
+        assertFalse(g.edges().iterator().hasNext());
+        assertEquals(0, edges.size());
+        assertEquals(10, g.order());            
+    }
+
+    /******************************************************************
+     *
+     *
+     * AdjacencyListView tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testAdjacencyList() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 1; j < 10; ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+
+        for (int i = 0; i < 10; ++i) {
+            Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(i);
+            assertEquals(9, adjacencyList.size());
             
-//             for (int j = 0; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 if (i >= j)
-//                     assertFalse(adjacencyList.contains(e));
-//                 else 
-//                     assertTrue(adjacencyList.contains(e));
-//             }
-//         }
-//     }
-
-//     @Test public void testAdjacencyListRemoveEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i)
-//             for (int j = i + 1; j < 10; ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         Edge e = new SimpleDirectedTypedEdge<String>(""type-1"",0, 1);
-//         assertTrue(adjacencyList.contains(e));
-//         assertTrue(adjacencyList.remove(e));
-//         assertEquals(8, adjacencyList.size());
-//         assertEquals( (10 * 9) / 2 - 1, g.size());
-//     }
-
-//     public void testAdjacencyListAddEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i)
-//             for (int j = i + 2; j < 10; ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-
-//         assertEquals( (10 * 9) / 2 - 9, g.size());
-
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, 1);
-//         assertFalse(adjacencyList.contains(e));
-//         assertFalse(g.contains(e));
-        
-//         assertTrue(adjacencyList.add(e));
-//         assertTrue(g.contains(e));
-      
-//         assertEquals(9, adjacencyList.size());
-//         assertEquals( (10 * 9) / 2 - 8, g.size());
-//     }
-
-//     @Test public void testAdjacencyListIterator() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         assertEquals(9, adjacencyList.size());
-        
-//         Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
-//         int i = 0;
-//         while (it.hasNext())
-//             assertTrue(test.add(it.next()));
-//         assertEquals(9, test.size());
-//     }
-
-//     @Test public void testAdjacencyListNoVertex() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);        
-//         assertEquals(0, adjacencyList.size());
-//     }
-
-//     @Test(expected=NoSuchElementException.class)
-//     public void testAdjacencyListIteratorNextOffEnd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         assertEquals(9, adjacencyList.size());
-        
-//         Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
-//         int i = 0;
-//         while (it.hasNext())
-//             assertTrue(test.add(it.next()));
-//         assertEquals(9, test.size());
-//         it.next();
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testAdjacencyListIteratorRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         assertEquals(9, adjacencyList.size());
-        
-//         Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
-//         assertTrue(it.hasNext());
-//         Edge e = it.next();
-//         it.remove();
-//         assertFalse(adjacencyList.contains(e));
-//         assertEquals(8, adjacencyList.size());
-//         assertFalse(g.contains(e));
-//         assertEquals( (10 * 9) / 2 - 1, g.size());
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class)
-//     public void testAdjacencyListIteratorRemoveFirst() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         assertEquals(9, adjacencyList.size());
-        
-//         Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
-//         it.remove();
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class)
-//     public void testAdjacencyListIteratorRemoveTwice() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
-//         Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
-//         assertEquals(9, adjacencyList.size());
-        
-//         Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
-//         assertTrue(it.hasNext());
-//         it.next();
-//         it.remove();
-//         it.remove();
-//     }
-
-//     /******************************************************************
-//      *
-//      *
-//      * AdjacentVerticesView tests 
-//      *
-//      *
-//      ******************************************************************/
-
-
-//     @Test public void testAdjacentVertices() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<Integer> test = new HashSet<Integer>();
-//         Set<Integer> adjacent = g.getNeighbors(0);
-//         assertEquals(9, adjacent.size());
-//         for (int i = 1; i < 10; ++i)
-//             assertTrue(adjacent.contains(i));
-//         assertFalse(adjacent.contains(0));
-//         assertFalse(adjacent.contains(10));
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesAdd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<Integer> test = new HashSet<Integer>();
-//         Set<Integer> adjacent = g.getNeighbors(0);
-//         adjacent.add(1);
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<Integer> test = new HashSet<Integer>();
-//         Set<Integer> adjacent = g.getNeighbors(0);
-//         adjacent.remove(1);
-//     }
-
-//     @Test public void testAdjacentVerticesIterator() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<Integer> test = new HashSet<Integer>();
-//         Set<Integer> adjacent = g.getNeighbors(0);
-//         Iterator<Integer> it = adjacent.iterator();
-//         while (it.hasNext())
-//             assertTrue(test.add(it.next()));
-//         assertEquals(9, test.size());
-//     }
-
-
-//     @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesIteratorRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-//         for (int i = 0; i < 10; ++i) {
-//             for (int j = i + 1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 g.add(e);
-//             }
-//         }
-
-//         Set<Integer> test = new HashSet<Integer>();
-//         Set<Integer> adjacent = g.getNeighbors(0);
-//         Iterator<Integer> it = adjacent.iterator();
-//         assertTrue(it.hasNext());
-//         it.next();
-//         it.remove();
-//     }
-
-//     /******************************************************************
-//      *
-//      *
-//      * Subgraph tests 
-//      *
-//      *
-//      ******************************************************************/
-
-//     @Test public void testSubgraph() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-//     }
-
-//     @Test public void testSubgraphContainsVertex() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);        
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-//         for (int i = 0; i < 5; ++i)
-//             assertTrue(subgraph.contains(i));
-//         for (int i = 5; i < 10; ++i) {
-//             assertTrue(g.contains(i));
-//             assertFalse(subgraph.contains(i));
-//         }
-//     }
-
-//     @Test public void testSubgraphContainsEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);        
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-//         for (int i = 0; i < 5; ++i) {
-//             for (int j = i+1; j < 5; ++j) {
-//                 assertTrue(subgraph.contains(new SimpleDirectedTypedEdge<String>(""type-1"",i, j)));
-//             }
-//         }
-
-//         for (int i = 5; i < 10; ++i) {
-//             for (int j = i+1; j < 10; ++j) {
-//                 DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
-//                 assertTrue(g.contains(e));
-//                 assertFalse(subgraph.contains(e));
-//             }
-//         }
-//     }
-
-//     @Test public void testSubgraphAddEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < i+2 && j < 10; ++j)
-//                 assertTrue(g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j)));
-//         }    
-
-//         assertEquals(9, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals(4, subgraph.size());
-
-//         // Add an edge to a new vertex
-//         assertTrue(subgraph.add(new SimpleDirectedTypedEdge<String>(""type-1"", 1, 0)));
-//         assertEquals(5, subgraph.size());
-//         assertEquals(5, subgraph.order());
-//         assertEquals(10, g.size());
-
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testSubgraphAddEdgeNewVertex() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-
-//         // Add an edge to a new vertex
-//         assertTrue(subgraph.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 5)));
-//         assertEquals( (5 * 4) / 2 + 1, subgraph.size());
-//         assertEquals(6, subgraph.order());
-//         assertEquals(11, g.order());
-//         assertEquals( (9*10)/2 + 1, g.size());
-//     }
-
-//     @Test public void testSubgraphRemoveEdge() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-
-//         // Remove an existing edge
-//         assertTrue(subgraph.remove(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
-//         assertEquals( (5 * 4) / 2 - 1, subgraph.size());
-//         assertEquals(5, subgraph.order());
-//         assertEquals(10, g.order());
-//         assertEquals( (9*10)/2 - 1, g.size());
-
-//         // Remove a non-existent edge, which should have no effect even though
-//         // the edge is present in the backing graph
-//         assertFalse(subgraph.remove(new SimpleDirectedTypedEdge<String>(""type-1"",0, 6)));
-//         assertEquals( (5 * 4) / 2 - 1, subgraph.size());
-//         assertEquals(5, subgraph.order());
-//         assertEquals(10, g.order());
-//         assertEquals( (9*10)/2 - 1, g.size());
-//     }
-
-
-//     /******************************************************************
-//      *
-//      *
-//      * SubgraphVertexView tests 
-//      *
-//      *
-//      ******************************************************************/
-
-
-//     @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesAdd() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-
-//         Set<Integer> test = subgraph.vertices();
-//         assertEquals(5, test.size());
-
-//         // Add a vertex 
-//         assertTrue(test.add(5));
-//         assertEquals(6, test.size());
-//         assertEquals(6, subgraph.order());
-//         assertEquals(11, g.order());
-//         assertEquals( (5*4)/2, subgraph.size());
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-
-//         Set<Integer> test = subgraph.vertices();
-//         assertEquals(5, test.size());
-
-//         // Add a vertex 
-//         assertTrue(test.remove(0));
-//         assertEquals(4, test.size());
-//         assertEquals(4, subgraph.order());
-//         assertEquals(9, g.order());
-//         assertEquals( (4*3)/2, subgraph.size());
-//     }
-
-//     @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesIteratorRemove() {
-//         DirectedMultigraph<String> g = new DirectedMultigraph<String>();
-
-//         // fully connected
-//         for (int i = 0; i < 10; i++)  {
-//             for (int j = i+1; j < 10;  ++j)
-//                 g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
-//         }    
-
-//         // (n * (n-1)) / 2
-//         assertEquals( (10 * 9) / 2, g.size());
-//         assertEquals(10, g.order());
-
-//         Set<Integer> vertices = new LinkedHashSet<Integer>();
-//         for (int i = 0; i < 5; ++i)
-//             vertices.add(i);
-
-//         DirectedMultigraph<String> subgraph = g.subgraph(vertices);
-//         assertEquals(5, subgraph.order());
-//         assertEquals( (5 * 4) / 2, subgraph.size());
-
-//         Set<Integer> test = subgraph.vertices();
-//         assertEquals(5, test.size());
-//         Iterator<Integer> it = test.iterator();
-//         assertTrue(it.hasNext());
-//         // Remove the first vertex returned
-//         it.next();
-//         it.remove();
-        
-//         assertEquals(4, test.size());
-//         assertEquals(4, subgraph.order());
-//         assertEquals(9, g.order());
-//         assertEquals( (4*3)/2, subgraph.size());
-//     }
+            for (int j = 0; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                if (i >= j)
+                    assertFalse(adjacencyList.contains(e));
+                else 
+                    assertTrue(adjacencyList.contains(e));
+            }
+        }
+    }
+
+    @Test public void testAdjacencyListRemoveEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 1; j < 10; ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        Edge e = new SimpleDirectedTypedEdge<String>(""type-1"",0, 1);
+        assertTrue(adjacencyList.contains(e));
+        assertTrue(adjacencyList.remove(e));
+        assertEquals(8, adjacencyList.size());
+        assertEquals( (10 * 9) / 2 - 1, g.size());
+    }
+
+    public void testAdjacencyListAddEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i)
+            for (int j = i + 2; j < 10; ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+
+        assertEquals( (10 * 9) / 2 - 9, g.size());
+
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",0, 1);
+        assertFalse(adjacencyList.contains(e));
+        assertFalse(g.contains(e));
+        
+        assertTrue(adjacencyList.add(e));
+        assertTrue(g.contains(e));
+      
+        assertEquals(9, adjacencyList.size());
+        assertEquals( (10 * 9) / 2 - 8, g.size());
+    }
+
+    @Test public void testAdjacencyListIterator() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
+        int i = 0;
+        while (it.hasNext())
+            assertTrue(test.add(it.next()));
+        assertEquals(9, test.size());
+    }
+
+    @Test public void testAdjacencyListNoVertex() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);        
+        assertEquals(0, adjacencyList.size());
+    }
+
+    @Test(expected=NoSuchElementException.class)
+    public void testAdjacencyListIteratorNextOffEnd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
+        int i = 0;
+        while (it.hasNext())
+            assertTrue(test.add(it.next()));
+        assertEquals(9, test.size());
+        it.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacencyListIteratorRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
+        assertTrue(it.hasNext());
+        Edge e = it.next();
+        it.remove();
+        assertFalse(adjacencyList.contains(e));
+        assertEquals(8, adjacencyList.size());
+        assertFalse(g.contains(e));
+        assertEquals( (10 * 9) / 2 - 1, g.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAdjacencyListIteratorRemoveFirst() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
+        it.remove();
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAdjacencyListIteratorRemoveTwice() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<DirectedTypedEdge<String>> test = new HashSet<DirectedTypedEdge<String>>();
+        Set<DirectedTypedEdge<String>> adjacencyList = g.getAdjacencyList(0);
+        assertEquals(9, adjacencyList.size());
+        
+        Iterator<DirectedTypedEdge<String>> it = adjacencyList.iterator();
+        assertTrue(it.hasNext());
+        it.next();
+        it.remove();
+        it.remove();
+    }
+
+    /******************************************************************
+     *
+     *
+     * AdjacentVerticesView tests 
+     *
+     *
+     ******************************************************************/
+
+
+    @Test public void testAdjacentVertices() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        assertEquals(9, adjacent.size());
+        for (int i = 1; i < 10; ++i)
+            assertTrue(adjacent.contains(i));
+        assertFalse(adjacent.contains(0));
+        assertFalse(adjacent.contains(10));
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesAdd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        adjacent.add(1);
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        adjacent.remove(1);
+    }
+
+    @Test public void testAdjacentVerticesIterator() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        Iterator<Integer> it = adjacent.iterator();
+        while (it.hasNext())
+            assertTrue(test.add(it.next()));
+        assertEquals(9, test.size());
+    }
+
+
+    @Test(expected=UnsupportedOperationException.class) public void testAdjacentVerticesIteratorRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+        for (int i = 0; i < 10; ++i) {
+            for (int j = i + 1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                g.add(e);
+            }
+        }
+
+        Set<Integer> test = new HashSet<Integer>();
+        Set<Integer> adjacent = g.getNeighbors(0);
+        Iterator<Integer> it = adjacent.iterator();
+        assertTrue(it.hasNext());
+        it.next();
+        it.remove();
+    }
+
+    /******************************************************************
+     *
+     *
+     * Subgraph tests 
+     *
+     *
+     ******************************************************************/
+
+    @Test public void testSubgraph() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+    }
+
+    @Test public void testSubgraphContainsVertex() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);        
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+        for (int i = 0; i < 5; ++i)
+            assertTrue(subgraph.contains(i));
+        for (int i = 5; i < 10; ++i) {
+            assertTrue(g.contains(i));
+            assertFalse(subgraph.contains(i));
+        }
+    }
+
+    @Test public void testSubgraphContainsEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);        
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+        for (int i = 0; i < 5; ++i) {
+            for (int j = i+1; j < 5; ++j) {
+                assertTrue(subgraph.contains(new SimpleDirectedTypedEdge<String>(""type-1"",i, j)));
+            }
+        }
+
+        for (int i = 5; i < 10; ++i) {
+            for (int j = i+1; j < 10; ++j) {
+                DirectedTypedEdge<String> e = new SimpleDirectedTypedEdge<String>(""type-1"",i, j);
+                assertTrue(g.contains(e));
+                assertFalse(subgraph.contains(e));
+            }
+        }
+    }
+
+    @Test public void testSubgraphAddEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < i+2 && j < 10; ++j)
+                assertTrue(g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j)));
+        }    
+
+        assertEquals(9, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals(4, subgraph.size());
+
+        // Add an edge to a new vertex
+        assertTrue(subgraph.add(new SimpleDirectedTypedEdge<String>(""type-1"", 1, 0)));
+        assertEquals(5, subgraph.size());
+        assertEquals(5, subgraph.order());
+        assertEquals(10, g.size());
+
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphAddEdgeNewVertex() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        // Add an edge to a new vertex
+        assertTrue(subgraph.add(new SimpleDirectedTypedEdge<String>(""type-1"",0, 5)));
+        assertEquals( (5 * 4) / 2 + 1, subgraph.size());
+        assertEquals(6, subgraph.order());
+        assertEquals(11, g.order());
+        assertEquals( (9*10)/2 + 1, g.size());
+    }
+
+    @Test public void testSubgraphRemoveEdge() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        // Remove an existing edge
+        assertTrue(subgraph.remove(new SimpleDirectedTypedEdge<String>(""type-1"",0, 1)));
+        assertEquals( (5 * 4) / 2 - 1, subgraph.size());
+        assertEquals(5, subgraph.order());
+        assertEquals(10, g.order());
+        assertEquals( (9*10)/2 - 1, g.size());
+
+        // Remove a non-existent edge, which should have no effect even though
+        // the edge is present in the backing graph
+        assertFalse(subgraph.remove(new SimpleDirectedTypedEdge<String>(""type-1"",0, 6)));
+        assertEquals( (5 * 4) / 2 - 1, subgraph.size());
+        assertEquals(5, subgraph.order());
+        assertEquals(10, g.order());
+        assertEquals( (9*10)/2 - 1, g.size());
+    }
+
+
+    /******************************************************************
+     *
+     *
+     * SubgraphVertexView tests 
+     *
+     *
+     ******************************************************************/
+
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesAdd() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        Set<Integer> test = subgraph.vertices();
+        assertEquals(5, test.size());
+
+        // Add a vertex 
+        assertTrue(test.add(5));
+        assertEquals(6, test.size());
+        assertEquals(6, subgraph.order());
+        assertEquals(11, g.order());
+        assertEquals( (5*4)/2, subgraph.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        Set<Integer> test = subgraph.vertices();
+        assertEquals(5, test.size());
+
+        // Add a vertex 
+        assertTrue(test.remove(0));
+        assertEquals(4, test.size());
+        assertEquals(4, subgraph.order());
+        assertEquals(9, g.order());
+        assertEquals( (4*3)/2, subgraph.size());
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void testSubgraphVerticesIteratorRemove() {
+        DirectedMultigraph<String> g = new DirectedMultigraph<String>();
+
+        // fully connected
+        for (int i = 0; i < 10; i++)  {
+            for (int j = i+1; j < 10;  ++j)
+                g.add(new SimpleDirectedTypedEdge<String>(""type-1"",i, j));
+        }    
+
+        // (n * (n-1)) / 2
+        assertEquals( (10 * 9) / 2, g.size());
+        assertEquals(10, g.order());
+
+        Set<Integer> vertices = new LinkedHashSet<Integer>();
+        for (int i = 0; i < 5; ++i)
+            vertices.add(i);
+
+        DirectedMultigraph<String> subgraph = g.subgraph(vertices);
+        assertEquals(5, subgraph.order());
+        assertEquals( (5 * 4) / 2, subgraph.size());
+
+        Set<Integer> test = subgraph.vertices();
+        assertEquals(5, test.size());
+        Iterator<Integer> it = test.iterator();
+        assertTrue(it.hasNext());
+        // Remove the first vertex returned
+        it.next();
+        it.remove();
+        
+        assertEquals(4, test.size());
+        assertEquals(4, subgraph.order());
+        assertEquals(9, g.order());
+        assertEquals( (4*3)/2, subgraph.size());
+    }
 
 
     /******************************************************************
diff --git a/test/edu/ucla/sspace/text/corpora/PukWacDependencyCorpusReaderTest.java b/test/edu/ucla/sspace/text/corpora/PukWacDependencyCorpusReaderTest.java
index fd06a4b1..6a47fef7 100644
--- a/test/edu/ucla/sspace/text/corpora/PukWacDependencyCorpusReaderTest.java
+++ b/test/edu/ucla/sspace/text/corpora/PukWacDependencyCorpusReaderTest.java
@@ -26,6 +26,7 @@
 import edu.ucla.sspace.text.CorpusReader;
 import edu.ucla.sspace.text.Document;
 
+import java.io.BufferedReader;
 import java.io.StringReader;
 import java.util.Iterator;
 
@@ -41,22 +42,22 @@
 public class PukWacDependencyCorpusReaderTest {
 
     public static final String FIRST_SENTENCE = 
-        ""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
-        ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
-        ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"";
+        toTabs(""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
+               ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
+               ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"");
 
     public static final String SECOND_SENTENCE = 
-        ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
-        ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
-        ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
-        ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
-        ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"";
-
+        toTabs(""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
+               ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
+               ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
+               ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
+               ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"");
+               
     public static final String THIRD_SENTENCE = 
-        ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
-        ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
-        ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
-        ""12  .   _   .   .   _   3   P   _   _\n"";
+        toTabs(""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
+               ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
+               ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
+               ""12  .   _   .   .   _   3   P   _   _\n"");
 
     public static final String TEST_TEXT =
         ""<text>\n"" +
@@ -87,8 +88,24 @@ public class PukWacDependencyCorpusReaderTest {
 
     private static String readAll(Document doc) throws Exception {
         StringBuilder sb = new StringBuilder();
-        for (String line = null; (line = doc.reader().readLine()) != null; )
+        BufferedReader reader = doc.reader();
+        for (String line = null; (line = reader.readLine()) != null; )
             sb.append(line).append(""\n"");
         return sb.toString();
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/wordsi/DependencyContextExtractorTest.java b/test/edu/ucla/sspace/wordsi/DependencyContextExtractorTest.java
index 6aae6fb7..8c0e843a 100644
--- a/test/edu/ucla/sspace/wordsi/DependencyContextExtractorTest.java
+++ b/test/edu/ucla/sspace/wordsi/DependencyContextExtractorTest.java
@@ -70,7 +70,7 @@ public class DependencyContextExtractorTest {
         MockWordsi wordsi = new MockWordsi(null, extractor);
 
         extractor.processDocument(
-                new BufferedReader(new StringReader(SINGLE_PARSE)), 
+            new BufferedReader(new StringReader(toTabs(SINGLE_PARSE))), 
                 wordsi);
         assertTrue(wordsi.called);
     }
@@ -178,4 +178,19 @@ public boolean acceptWord(String word) {
             return word.equals(""cat"");
         }
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/wordsi/OccurrenceDependencyContextGeneratorTest.java b/test/edu/ucla/sspace/wordsi/OccurrenceDependencyContextGeneratorTest.java
index 246d2542..33b1f431 100644
--- a/test/edu/ucla/sspace/wordsi/OccurrenceDependencyContextGeneratorTest.java
+++ b/test/edu/ucla/sspace/wordsi/OccurrenceDependencyContextGeneratorTest.java
@@ -46,18 +46,18 @@
 public class OccurrenceDependencyContextGeneratorTest {
 
     public static final String SINGLE_PARSE = 
-        ""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
-        ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
-        ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
-        ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
-        ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
-        ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
-        ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
-        ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
-        ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
-        ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
-        ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
-        ""12  .   _   .   .   _   3   P   _   _"";
+        toTabs(""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
+               ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
+               ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
+               ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
+               ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
+               ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
+               ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
+               ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
+               ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
+               ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
+               ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
+               ""12  .   _   .   .   _   3   P   _   _"");
 
     @Test public void testOccurrence() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
@@ -82,22 +82,37 @@ public int getDimension(String key) {
                 return 0;
             if (key.equals(""is""))
                 return 1;
-            if (key.equals(""holt""))
+            if (key.equals(""Holt""))
                 return 2;
-            if (key.equals(""mr.""))
+            if (key.equals(""Mr.""))
                 return 3;
 
             if (key.equals(""for""))
                 return 4;
             if (key.equals(""the""))
                 return 5;
-            if (key.equals(""literary""))
+            if (key.equals(""Literary""))
                 return 6;
-            if (key.equals(""review""))
+            if (key.equals(""Review""))
                 return 7;
             if (key.equals(""in""))
                 return 8;
             return -1;
         }
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/wordsi/OrderingDependencyContextGeneratorTest.java b/test/edu/ucla/sspace/wordsi/OrderingDependencyContextGeneratorTest.java
index 9bd825fc..241e6ef3 100644
--- a/test/edu/ucla/sspace/wordsi/OrderingDependencyContextGeneratorTest.java
+++ b/test/edu/ucla/sspace/wordsi/OrderingDependencyContextGeneratorTest.java
@@ -49,18 +49,18 @@
 public class OrderingDependencyContextGeneratorTest {
 
     public static final String SINGLE_PARSE = 
-        ""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
-        ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
-        ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
-        ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
-        ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
-        ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
-        ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
-        ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
-        ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
-        ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
-        ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
-        ""12  .   _   .   .   _   3   P   _   _"";
+        toTabs(""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
+               ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
+               ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
+               ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
+               ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
+               ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
+               ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
+               ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
+               ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
+               ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
+               ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
+               ""12  .   _   .   .   _   3   P   _   _"");
 
     @Test public void testOrdering() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
@@ -85,22 +85,37 @@ public int getDimension(String key) {
                 return 0;
             if (key.equals(""is--2""))
                 return 1;
-            if (key.equals(""holt--3""))
+            if (key.equals(""Holt--3""))
                 return 2;
-            if (key.equals(""mr.--4""))
+            if (key.equals(""Mr.--4""))
                 return 3;
 
             if (key.equals(""for-1""))
                 return 4;
             if (key.equals(""the-2""))
                 return 5;
-            if (key.equals(""literary-3""))
+            if (key.equals(""Literary-3""))
                 return 6;
-            if (key.equals(""review-4""))
+            if (key.equals(""Review-4""))
                 return 7;
             if (key.equals(""in-5""))
                 return 8;
             return -1;
         }
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/wordsi/PartOfSpeechDependencyContextGeneratorTest.java b/test/edu/ucla/sspace/wordsi/PartOfSpeechDependencyContextGeneratorTest.java
index 5da76df4..6fa81d67 100644
--- a/test/edu/ucla/sspace/wordsi/PartOfSpeechDependencyContextGeneratorTest.java
+++ b/test/edu/ucla/sspace/wordsi/PartOfSpeechDependencyContextGeneratorTest.java
@@ -49,18 +49,18 @@
 public class PartOfSpeechDependencyContextGeneratorTest {
 
     public static final String SINGLE_PARSE = 
-        ""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
-        ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
-        ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
-        ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
-        ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
-        ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
-        ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
-        ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
-        ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
-        ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
-        ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
-        ""12  .   _   .   .   _   3   P   _   _"";
+        toTabs(""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
+               ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
+               ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
+               ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
+               ""5   columnist   _   NN  NN  _   3   PRD _   _\n"" +
+               ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
+               ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
+               ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
+               ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
+               ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
+               ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
+               ""12  .   _   .   .   _   3   P   _   _"");
 
     @Test public void testGenerate() throws Exception {
         DependencyExtractor extractor = new CoNLLDependencyExtractor();
@@ -85,22 +85,37 @@ public int getDimension(String key) {
                 return 0;
             if (key.equals(""is-VBZ""))
                 return 1;
-            if (key.equals(""holt-NNP""))
+            if (key.equals(""Holt-NNP""))
                 return 2;
-            if (key.equals(""mr.-NNP""))
+            if (key.equals(""Mr.-NNP""))
                 return 3;
 
             if (key.equals(""for-IN""))
                 return 4;
             if (key.equals(""the-DT""))
                 return 5;
-            if (key.equals(""literary-NNP""))
+            if (key.equals(""Literary-NNP""))
                 return 6;
-            if (key.equals(""review-NNP""))
+            if (key.equals(""Review-NNP""))
                 return 7;
             if (key.equals(""in-IN""))
                 return 8;
             return -1;
         }
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/wordsi/psd/PseudoWordDependencyContextExtractorTest.java b/test/edu/ucla/sspace/wordsi/psd/PseudoWordDependencyContextExtractorTest.java
index fbbfa3ee..367ac49e 100644
--- a/test/edu/ucla/sspace/wordsi/psd/PseudoWordDependencyContextExtractorTest.java
+++ b/test/edu/ucla/sspace/wordsi/psd/PseudoWordDependencyContextExtractorTest.java
@@ -50,19 +50,19 @@
 public class PseudoWordDependencyContextExtractorTest {
 
     public static final String SINGLE_PARSE = 
-        ""target: cat absolute_position: 4 relative_position: 4 prior_trees: 0 after_trees: 0\n"" + 
-        ""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
-        ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
-        ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
-        ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
-        ""5   cat _ NN  NN  _   3   PRD _   _\n"" +
-        ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
-        ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
-        ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
-        ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
-        ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
-        ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
-        ""12  .   _   .   .   _   3   P   _   _"";
+        toTabs(""target: cat absolute_position: 4 relative_position: 4 prior_trees: 0 after_trees: 0\n"" + 
+               ""1   Mr. _   NNP NNP _   2   NMOD    _   _\n"" +
+               ""2   Holt    _   NNP NNP _   3   SBJ _   _\n"" +
+               ""3   is  _   VBZ VBZ _   0   ROOT    _   _\n"" +
+               ""4   a   _   DT  DT  _   5   NMOD    _   _\n"" +
+               ""5   cat _ NN  NN  _   3   PRD _   _\n"" +
+               ""6   for _   IN  IN  _   5   NMOD    _   _\n"" +
+               ""7   the _   DT  DT  _   9   NMOD    _   _\n"" +
+               ""8   Literary    _   NNP NNP _   9   NMOD    _   _\n"" +
+               ""9   Review  _   NNP NNP _   6   PMOD    _   _\n"" +
+               ""10  in  _   IN  IN  _   9   ADV _   _\n"" +
+               ""11  London  _   NNP NNP _   10  PMOD    _   _\n"" +
+               ""12  .   _   .   .   _   3   P   _   _"");
 
     private SparseDoubleVector testVector;
 
@@ -149,4 +149,19 @@ public boolean acceptWord(String word) {
             return word.equals(""cat"");
         }
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/edu/ucla/sspace/wordsi/semeval/SemEvalDependencyContextExtractorTest.java b/test/edu/ucla/sspace/wordsi/semeval/SemEvalDependencyContextExtractorTest.java
index 2b51f4e2..5fc4bd6d 100644
--- a/test/edu/ucla/sspace/wordsi/semeval/SemEvalDependencyContextExtractorTest.java
+++ b/test/edu/ucla/sspace/wordsi/semeval/SemEvalDependencyContextExtractorTest.java
@@ -74,7 +74,7 @@ public class SemEvalDependencyContextExtractorTest {
         MockWordsi wordsi = new MockWordsi(null, extractor);
 
         extractor.processDocument(
-                new BufferedReader(new StringReader(SINGLE_PARSE)), 
+            new BufferedReader(new StringReader(toTabs(SINGLE_PARSE))), 
                 wordsi);
         assertTrue(wordsi.called);
     }
@@ -149,4 +149,19 @@ public boolean acceptWord(String word) {
             return word.equals(""cat"");
         }
     }
+
+    static String toTabs(String doc) {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = doc.split(""\n"");
+        for (String line : arr) {
+            String[] cols = line.split(""\\s+"");
+            for (int i = 0; i < cols.length; ++i) {
+                sb.append(cols[i]);
+                if (i + 1 < cols.length)
+                    sb.append('\t');
+            }
+            sb.append('\n');
+        }
+        return sb.toString();
+    }
 }"
bbb3b5a0d37545dc714d3f95cb7e4650b29db622,intellij-community,IDEA-94048 Maven run configuration - profiles- list gets randomly re-ordered after closing and opening project--,c,https://github.com/JetBrains/intellij-community,"diff --git a/platform/util/src/com/intellij/util/xmlb/MapBinding.java b/platform/util/src/com/intellij/util/xmlb/MapBinding.java
index 98d637e610b32..04435889b5259 100644
--- a/platform/util/src/com/intellij/util/xmlb/MapBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/MapBinding.java
@@ -74,7 +74,11 @@ public Object serialize(Object o, Object context, SerializationFilter filter) {
 
     final Set keySet = map.keySet();
     final Object[] keys = ArrayUtil.toObjectArray(keySet);
-    Arrays.sort(keys, KEY_COMPARATOR);
+
+    if (myMapAnnotation == null || myMapAnnotation.sortBeforeSave()) {
+      Arrays.sort(keys, KEY_COMPARATOR);
+    }
+
     for (Object k : keys) {
       Object v = map.get(k);
 
diff --git a/platform/util/src/com/intellij/util/xmlb/annotations/MapAnnotation.java b/platform/util/src/com/intellij/util/xmlb/annotations/MapAnnotation.java
index 8918ef534b23c..7c11c28b19c04 100644
--- a/platform/util/src/com/intellij/util/xmlb/annotations/MapAnnotation.java
+++ b/platform/util/src/com/intellij/util/xmlb/annotations/MapAnnotation.java
@@ -34,4 +34,6 @@
 
   boolean surroundKeyWithTag() default true;
   boolean surroundValueWithTag() default true;
+
+  boolean sortBeforeSave() default true;
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
index e8785146877dc..d0dc2a0c922f5 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
@@ -17,6 +17,7 @@
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Maps;
+import com.intellij.util.xmlb.annotations.MapAnnotation;
 import com.intellij.util.xmlb.annotations.OptionTag;
 import com.intellij.util.xmlb.annotations.Transient;
 import org.jetbrains.annotations.NotNull;
@@ -141,6 +142,7 @@ public void fixAfterLoadingFromOldFormat() {
   }
 
   @OptionTag(""profilesMap"")
+  @MapAnnotation(sortBeforeSave = false)
   public Map<String, Boolean> getProfilesMap() {
     return myProfilesMap;
   }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java
index 7bc6cb286da51..de2c2adf9627c 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java
@@ -28,7 +28,7 @@ public void testSaveLoadRunnerParameters() {
     MavenRunConfiguration.MavenSettings s = new MavenRunConfiguration.MavenSettings(myProject);
     s.myRunnerParameters.setWorkingDirPath(""some path"");
     s.myRunnerParameters.setGoals(Arrays.asList(""clean"", ""validate""));
-    s.myRunnerParameters.setProfilesMap(ImmutableMap.of(""prof1"", true, ""prof2"", true, ""prof3"", false));
+    s.myRunnerParameters.setProfilesMap(ImmutableMap.of(""prof1"", true, ""prof2"", true, ""prof3"", false, ""aaa"", true));
 
     s.myGeneralSettings = new MavenGeneralSettings();
     s.myGeneralSettings.setChecksumPolicy(MavenExecutionOptions.ChecksumPolicy.WARN);
@@ -45,6 +45,7 @@ public void testSaveLoadRunnerParameters() {
     assertEquals(s.myRunnerParameters.getWorkingDirPath(), loaded.myRunnerParameters.getWorkingDirPath());
     assertEquals(s.myRunnerParameters.getGoals(), loaded.myRunnerParameters.getGoals());
     assertEquals(s.myRunnerParameters.getProfilesMap(), loaded.myRunnerParameters.getProfilesMap());
+    assertOrderedEquals(s.myRunnerParameters.getProfilesMap().keySet(), loaded.myRunnerParameters.getProfilesMap().keySet()); // Compare ordering of profiles.
 
     assertEquals(s.myGeneralSettings, loaded.myGeneralSettings);
     assertEquals(s.myRunnerSettings, loaded.myRunnerSettings);"
47db48934367962fb35cde65eb48054292e323f1,drools,JBRULES-1618 Check the context class-loader of the- current thread before using it--,c,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java b/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
index a8111991739..368b337cbcd 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
@@ -323,6 +323,7 @@ public void addPackageFromXml(final Reader reader) throws DroolsParserException,
                                                         IOException {
         this.resource = new ReaderResource( reader );
         final XmlPackageReader xmlReader = new XmlPackageReader( this.configuration.getSemanticModules() );
+        xmlReader.getParser().setClassLoader( this.rootClassLoader );
 
         try {
             xmlReader.read( reader );
@@ -340,7 +341,8 @@ public void addPackageFromXml(final Resource resource) throws DroolsParserExcept
         this.resource = resource;
 
         final XmlPackageReader xmlReader = new XmlPackageReader( this.configuration.getSemanticModules() );
-
+        xmlReader.getParser().setClassLoader( this.rootClassLoader );
+        
         try {
             xmlReader.read( resource.getReader() );
         } catch ( final SAXException e ) {
diff --git a/drools-compiler/src/test/java/org/drools/compiler/xml/changeset/ChangeSetTest.java b/drools-compiler/src/test/java/org/drools/compiler/xml/changeset/ChangeSetTest.java
index eab0f0baf71..e6d92bb89f0 100644
--- a/drools-compiler/src/test/java/org/drools/compiler/xml/changeset/ChangeSetTest.java
+++ b/drools-compiler/src/test/java/org/drools/compiler/xml/changeset/ChangeSetTest.java
@@ -50,6 +50,7 @@ public void testXmlParser() throws SAXException,
 
         PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
         XmlChangeSetReader xmlReader = new XmlChangeSetReader( conf.getSemanticModules() );
+        xmlReader.setClassLoader( ChangeSetTest.class.getClassLoader(), ChangeSetTest.class );
 
         String str = """";
         str += ""<change-set "";
@@ -114,6 +115,7 @@ public void testBasicAuthentication() throws SAXException,
 
         PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
         XmlChangeSetReader xmlReader = new XmlChangeSetReader( conf.getSemanticModules() );
+        xmlReader.setClassLoader( ChangeSetTest.class.getClassLoader(), ChangeSetTest.class );
 
         String str = """";
         str += ""<change-set "";
diff --git a/drools-compiler/src/test/java/org/drools/compiler/xml/rules/DumperTestHelper.java b/drools-compiler/src/test/java/org/drools/compiler/xml/rules/DumperTestHelper.java
index eb49a1d8344..82307de7303 100644
--- a/drools-compiler/src/test/java/org/drools/compiler/xml/rules/DumperTestHelper.java
+++ b/drools-compiler/src/test/java/org/drools/compiler/xml/rules/DumperTestHelper.java
@@ -22,6 +22,7 @@ public static void XmlFile(String filename) throws Exception {
         PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
         
         XmlPackageReader xmlPackageReader = new XmlPackageReader( conf.getSemanticModules() );
+        xmlPackageReader.getParser().setClassLoader( DumperTestHelper.class.getClassLoader() );
         xmlPackageReader.read( new InputStreamReader( DumperTestHelper.class.getResourceAsStream( filename ) ) );
         final PackageDescr pkgOriginal = xmlPackageReader.getPackageDescr();
 
diff --git a/drools-compiler/src/test/java/org/drools/compiler/xml/rules/XmlPackageReaderTest.java b/drools-compiler/src/test/java/org/drools/compiler/xml/rules/XmlPackageReaderTest.java
index 3ed9c597630..b93371c5ab3 100644
--- a/drools-compiler/src/test/java/org/drools/compiler/xml/rules/XmlPackageReaderTest.java
+++ b/drools-compiler/src/test/java/org/drools/compiler/xml/rules/XmlPackageReaderTest.java
@@ -565,7 +565,9 @@ public void testParseQuery() throws Exception {
 
     private XmlPackageReader getXmReader() {
         PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
+        XmlPackageReader xmlReader = new XmlPackageReader( conf.getSemanticModules() );
+        xmlReader.getParser().setClassLoader( XmlPackageReaderTest.class.getClassLoader() );
 
-        return new XmlPackageReader( conf.getSemanticModules() );
+        return xmlReader;
     }
 }"
3a5efd71396f7febeee17b268071b5a07cba27c3,camel,CAMEL-4071 clean up the camel OSGi integration- test and load the karaf spring feature first--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1133394 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/camel,"diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index a1352a1716b4f..f6b8abc19f577 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -345,6 +345,7 @@
               </excludes>
               <systemPropertyVariables>
                   <springVersion>${spring-version}</springVersion>
+                  <karafVersion>${karaf-version}</karafVersion>
               </systemPropertyVariables>
           </configuration>
       </plugin>      
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index 8c9c2a2932c97..692426aa17002 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -72,39 +72,46 @@ protected void setThreadContextClassLoader() {
     }
     
     public static UrlReference getCamelKarafFeatureUrl() {
-        String springVersion = System.getProperty(""springVersion"");
-        System.out.println(""*** The spring version is "" + springVersion + "" ***"");
-
+        
         String type = ""xml/features"";
         return mavenBundle().groupId(""org.apache.camel.karaf"").
             artifactId(""apache-camel"").versionAsInProject().type(type);
     }
     
     public static UrlReference getKarafFeatureUrl() {
-        String karafVersion = ""2.2.1"";
+        String karafVersion = System.getProperty(""karafVersion"");
         System.out.println(""*** The karaf version is "" + karafVersion + "" ***"");
 
         String type = ""xml/features"";
         return mavenBundle().groupId(""org.apache.karaf.assemblies.features"").
             artifactId(""standard"").version(karafVersion).type(type);
     }
-
-    @Configuration
-    public static Option[] configure() throws Exception {
+    
+    public static Option[] getDefaultCamelKarafOptions() {
         Option[] options = combine(
             // Default karaf environment
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
-                  Helper.setLogLevel(""WARN"")),
+                Helper.setLogLevel(""WARN"")),
+                                         
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
 
             // using the features to install the camel components             
             scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test""),
-            
+                ""camel-core"", ""camel-spring"", ""camel-test""),
+                                   
             workingDirectory(""target/paxrunner/""),
 
             equinox(),
             felix());
+        return options;
+    }
+
+    @Configuration
+    public static Option[] configure() throws Exception {
+        Option[] options = combine(
+            getDefaultCamelKarafOptions());
 
         // for remote debugging
         // vmOption(""-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
index 9cc421830c948..d6b6da8a274ba 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,11 +25,8 @@
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 /**
  *
@@ -70,17 +66,11 @@ public void configure() {
     @Configuration
     public static Option[] configure() throws Exception {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax logging (logProfile)
-                    Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
+            getDefaultCamelKarafOptions(),
+            
+            // using the features to install other camel components
             scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-test"", ""camel-jetty"", ""camel-ahc""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+                          ""camel-jetty"", ""camel-ahc""));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
index 48a5708219c28..6be307e76766e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
@@ -25,25 +25,15 @@
 import org.apache.camel.Processor;
 import org.apache.camel.component.aws.s3.S3Constants;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
-
 @RunWith(JUnit4TestRunner.class)
 @Ignore(""Test fails"")
-public class AwsS3IntegrationTest extends OSGiIntegrationSpringTestSupport {
+public class AwsS3IntegrationTest extends AwsTestSupport {
     
     @EndpointInject(uri = ""mock:result"")
     private MockEndpoint result;
@@ -109,22 +99,4 @@ private void assertResponseMessage(Message message) {
         assertEquals(""3a5c8b1ad448bca04584ecb55b836264"", message.getHeader(S3Constants.E_TAG));
         assertNull(message.getHeader(S3Constants.VERSION_ID));
     }
-    
-    @Configuration
-    public static Option[] configure() {
-        Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-aws""),
-            workingDirectory(""target/paxrunner/""),
-            equinox(),
-            felix());
-        
-        return options;
-    }
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
index 7a5ec944a0cfc..c6adb7c93c858 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
@@ -41,7 +41,7 @@
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
-public class AwsS3Test extends OSGiIntegrationSpringTestSupport {
+public class AwsS3Test extends AwsTestSupport {
     
     @EndpointInject(uri = ""mock:result-s3"")
     private MockEndpoint result;
@@ -108,21 +108,4 @@ private void assertResponseMessage(Message message) {
         assertNull(message.getHeader(S3Constants.VERSION_ID));
     }
     
-    @Configuration
-    public static Option[] configure() {
-        Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-aws""),
-            workingDirectory(""target/paxrunner/""),
-            equinox(),
-            felix());
-        
-        return options;
-    }
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
index 3be6631b863e8..68c9439be01ae 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
@@ -20,25 +20,15 @@
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.component.aws.sns.SnsConstants;
-import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
-
 @RunWith(JUnit4TestRunner.class)
 @Ignore(""Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!"")
-public class AwsSnsIntegrationTest extends OSGiIntegrationSpringTestSupport {
+public class AwsSnsIntegrationTest extends AwsTestSupport {
     
     @Override
     protected OsgiBundleXmlApplicationContext createApplicationContext() {
@@ -69,21 +59,5 @@ public void process(Exchange exchange) throws Exception {
         assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
     }
     
-    @Configuration
-    public static Option[] configure() {
-        Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-aws""),
-            workingDirectory(""target/paxrunner/""),
-            equinox(),
-            felix());
-        
-        return options;
-    }
+    
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
index a9f08d891612d..1c601d647842e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
@@ -36,7 +36,7 @@
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
-public class AwsSnsTest extends OSGiIntegrationSpringTestSupport {
+public class AwsSnsTest extends AwsTestSupport {
     
     @Override
     protected OsgiBundleXmlApplicationContext createApplicationContext() {
@@ -66,22 +66,5 @@ public void process(Exchange exchange) throws Exception {
         
         assertEquals(""dcc8ce7a-7f18-4385-bedd-b97984b4363c"", exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
     }
-
-    @Configuration
-    public static Option[] configure() {
-        Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-aws""),
-            workingDirectory(""target/paxrunner/""),
-            equinox(),
-            felix());
-        
-        return options;
-    }
+    
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
index a6938b3829655..3b9288a88da0d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
@@ -22,25 +22,15 @@
 import org.apache.camel.Processor;
 import org.apache.camel.component.aws.sqs.SqsConstants;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
-
 @RunWith(JUnit4TestRunner.class)
 @Ignore(""Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!"")
-public class AwsSqsIntegrationTest extends OSGiIntegrationSpringTestSupport {
+public class AwsSqsIntegrationTest extends AwsTestSupport {
 
     @EndpointInject(uri = ""mock:result"")
     private MockEndpoint result;
@@ -95,22 +85,4 @@ public void process(Exchange exchange) throws Exception {
         assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
         assertEquals(""6a1559560f67c5e7a7d5d838bf0272ee"", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
     }
-
-    @Configuration
-    public static Option[] configure() {
-        Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-aws""),
-            workingDirectory(""target/paxrunner/""),
-            equinox(),
-            felix());
-        
-        return options;
-    }
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
index 1247a68cd05c6..9a8c5086f6f49 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
@@ -22,23 +22,14 @@
 import org.apache.camel.Processor;
 import org.apache.camel.component.aws.sqs.SqsConstants;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
-public class AwsSqsTest extends OSGiIntegrationSpringTestSupport {
+public class AwsSqsTest extends AwsTestSupport {
 
     @EndpointInject(uri = ""mock:result"")
     private MockEndpoint result;
@@ -94,21 +85,5 @@ public void process(Exchange exchange) throws Exception {
         assertEquals(""6a1559560f67c5e7a7d5d838bf0272ee"", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
     }
 
-    @Configuration
-    public static Option[] configure() {
-        Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-aws""),
-            workingDirectory(""target/paxrunner/""),
-            equinox(),
-            felix());
-        
-        return options;
-    }
+   
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java
new file mode 100644
index 0000000000000..629f41db6d05f
--- /dev/null
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.itest.osgi.aws;
+
+import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
+
+import static org.ops4j.pax.exam.OptionUtils.combine;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
+
+
+public abstract class AwsTestSupport extends OSGiIntegrationSpringTestSupport {
+    
+    
+    @Configuration
+    public static Option[] configure() {
+        Option[] options = combine(
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-aws""));
+        
+        return options;
+    }
+
+}
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
index bb50885b4eafd..4f90ea4175f3a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
@@ -20,21 +20,16 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.swissbox.tinybundles.dp.Constants;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
+
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+
 
 @RunWith(JUnit4TestRunner.class)
 public class BeanValidatorTest extends OSGiIntegrationTestSupport {
@@ -64,23 +59,13 @@ public void process(Exchange exchange) throws Exception {
     Car createCar(String manufacturer, String licencePlate) {
         return new CarWithAnnotations(manufacturer, licencePlate);
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                  Helper.setLogLevel(""WARN"")),
-
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-bean-validator""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            equinox(),
-            felix());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-bean-validator""));
         
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
index 9b4e4d4e74242..75a20aa3bb782 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
@@ -91,6 +91,9 @@ public static Option[] configure() throws Exception {
                 .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintExplicitPropertiesRouteTest.class.getName())
                 .build()).noStart(),
 
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
+                
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
                         ""camel-core"", ""camel-blueprint"", ""camel-test""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
index f2f7dfc9722ca..378875caa6467 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
@@ -90,6 +90,8 @@ public static Option[] configure() throws Exception {
                 // install blueprint requirements
                 mavenBundle(""org.apache.felix"", ""org.apache.felix.configadmin""),
 
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
                         ""camel-core"", ""camel-blueprint"", ""camel-test""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
index 6287094266775..b557b1f666b04 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
@@ -188,6 +188,8 @@ public static Option[] configure() throws Exception {
                        .set(Constants.DYNAMICIMPORT_PACKAGE, ""*"")
                        .build()).noStart(),
                         
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""jetty""),
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
                         ""camel-core"", ""camel-blueprint"", ""camel-test"", ""camel-mail"", ""camel-jaxb"", ""camel-jms""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
index 0e6799657cfcf..1f6a27908d399 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
@@ -112,6 +112,9 @@ public static Option[] configure() throws Exception {
                         .set(Constants.BUNDLE_SYMBOLICNAME, ""CamelBlueprintTestBundle9"")
                         .set(Constants.DYNAMICIMPORT_PACKAGE, ""*"")
                         .build()).noStart(),
+                        
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""spring"", ""jetty""),
 
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
index dacff6254d5d7..ba5d36c80c1c6 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
@@ -91,6 +91,9 @@ public static Option[] configure() throws Exception {
                         .add(""org/apache/camel/itest/osgi/blueprint/example.vm"", OSGiBlueprintTestSupport.class.getResource(""example.vm""))
                         .set(Constants.BUNDLE_SYMBOLICNAME, ""CamelBlueprintTestBundle20"")
                         .build()).noStart(),
+                        
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""spring"", ""jetty""),
 
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
index a2e39070aa0f3..1600985f58966 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
@@ -146,6 +146,9 @@ public static Option[] configure() throws Exception {
                         .set(Constants.BUNDLE_SYMBOLICNAME, ""CamelBlueprintTestBundle5"")
                         .set(Constants.DYNAMICIMPORT_PACKAGE, ""*"")
                         .build()).noStart(),
+                        
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
 
                  // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
index d1def0e19acf9..c1961004d98ee 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
@@ -86,6 +86,9 @@ public static Option[] configure() throws Exception {
                         .add(""OSGI-INF/blueprint/test.xml"", OSGiBlueprintTestSupport.class.getResource(""blueprint-13.xml""))
                         .set(Constants.BUNDLE_SYMBOLICNAME, OSGiBlueprintHelloWorldTest.class.getName())
                         .build()).noStart(),
+                        
+                // install the spring, http features first
+                scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
 
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
index ddcd5c1a6d2f3..47b6e9539b32e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
@@ -26,18 +26,14 @@
 import org.apache.camel.component.cache.CacheEndpoint;
 import org.apache.camel.component.cache.CacheManagerFactory;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class CacheManagerFactoryRefTest extends OSGiIntegrationTestSupport {
@@ -78,25 +74,16 @@ public void configure() {
             }
         };
     }
-
+    
+    
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-        // Default karaf environment
-                Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax
-                    // logging (logProfile)
-                    Helper.setLogLevel(""WARN"")),
-
-                // using the features to install the camel components
-                scanFeatures(
-                        getCamelKarafFeatureUrl(),
-                        ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-cache""),
-
-                workingDirectory(""target/paxrunner/""),
-
-                felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-cache""));
+        
         return options;
     }
 
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
index 12a06c702fe40..4a82d52ffa909 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
@@ -26,18 +26,15 @@
 import org.apache.camel.component.cache.CacheConstants;
 import org.apache.camel.component.cache.CacheManagerFactory;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
+
 
 @RunWith(JUnit4TestRunner.class)
 public class CacheRoutesManagementTest extends OSGiIntegrationTestSupport {
@@ -100,24 +97,14 @@ public void configure() {
         };
     }
 
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-        // Default karaf environment
-                Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax
-                    // logging (logProfile)
-                    Helper.setLogLevel(""WARN"")),
-
-                // using the features to install the camel components
-                scanFeatures(
-                        getCamelKarafFeatureUrl(),
-                        ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-cache""),
-
-                workingDirectory(""target/paxrunner/""),
-
-                felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-cache""));
+        
         return options;
     }
 
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
index 240ea6204226a..aef41d4f7bbdf 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
@@ -19,18 +19,14 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cache.CacheConstants;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class CacheTest extends OSGiIntegrationTestSupport {
@@ -66,19 +62,11 @@ public void configure() {
 
 
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),                
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                              ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-cache""),
-                
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-cache""));
         
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/replication/CacheReplicationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/replication/CacheReplicationTest.java
index 8fac6b558cee8..ef3df9dfef17a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/replication/CacheReplicationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/replication/CacheReplicationTest.java
@@ -20,6 +20,7 @@
 import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -70,6 +71,9 @@ public static Option[] configure() throws Exception {
                     // this is how you set the default log level when using pax
                     // logging (logProfile)
                     Helper.setLogLevel(""WARN"")),
+                    
+                    // install the spring, http features first
+                    scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
 
                     // using the features to install AMQ
                     scanFeatures(""mvn:org.apache.activemq/activemq-karaf/5.5.0/xml/features"",
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
index 98a749a79f76d..69f41bca0b920 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
@@ -88,6 +88,9 @@ public static Option[] configure() throws Exception {
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
                   Helper.setLogLevel(""WARN"")),
+                  
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
            
             // using the features to install the camel components
             scanFeatures(getCamelKarafFeatureUrl(),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
index 5f2c37a493f26..14e805cf3f88d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
@@ -27,11 +27,10 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
+
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
+
 
 /**
  * @version 
@@ -66,23 +65,14 @@ public void testDozer() throws Exception {
 
         assertMockEndpointsSatisfied();
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                  Helper.setLogLevel(""WARN"")),
-           
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-dozer""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-dozer""));
+        
         return options;
     }
 
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
index 7f22127e58a67..bd6bcbbb8bac1 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,11 +25,8 @@
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 @Ignore(""We need a test which runs on all platforms"")
@@ -52,23 +48,15 @@ public void configure() {
         };
     }
 
-
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),                
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                              ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-exec""),
-                
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-exec""));
         
         return options;
     }
     
+    
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
index d14d06ed1b218..bde59afb9f502 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
@@ -22,18 +22,14 @@
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class FreemarkerTest extends OSGiIntegrationTestSupport {
@@ -64,20 +60,14 @@ public void configure() {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),   
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-freemarker""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-freemarker""));
         
         return options;
     }
+    
+   
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
index b4f48c1400b36..7a5a1b460e19f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
@@ -62,6 +62,9 @@ public static Option[] configure() throws Exception {
             mavenBundle().groupId(""org.apache.ftpserver"").artifactId(""ftpserver-core"").version(""1.0.5""),
             mavenBundle().groupId(""org.apache.ftpserver"").artifactId(""ftplet-api"").version(""1.0.5""),
 
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
+            
             // using the features to install the camel components
             scanFeatures(getCamelKarafFeatureUrl(),                         
                           ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-ftp""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
index d575d3771b278..39e9346b42a16 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
@@ -19,18 +19,15 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
+
 
 @RunWith(JUnit4TestRunner.class)
 public class GroovyTest extends OSGiIntegrationTestSupport {
@@ -52,19 +49,11 @@ public void configure() {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-test"", ""camel-groovy""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-groovy""));
         
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
index 8d25c4e8825c6..ff151bc9c603c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
@@ -24,18 +24,14 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class HawtDBAggregateRouteTest extends OSGiIntegrationTestSupport {
@@ -91,21 +87,13 @@ public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
             return oldExchange;
         }
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-hawtdb""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-hawtdb""));
         
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
index afe4473efd4bd..2c110c8a0a09d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
@@ -29,11 +29,8 @@
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class HL7DataFormatTest extends OSGiIntegrationTestSupport {
@@ -105,22 +102,15 @@ private static String createHL7AsString() {
         body.append(line8);
         return body.toString();
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-hl7""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-hl7""));
+        
         return options;
     }
+
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
index 61ba7e7c9dc94..a799df9982bdd 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
@@ -19,7 +19,6 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -27,12 +26,8 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class HL7MLLPCodecTest extends OSGiIntegrationSpringTestSupport implements Processor {
@@ -63,25 +58,15 @@ public void process(Exchange exchange) throws Exception {
         String out = ""MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123\rMSA|AA|123\n""; 
         exchange.getOut().setBody(out);
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-mina"", ""camel-hl7""),
-
-            // add hl7 osgi bundle
-            mavenBundle().groupId(""http://hl7api.sourceforge.net/m2/!ca.uhn.hapi"").artifactId(""hapi-osgi-base"").version(""1.0.1""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+             // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-hl7"", ""camel-mina""));
+        
         return options;
     }
+
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
index 988592314a132..49fa76f9a6daf 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,11 +25,8 @@
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 /**
  *
@@ -66,22 +62,14 @@ public void configure() {
             }
         };
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax logging (logProfile)
-                    Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-test"", ""camel-jetty"", ""camel-http""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jetty"", ""camel-http""));
+        
         return options;
     }
 
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
index 9cb2dd9fb2d02..42c9835650bb1 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,11 +25,8 @@
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 /**
  *
@@ -66,23 +62,16 @@ public void configure() {
             }
         };
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax logging (logProfile)
-                    Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-test"", ""camel-jetty"", ""camel-http4""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-http4"", ""camel-jetty""));
+        
         return options;
     }
 
+
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
index 9eec49769c45c..e6b5e38cd6fea 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
@@ -20,18 +20,14 @@
 import org.apache.camel.component.jasypt.JasyptPropertiesParser;
 import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class JasyptTest extends OSGiIntegrationTestSupport {
@@ -68,20 +64,13 @@ public void configure() {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-test"", ""camel-jasypt""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jasypt""));
         
         return options;
     }
+    
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
index 75285698d0c89..2fc3cf5adfa1c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
@@ -20,18 +20,14 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.converter.jaxb.JaxbDataFormat;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class JaxbDataFormatTest extends OSGiIntegrationTestSupport {
@@ -58,24 +54,16 @@ public void testSendMessage() throws Exception {
         template.sendBodyAndHeader(""direct:start"", ""<Person><firstName>FOO</firstName><lastName>BAR</lastName></Person>"",
                                    ""foo"", ""bar"");
         assertMockEndpointsSatisfied();        
-    }    
+    }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-jaxb""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jaxb""));
         
         return options;
     }
+   
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
index be157a54c4ddf..d5d2f6bed1551 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -26,11 +25,8 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class JaxbFallbackConverterSpringTest extends OSGiIntegrationSpringTestSupport {
@@ -56,19 +52,11 @@ public void testSendMessage() throws Exception {
     }    
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-jaxb""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jaxb""));
         
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
index e6157f1946603..60886b780cc7e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
@@ -19,18 +19,14 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class JaxbFallbackConverterTest extends OSGiIntegrationTestSupport {
@@ -59,19 +55,11 @@ public void testSendMessage() throws Exception {
     }    
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),            
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-jaxb""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jaxb""));
         
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
index 5bfca0fb5b968..9a34c5aae2197 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
@@ -27,17 +27,13 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.ops4j.pax.swissbox.tinybundles.dp.Constants;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore(""TODO: fix me"")
+//@Ignore(""TODO: fix me"")
 public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport {
    
     @Test
@@ -66,16 +62,13 @@ public void testStoppingJettyContext() throws Exception {
         response = template.requestBody(endpointURI, ""Hello World"", String.class);
         assertEquals(""response is "" , ""camelContext2"", response);
     }
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")), 
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-jetty""),
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jetty""),
             //set up the camel context bundle1          
             provision(newBundle().add(""META-INF/spring/CamelContext1.xml"", OSGiMulitJettyCamelContextsTest.class.getResource(""CamelContext1.xml""))
                       .add(JettyProcessor.class)
@@ -89,15 +82,11 @@ public static Option[] configure() throws Exception {
                       .add(JettyProcessor.class)           
                       .set(Constants.BUNDLE_SYMBOLICNAME, ""org.apache.camel.itest.osgi.CamelContextBundle2"")
                       .set(Constants.DYNAMICIMPORT_PACKAGE, ""*"")
-                      .set(Constants.BUNDLE_NAME, ""CamelContext2"").build()),
-                      
-            
-            workingDirectory(""target/paxrunner/""),
-             
-            equinox(),
-            felix());
+                      .set(Constants.BUNDLE_NAME, ""CamelContext2"").build())   
+        );
         
         return options;
     }
+    
 
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
index c36dc687a6401..b3070effcfdc9 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.itest.osgi.jms;
 
 import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -25,11 +24,8 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 /**
  * @version 
@@ -54,21 +50,13 @@ public void testJms() throws Exception {
     @Configuration
     public static Option[] configure() throws Exception {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")), 
+            getDefaultCamelKarafOptions(),
                 
             // using the features to install AMQ
             scanFeatures(""mvn:org.apache.activemq/activemq-karaf/5.4.0/xml/features"", ""activemq""),
 
             // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-jms""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-jms""));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
index 52ba5be5d7497..a5028c5f24538 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
@@ -132,7 +132,10 @@ public static Option[] configure() throws Exception {
             // Default karaf environment
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),   
+                Helper.setLogLevel(""WARN"")),
+                
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
             // using the features to install the camel components             
             scanFeatures(getCamelKarafFeatureUrl(),                         
                           ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-jpa""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
index 5827694cc4d3d..e8d8e68cd7e9a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
@@ -125,6 +125,9 @@ public static Option[] configure() throws Exception {
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
                 Helper.setLogLevel(""WARN"")),
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
+                
             // using the features to install the camel components             
             scanFeatures(getCamelKarafFeatureUrl(),                         
                           ""camel-core"", ""camel-spring"", ""camel-test""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
index f6cb5d14ddd2d..4d1464b1db44d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
@@ -18,18 +18,14 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class MinaTest extends OSGiIntegrationTestSupport {
@@ -55,20 +51,13 @@ public void configure() {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-test"", ""camel-mina""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-mina""));
         
         return options;
     }
+  
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
index 12f93145e98fc..25c3a510f2426 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
@@ -112,6 +112,9 @@ public static Option[] configure() throws Exception {
             // this is how you set the default log level when using pax logging (logProfile)
                 Helper.setLogLevel(""WARN"")),
                 
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
+                
             mavenBundle().groupId(""org.apache.derby"").artifactId(""derby"").version(""10.4.2.0""),
 
             // using the features to install the camel components
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
index 4eb4133756299..c4ef7e8d7216f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
@@ -18,18 +18,14 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class NettyTest extends OSGiIntegrationTestSupport {
@@ -55,20 +51,13 @@ public void configure() {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-test"", ""camel-netty""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-netty""));
         
         return options;
     }
+    
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
index 865657568af06..fb4ca25bd4fd6 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
@@ -23,18 +23,14 @@
 import org.apache.camel.dataformat.protobuf.ProtobufDataFormat;
 import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class ProtobufRouteTest extends OSGiIntegrationTestSupport {
@@ -109,21 +105,13 @@ public void configure() throws Exception {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-protobuf""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-protobuf""));
         
         return options;
     }
-
+  
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
index 365f09f602046..bb6ac7568670b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
@@ -60,6 +60,9 @@ public static Option[] configure() throws Exception {
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
                 Helper.setLogLevel(""WARN"")),
+            // install the spring, http features first
+            scanFeatures(getKarafFeatureUrl(), ""spring"", ""spring-dm"", ""jetty""),
+                
             // using the features to install the camel components
             scanFeatures(getCamelKarafFeatureUrl(),
                           ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-quartz""),
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
index 463deb5d5e4ce..1988b7174b60c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
@@ -23,18 +23,14 @@
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class RestletTest extends OSGiIntegrationTestSupport {
@@ -63,22 +59,15 @@ public void process(Exchange exchange) throws Exception {
             }
         };
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                    ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-restlet""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-restlet""));
+        
         return options;
     }
+  
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
index ebb5f917f0211..0812124f2576c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,11 +26,8 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 /**
  * @version 
@@ -65,23 +61,16 @@ public void testGetDomain() throws Exception {
 
         assertEquals(""{www.google.com}"", response);
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(),
-                    ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-cxf"", ""camel-restlet""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-cxf"", ""camel-restlet""));
+        
         return options;
     }
+  
 
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
index 264c3fcb86604..2dec9d10e880e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
@@ -26,18 +26,14 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.rss.RssConstants;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class RssPollingConsumerTest extends OSGiIntegrationTestSupport {
@@ -76,21 +72,13 @@ public void configure() throws Exception {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-rss""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-rss""));
         
         return options;
     }
-
+   
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
index 4349a469e4053..1a32b6c6b38e1 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
@@ -19,19 +19,16 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
+
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 /**
  * Test camel-script for groovy expressions in OSGi
@@ -54,25 +51,14 @@ public void testLanguage() throws Exception {
 
         assertMockEndpointsSatisfied();
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-                // using the features to install the camel components
-                scanFeatures(getCamelKarafFeatureUrl(),
-                        ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-script""),
-                        
-                mavenBundle().groupId(""org.apache.servicemix.bundles"").artifactId(""org.apache.servicemix.bundles.ant"").version(""1.7.0_3""),
-                mavenBundle().groupId(""org.codehaus.groovy"").artifactId(""groovy-all"").version(""1.7.9""),
-
-                workingDirectory(""target/paxrunner/""),
-
-                felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-script"", ""camel-groovy""));
         return options;
     }
+    
+   
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
index 052c8164f91cc..0e856e31b84d3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
@@ -55,22 +55,15 @@ public void testSendMessage() throws Exception {
         template.sendBody(""direct:start"", ""Hello"");
         assertMockEndpointsSatisfied();
     }
-
+    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-                // using the features to install the camel components
-                scanFeatures(getCamelKarafFeatureUrl(),
-                        ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-script"", ""camel-ruby""),
-
-                workingDirectory(""target/paxrunner/""),
-
-                felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-script"", ""camel-ruby""));
+        
         return options;
     }
+  
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
index 0c0a49ecb7b63..73767cb58d478 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
@@ -50,7 +50,7 @@ public static Option[] configure() throws Exception {
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
                 Helper.setLogLevel(""WARN"")),
-            Helper.loadKarafStandardFeatures(""http"", ""war""),
+            Helper.loadKarafStandardFeatures(""spring"", ""jetty"", ""http"", ""war""),
             // set the system property for pax web
             org.ops4j.pax.exam.CoreOptions.systemProperty(""org.osgi.service.http.port"").value(""9080""),
             
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
index 715323449bb3e..2013ffb86662b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
@@ -49,7 +49,7 @@ public static Option[] configure() throws Exception {
             Helper.getDefaultOptions(
             // this is how you set the default log level when using pax logging (logProfile)
                 Helper.setLogLevel(""WARN"")),
-            Helper.loadKarafStandardFeatures(""http"", ""war""),  
+            Helper.loadKarafStandardFeatures(""spring"", ""http"", ""war""),  
             // set the system property for pax web
             org.ops4j.pax.exam.CoreOptions.systemProperty(""org.osgi.service.http.port"").value(""9080""),
   
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
index 020c74a637375..e4ecf73b5e514 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
@@ -26,7 +26,6 @@
 import org.apache.camel.component.shiro.security.ShiroSecurityToken;
 import org.apache.camel.component.shiro.security.ShiroSecurityTokenInjector;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.LockedAccountException;
 import org.apache.shiro.authc.UnknownAccountException;
@@ -36,11 +35,8 @@
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class ShiroAuthenticationTest extends OSGiIntegrationTestSupport {
@@ -88,24 +84,15 @@ public void testSuccessfulShiroAuthenticationWithNoAuthorization() throws Except
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),           
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-shiro""),
-                         
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-shiro""));
         
         return options;
     }
-
-
+ 
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
index 526a968165717..d3e312eea7295 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
@@ -52,22 +52,14 @@ public void configure() {
             }
         };
     }
-    
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-test"", ""camel-stream""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-stream""));
         
         return options;
     }
+    
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
index 03e12ab9f1998..e1f3cf4f5cfd4 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
@@ -30,7 +30,6 @@
 import org.apache.camel.component.syslog.SyslogMessage;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
 import org.apache.camel.spi.DataFormat;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -38,11 +37,9 @@
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
+
 
 @RunWith(JUnit4TestRunner.class)
 public class SyslogTest extends OSGiIntegrationTestSupport {
@@ -100,19 +97,13 @@ public void process(Exchange ex) {
     }
 
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),  
-            // using the features to install the camel components
-            scanFeatures(getCamelKarafFeatureUrl(), ""camel-core"", ""camel-test"", ""camel-mina"", ""camel-syslog""),
-
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
-
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-mina"", ""camel-syslog""));
+        
         return options;
     }
+    
 }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
index 2300a3d7c3fb2..7ba634af94c9b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
@@ -22,18 +22,14 @@
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.testing.Helper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class VelocityTest extends OSGiIntegrationTestSupport {
@@ -65,20 +61,14 @@ public void configure() {
     }
     
     @Configuration
-    public static Option[] configure() throws Exception {
+    public static Option[] configure() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel(""WARN"")),  
-            // using the features to install the camel components             
-            scanFeatures(getCamelKarafFeatureUrl(),                         
-                          ""camel-core"", ""camel-spring"", ""camel-test"", ""camel-velocity""),
-            
-            workingDirectory(""target/paxrunner/""),
-
-            felix(), equinox());
+            getDefaultCamelKarafOptions(),
+            // using the features to install the other camel components             
+            scanFeatures(getCamelKarafFeatureUrl(), ""camel-velocity""));
         
         return options;
     }
+    
+   
 }
\ No newline at end of file
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
index f47d175222b5e..49e4097ef3525 100644
--- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
+++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
@@ -29,7 +29,7 @@
 
   <camelContext id=""camelContext1"" xmlns=""http://camel.apache.org/schema/spring"">
     <camel:route>
-      <camel:from uri=""jetty:http://localhost:9010/context1/""/>
+      <camel:from uri=""jetty:http://0.0.0.0:9010/context1/""/>
       <camel:process ref=""jettyProcessor""/>
     </camel:route>
   </camelContext>
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
index de47fc04df34c..f8c0387eb636f 100644
--- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
+++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
@@ -29,7 +29,7 @@
 
   <camelContext id=""camelContext2"" xmlns=""http://camel.apache.org/schema/spring"">
     <camel:route>
-      <camel:from uri=""jetty:http://localhost:9010/context2/""/>
+      <camel:from uri=""jetty:http://0.0.0.0:9010/context2/""/>
       <camel:process ref=""jettyProcessor""/>
     </camel:route>
   </camelContext>"
8091ea54d5e5c47da95ac1b1d921134399a5f066,hadoop,YARN-2730. DefaultContainerExecutor runs only one- localizer at a time. Contributed by Siqi Li (cherry picked from commit- 6157ace5475fff8d2513fd3cd99134b532b0b406)--,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9ae57e4905d51..56359e5b00736 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -809,6 +809,9 @@ Release 2.6.0 - UNRELEASED
     YARN-2785. Fixed intermittent TestContainerResourceUsage failure. (Varun Vasudev
     via zjshen)
 
+    YARN-2730. DefaultContainerExecutor runs only one localizer at a time
+    (Siqi Li via jlowe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
index 834b138fcd272..cc2de999bc838 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
@@ -94,7 +94,7 @@ public void init() throws IOException {
   }
 
   @Override
-  public synchronized void startLocalizer(Path nmPrivateContainerTokensPath,
+  public void startLocalizer(Path nmPrivateContainerTokensPath,
       InetSocketAddress nmAddr, String user, String appId, String locId,
       LocalDirsHandlerService dirsHandler)
       throws IOException, InterruptedException {
@@ -102,10 +102,6 @@ public synchronized void startLocalizer(Path nmPrivateContainerTokensPath,
     List<String> localDirs = dirsHandler.getLocalDirs();
     List<String> logDirs = dirsHandler.getLogDirs();
     
-    ContainerLocalizer localizer =
-        new ContainerLocalizer(lfs, user, appId, locId, getPaths(localDirs),
-            RecordFactoryProvider.getRecordFactory(getConf()));
-    
     createUserLocalDirs(localDirs, user);
     createUserCacheDirs(localDirs, user);
     createAppDirs(localDirs, user, appId);
@@ -118,8 +114,17 @@ public synchronized void startLocalizer(Path nmPrivateContainerTokensPath,
     Path tokenDst = new Path(appStorageDir, tokenFn);
     copyFile(nmPrivateContainerTokensPath, tokenDst, user);
     LOG.info(""Copying from "" + nmPrivateContainerTokensPath + "" to "" + tokenDst);
-    lfs.setWorkingDirectory(appStorageDir);
-    LOG.info(""CWD set to "" + appStorageDir + "" = "" + lfs.getWorkingDirectory());
+
+
+    FileContext localizerFc = FileContext.getFileContext(
+        lfs.getDefaultFileSystem(), getConf());
+    localizerFc.setUMask(lfs.getUMask());
+    localizerFc.setWorkingDirectory(appStorageDir);
+    LOG.info(""Localizer CWD set to "" + appStorageDir + "" = "" 
+        + localizerFc.getWorkingDirectory());
+    ContainerLocalizer localizer =
+        new ContainerLocalizer(localizerFc, user, appId, locId, 
+            getPaths(localDirs), RecordFactoryProvider.getRecordFactory(getConf()));
     // TODO: DO it over RPC for maintaining similarity?
     localizer.runLocalization(nmAddr);
   }"
455ca1d72361e66afc01cc39d6d79155a2551e2d,camel,CAMEL-2206: Added new Sampler EIP. Thanks to- Stephen Gargan for the contribution.--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@883614 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/camel,"diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/TimeUnitAdapter.java b/camel-core/src/main/java/org/apache/camel/builder/xml/TimeUnitAdapter.java
new file mode 100644
index 0000000000000..a6e6ac8a564b6
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/TimeUnitAdapter.java
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder.xml;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * <code>TimeUnitAdapter</code> is a simple adapter to convert between Strings
+ * and instances of the {@link TimeUnit} enumeration
+ */
+public class TimeUnitAdapter extends XmlAdapter<String, TimeUnit> {
+
+    @Override
+    public String marshal(TimeUnit v) throws Exception {
+        String result = null;
+        if (v != null) {
+            result = v.toString();
+        }
+        return result;
+    }
+
+    @Override
+    public TimeUnit unmarshal(String v) throws Exception {
+        TimeUnit result = null;
+        if (v != null) {
+            result = TimeUnit.valueOf(v.toUpperCase());
+        }
+        return result;
+    }
+
+}
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 1714724f58a7b..ff529fa529d04 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -1136,6 +1137,39 @@ public Type routingSlip(String header) {
         return (Type) this;
     }
 
+    /**
+     * <a href=""http://camel.apache.org/sampling.html"">Sampling Throttler</a>
+     * Creates a sampling throttler allowing you to extract a sample of
+     * exchanges from the traffic on a route. It is configured with a sampling
+     * period, during which only a single exchange is allowed to pass through.
+     * All other exchanges will be stopped.
+     * <p/>
+     * Default period is one second.
+     *
+     * @return the builder
+     */
+    public SamplingDefinition sample() {
+        return sample(1, TimeUnit.SECONDS);
+    }
+
+    /**
+     * <a href=""http://camel.apache.org/sampling.html"">Sampling Throttler</a>
+     * Creates a sampling throttler allowing you to extract a sample of exchanges
+     * from the traffic through a route. It is configured with a sampling period
+     * during which only a single exchange is allowed to pass through.
+     * All other exchanges will be stopped.
+     *
+     * @param samplePeriod this is the sample interval, only one exchange is
+     *            allowed through in this interval
+     * @param unit this is the units for the samplePeriod e.g. Seconds
+     * @return the builder
+     */
+    public SamplingDefinition sample(long samplePeriod, TimeUnit unit) {
+        SamplingDefinition answer = new SamplingDefinition(samplePeriod, unit);
+        addOutput(answer);
+        return answer;
+    }
+
     /**
      * <a href=""http://camel.apache.org/splitter.html"">Splitter EIP:</a>
      * Creates a splitter allowing you split a message into a number of pieces and process them individually.
diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
new file mode 100644
index 0000000000000..0334aad4ed7dc
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.camel.Processor;
+import org.apache.camel.builder.xml.TimeUnitAdapter;
+import org.apache.camel.processor.SamplingThrottler;
+import org.apache.camel.spi.RouteContext;
+
+/**
+ * Represents an XML &lt;sample/&gt; element
+ *
+ * @version $Revision$
+ */
+@XmlRootElement(name = ""sample"")
+@XmlAccessorType(XmlAccessType.FIELD)
+@SuppressWarnings(""unchecked"")
+public class SamplingDefinition extends ProcessorDefinition<ProcessorDefinition> {
+
+    // use Long to let it be optional in JAXB so when using XML the default is 1 second
+    
+    @XmlAttribute()
+    private Long samplePeriod = 1L;
+
+    @XmlAttribute()
+    @XmlJavaTypeAdapter(TimeUnitAdapter.class)
+    private TimeUnit units = TimeUnit.SECONDS;
+
+    @XmlElementRef
+    private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
+
+    public SamplingDefinition() {
+    }
+
+    public SamplingDefinition(long samplePeriod, TimeUnit units) {
+        this.samplePeriod = samplePeriod;
+        this.units = units;
+    }
+
+    @Override
+    public String toString() {
+        return ""Sample[1 Exchange per "" + samplePeriod + "" "" + units.toString().toLowerCase() + "" -> "" + getOutputs() + ""]"";
+    }
+
+    @Override
+    public String getShortName() {
+        return ""sample"";
+    }
+
+    @Override
+    public String getLabel() {
+        return ""sample[1 Exchange per "" + samplePeriod + "" "" + units.toString().toLowerCase() + ""]"";
+    }
+
+    @Override
+    public Processor createProcessor(RouteContext routeContext) throws Exception {
+        Processor childProcessor = routeContext.createProcessor(this);
+        return new SamplingThrottler(childProcessor, samplePeriod, units);
+    }
+
+    // Fluent API
+    // -------------------------------------------------------------------------
+
+    /**
+     * Sets the sample period during which only a single {@link org.apache.camel.Exchange} will pass through.
+     *
+     * @param samplePeriod the period
+     * @return the builder
+     */
+    public SamplingDefinition samplePeriod(long samplePeriod) {
+        setSamplePeriod(samplePeriod);
+        return this;
+    }
+
+    /**
+     * Sets the time units for the sample period, defaulting to seconds.
+     *
+     * @param units the time unit of the sample period.
+     * @return the builder
+     */
+    public SamplingDefinition timeUnits(TimeUnit units) {
+        setUnits(units);
+        return this;
+    }
+
+    // Properties
+    // -------------------------------------------------------------------------
+
+    public List<ProcessorDefinition> getOutputs() {
+        return outputs;
+    }
+
+    public void setOutputs(List<ProcessorDefinition> outputs) {
+        this.outputs = outputs;
+    }
+
+    public long getSamplePeriod() {
+        return samplePeriod;
+    }
+
+    public void setSamplePeriod(long samplePeriod) {
+        this.samplePeriod = samplePeriod;
+    }
+
+    public void setUnits(String units) {
+        this.units = TimeUnit.valueOf(units);
+    }
+
+    public void setUnits(TimeUnit units) {
+        this.units = units;
+    }
+
+}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java b/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
new file mode 100644
index 0000000000000..c3b15545e4754
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import static java.lang.String.format;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A <code>SamplingThrottler</code> is a special kind of throttler. It also
+ * limits the number of exchanges sent to a downstream endpoint. It differs from
+ * a normal throttler in that it will not queue exchanges above the threshold
+ * for a given period. Instead these exchanges will be stopped, precluding them
+ * from being processed at all by downstream consumers.
+ * <p/>
+ * This kind of throttling can be useful for taking a sample from
+ * an exchange stream, rough consolidation of noisy and bursty exchange traffic
+ * or where queuing of throttled exchanges is undesirable.
+ *
+ * @version $Revision$
+ */
+public class SamplingThrottler extends DelegateProcessor {
+    protected final transient Log log = LogFactory.getLog(getClass());
+    private long samplePeriod;
+    private long periodInNanos;
+    private TimeUnit units;
+    private long timeOfLastExchange;
+    private StopProcessor stopper = new StopProcessor();
+    private Object calculationLock = new Object();
+    private SampleStats sampled = new SampleStats();
+
+    public SamplingThrottler(Processor processor, long samplePeriod, TimeUnit units) {
+        super(processor);
+
+        if (samplePeriod <= 0) {
+            throw new IllegalArgumentException(""A positive value is required for the sampling period"");
+        }
+        if (units == null) {
+            throw new IllegalArgumentException(""A invalid null value was supplied for the units of the sampling period"");
+        }
+        this.samplePeriod = samplePeriod;
+        this.units = units;
+        periodInNanos = units.toNanos(samplePeriod);
+    }
+
+    @Override
+    public String toString() {
+        return ""SamplingThrottler[1 exchange per: "" + samplePeriod + "" "" + units.toString().toLowerCase() + "" -> "" + getProcessor() + ""]"";
+    }
+
+    public String getTraceLabel() {
+        return ""samplingThrottler[1 exchange per: "" + samplePeriod + "" "" + units.toString().toLowerCase() + ""]"";
+    }
+
+    public void process(Exchange exchange) throws Exception {
+        boolean doSend = false;
+
+        synchronized (calculationLock) {
+            long now = System.nanoTime();
+            if (now >= timeOfLastExchange + periodInNanos) {
+                doSend = true;
+                if (log.isTraceEnabled()) {
+                    log.trace(sampled.sample());
+                }
+                timeOfLastExchange = now;
+            } else {
+                if (log.isTraceEnabled()) {
+                    log.trace(sampled.drop());
+                }
+            }
+        }
+
+        if (doSend) {
+            super.process(exchange);
+        } else {
+            stopper.process(exchange);
+        }
+    }
+
+    private static class SampleStats {
+        private long droppedThisPeriod;
+        private long totalDropped;
+        private long totalSampled;
+        private long totalThisPeriod;
+
+        String drop() {
+            droppedThisPeriod++;
+            totalThisPeriod++;
+            totalDropped++;
+            return getDroppedLog();
+        }
+
+        String sample() {
+            totalThisPeriod = 1; // a new period, reset to 1
+            totalSampled++;
+            droppedThisPeriod = 0;
+            return getSampledLog();
+        }
+
+        String getSampledLog() {
+            return format(""Sampled %d of %d total exchanges"", totalSampled, totalSampled + totalDropped);
+        }
+
+        String getDroppedLog() {
+            return format(""Dropped %d of %d exchanges in this period, totalling %d dropped of %d exchanges overall."",
+                          droppedThisPeriod, totalThisPeriod, totalDropped, totalSampled + totalDropped);
+        }
+    }
+
+}
diff --git a/camel-core/src/main/resources/org/apache/camel/model/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
index 8a41eac1a9302..61be76a4fbbc0 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
@@ -58,6 +58,7 @@ RouteBuilderDefinition
 RouteDefinition
 RoutesDefinition
 RoutingSlipDefinition
+SamplingDefinition
 SetBodyDefinition
 SetExchangePatternDefinition
 SetHeaderDefinition
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
new file mode 100644
index 0000000000000..0ce492e2e0f0e
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.direct.DirectEndpoint;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class SamplingThrottlerTest extends ContextTestSupport {
+
+    public void testSamplingFromExchangeStream() throws Exception {
+        MockEndpoint mock = getMockEndpoint(""mock:result"");
+        mock.expectedMessageCount(2);
+        mock.setResultWaitTime(3000);
+
+        List<Exchange> sentExchanges = new ArrayList<Exchange>();
+        sendExchangesThroughDroppingThrottler(sentExchanges, 15);
+
+        mock.assertIsSatisfied();
+        validateDroppedExchanges(sentExchanges, 2);
+    }
+
+    public void testBurstySampling() throws Exception {
+        MockEndpoint mock = getMockEndpoint(""mock:result"");
+        mock.expectedMessageCount(2);
+        mock.setResultWaitTime(3000);
+
+        List<Exchange> sentExchanges = new ArrayList<Exchange>();
+
+        // send a burst of 5 exchanges, expecting only one to get through
+        sendExchangesThroughDroppingThrottler(sentExchanges, 5);
+        // sleep through a complete period
+        Thread.sleep(1100);
+        // send another 5 now
+        sendExchangesThroughDroppingThrottler(sentExchanges, 5);
+
+        mock.assertIsSatisfied();
+        validateDroppedExchanges(sentExchanges, 2);
+    }
+
+    public void testSendLotsOfMessagesSimultaneouslyButOnly3GetThrough() throws Exception {
+        MockEndpoint mock = getMockEndpoint(""mock:result"");
+        mock.expectedMessageCount(3);
+        mock.setResultWaitTime(4000);
+
+        final List<Exchange> sentExchanges = Collections.synchronizedList(new ArrayList<Exchange>());
+        ExecutorService executor = Executors.newFixedThreadPool(5);
+        for (int i = 0; i < 5; i++) {
+            executor.execute(new Runnable() {
+                public void run() {
+                    try {
+                        sendExchangesThroughDroppingThrottler(sentExchanges, 35);
+                    } catch (InterruptedException e) {}
+                }
+            });
+        }
+
+        mock.assertIsSatisfied();
+    }
+
+    private void sendExchangesThroughDroppingThrottler(List<Exchange> sentExchanges, int messages) throws InterruptedException {
+        DirectEndpoint targetEndpoint = resolveMandatoryEndpoint(""direct:sample"", DirectEndpoint.class);
+        for (int i = 0; i < messages; i++) {
+            Exchange e = targetEndpoint.createExchange();
+            e.getIn().setBody(""<message>"" + i + ""</message>"");
+            template.send(targetEndpoint, e);
+            sentExchanges.add(e);
+            Thread.sleep(100);
+        }
+    }
+
+    private void validateDroppedExchanges(List<Exchange> sentExchanges, int expectedNotDroppedCount) {
+        int notDropped = 0;
+        for (Exchange e : sentExchanges) {
+            Boolean stopped = e.getProperty(Exchange.ROUTE_STOP, Boolean.class);
+            if (stopped == null) {
+                notDropped++;
+            }
+        }
+        assertEquals(expectedNotDroppedCount, notDropped);
+    }
+
+
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                // START SNIPPET: e1
+                from(""direct:sample"").sample().to(""mock:result"");
+
+                from(""direct:sample-configured"").sample(1, TimeUnit.SECONDS).to(""mock:result"");
+
+                from(""direct:sample-configured-via-dsl"").sample().samplePeriod(1).timeUnits(TimeUnit.SECONDS).to(""mock:result"");
+                // END SNIPPET: e1
+            }
+        };
+    }
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
new file mode 100644
index 0000000000000..98b208c8e46f0
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.processor;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.processor.SamplingThrottlerTest;
+
+import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+
+public class SpringSamplingThrottlerTest extends SamplingThrottlerTest {
+
+    protected CamelContext createCamelContext() throws Exception {
+        return createSpringCamelContext(this, ""org/apache/camel/spring/processor/samplingThrottler.xml"");
+    }
+
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerWithDefaultTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerWithDefaultTest.java
new file mode 100644
index 0000000000000..72dbb93aef8b5
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerWithDefaultTest.java
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.processor;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.processor.SamplingThrottlerTest;
+
+import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+
+public class SpringSamplingThrottlerWithDefaultTest extends SamplingThrottlerTest {
+
+    protected CamelContext createCamelContext() throws Exception {
+        return createSpringCamelContext(this, ""org/apache/camel/spring/processor/samplingThrottler.xml"");
+    }
+
+}
\ No newline at end of file
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
new file mode 100644
index 0000000000000..6e8ca803ae8a8
--- /dev/null
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
@@ -0,0 +1,37 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the ""License""); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an ""AS IS"" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns=""http://www.springframework.org/schema/beans""
+       xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""
+       xsi:schemaLocation=""
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+    "">
+
+    <camelContext id=""camel"" xmlns=""http://camel.apache.org/schema/spring"">
+        <!-- START SNIPPET: e1 -->
+        <route>
+            <from uri=""direct:sample""/>
+            <sample samplePeriod=""1"" units=""seconds"">
+                <to uri=""mock:result""/>
+            </sample>
+        </route>
+        <!-- END SNIPPET: e1 -->
+
+    </camelContext>
+
+</beans>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml
new file mode 100644
index 0000000000000..1a0ec51ec6902
--- /dev/null
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml
@@ -0,0 +1,38 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the ""License""); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an ""AS IS"" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns=""http://www.springframework.org/schema/beans""
+       xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""
+       xsi:schemaLocation=""
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+    "">
+
+    <camelContext id=""camel"" xmlns=""http://camel.apache.org/schema/spring"">
+        <!-- START SNIPPET: e1 -->
+        <route>
+            <from uri=""direct:sample""/>
+            <!-- will by default use 1 second period -->
+            <sample>
+                <to uri=""mock:result""/>
+            </sample>
+        </route>
+        <!-- END SNIPPET: e1 -->
+
+    </camelContext>
+
+</beans>"
5813377777c7b1e56ff0a0c67d61a4bfd63f2cbe,restlet-framework-java, - Fixed potential NPE in ReferenceList--,c,https://github.com/restlet/restlet-framework-java,"diff --git a/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarkHandler.java b/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarkHandler.java
index 8a9de741db..64e592fb15 100644
--- a/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarkHandler.java
+++ b/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarkHandler.java
@@ -19,6 +19,7 @@
 package org.restlet.example.book.rest.ch7.handler;
 
 import org.restlet.Handler;
+import org.restlet.data.ChallengeResponse;
 import org.restlet.data.Request;
 import org.restlet.data.Response;
 import org.restlet.example.book.rest.ch7.resource.BookmarkResource;
@@ -34,8 +35,9 @@ public class BookmarkHandler extends Handler {
     @Override
     public Resource findTarget(final Request request, Response response) {
         String userName = (String) request.getAttributes().get(""username"");
-        String login = request.getChallengeResponse().getIdentifier();
-        String password = request.getChallengeResponse().getSecret();
+        ChallengeResponse cr = request.getChallengeResponse();
+        String login = (cr != null) ? cr.getIdentifier() : null;
+        String password = (cr != null) ? cr.getSecret() : null;
         String uri = (String) request.getAttributes().get(""URI"");
         return new BookmarkResource(userName, login, password, uri);
     }
diff --git a/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarksHandler.java b/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarksHandler.java
index b35b229324..9cb3f210a6 100644
--- a/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarksHandler.java
+++ b/module/org.restlet.example/src/org/restlet/example/book/rest/ch7/handler/BookmarksHandler.java
@@ -19,6 +19,7 @@
 package org.restlet.example.book.rest.ch7.handler;
 
 import org.restlet.Handler;
+import org.restlet.data.ChallengeResponse;
 import org.restlet.data.Request;
 import org.restlet.data.Response;
 import org.restlet.example.book.rest.ch7.resource.BookmarksResource;
@@ -34,8 +35,9 @@ public class BookmarksHandler extends Handler {
     @Override
     public Resource findTarget(final Request request, Response response) {
         String userName = (String) request.getAttributes().get(""username"");
-        String login = request.getChallengeResponse().getIdentifier();
-        String password = request.getChallengeResponse().getSecret();
+        ChallengeResponse cr = request.getChallengeResponse();
+        String login = (cr != null) ? cr.getIdentifier() : null;
+        String password = (cr != null) ? cr.getSecret() : null;
         return new BookmarksResource(userName, login, password);
     }
 }
diff --git a/module/org.restlet/src/org/restlet/data/ReferenceList.java b/module/org.restlet/src/org/restlet/data/ReferenceList.java
index b2ea964788..95cedafcb4 100644
--- a/module/org.restlet/src/org/restlet/data/ReferenceList.java
+++ b/module/org.restlet/src/org/restlet/data/ReferenceList.java
@@ -146,13 +146,17 @@ public Representation getWebRepresentation() {
         // Create a simple HTML list
         StringBuilder sb = new StringBuilder();
         sb.append(""<html><body>\n"");
-        sb
-                .append(""<h1>Listing of \"""" + getIdentifier().getPath()
-                        + ""\""</h1>\n"");
-        Reference parentRef = getIdentifier().getParentRef();
 
-        if (!parentRef.equals(getIdentifier())) {
-            sb.append(""<a href=\"""" + parentRef + ""\"">..</a><br/>\n"");
+        if (getIdentifier() != null) {
+            sb.append(""<h2>Listing of \"""" + getIdentifier().getPath()
+                    + ""\""</h2>\n"");
+            Reference parentRef = getIdentifier().getParentRef();
+
+            if (!parentRef.equals(getIdentifier())) {
+                sb.append(""<a href=\"""" + parentRef + ""\"">..</a><br/>\n"");
+            }
+        } else {
+            sb.append(""<h2>List of references</h2>\n"");
         }
 
         for (Reference ref : this) {"
c46153c7e058b212d97698f5b6f06733d669d46f,ReactiveX-RxJava,As per suggestions: Added single static instance of- ExecutorService for delayed posting Introduced ScheduledIOSAction to enable- CompositeSubscription--,a,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/HandlerThreadScheduler.java b/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/HandlerThreadScheduler.java
index a57aa8b3e5..151f5bef41 100644
--- a/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/HandlerThreadScheduler.java
+++ b/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/HandlerThreadScheduler.java
@@ -1,4 +1,3 @@
-package rx.ios.schedulers;
 /**
  * Copyright 2013 Netflix, Inc.
  * Copyright 2014 Ashley Williams
@@ -16,16 +15,18 @@
  * limitations under the License.
  */
 
+package rx.ios.schedulers;
 
-import org.robovm.apple.foundation.NSBlockOperation;
 import org.robovm.apple.foundation.NSOperationQueue;
 import rx.Scheduler;
 import rx.Subscription;
 import rx.functions.Action0;
-import rx.subscriptions.BooleanSubscription;
+import rx.internal.util.RxThreadFactory;
+import rx.subscriptions.CompositeSubscription;
 import rx.subscriptions.Subscriptions;
 
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -35,6 +36,8 @@
 public class HandlerThreadScheduler extends Scheduler {
 
     private final NSOperationQueue operationQueue;
+    private static final String THREAD_PREFIX = ""RxiOSScheduledExecutorPool-"";
+
 
     public HandlerThreadScheduler(NSOperationQueue operationQueue) {
         this.operationQueue = operationQueue;
@@ -49,7 +52,7 @@ public Worker createWorker() {
     private static class InnerHandlerThreadScheduler extends Worker {
 
         private final NSOperationQueue operationQueue;
-        private BooleanSubscription innerSubscription = new BooleanSubscription();
+        private CompositeSubscription innerSubscription = new CompositeSubscription();
 
 
         public InnerHandlerThreadScheduler(NSOperationQueue operationQueue) {
@@ -67,43 +70,53 @@ public boolean isUnsubscribed() {
         }
 
         @Override
-        public Subscription schedule(Action0 action0) {
-            return schedule(action0, 0, TimeUnit.MILLISECONDS);
+        public Subscription schedule(final Action0 action) {
+            return schedule(action, 0, null);
         }
 
         @Override
         public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit) {
+            return scheduledAction(action, delayTime, unit);
+        }
+
+        public Subscription scheduledAction(final Action0 action, long delay, TimeUnit unit) {
 
-            ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
-            final NSBlockOperation runOperation = new NSBlockOperation();
-
-            executor.schedule(new Runnable() {
-                @Override
-                public void run() {
-                    if (isUnsubscribed()) {
-                        return;
-                    }
-                    /* Runnable for action */
-                    final Runnable actionRunner = new Runnable() {
-                        @Override
-                        public void run() {
-                            action.call();
-                        }
-                    };
-
-                    runOperation.addExecutionBlock$(actionRunner);
-
-                    /* Add operation to operation queue*/
-                    operationQueue.addOperation(runOperation);
-                }
-            }, delayTime, unit);
-
-            return Subscriptions.create(new Action0() {
-                @Override
-                public void call() {
-                    runOperation.cancel();
-                }
-            });
+            if (innerSubscription.isUnsubscribed()) {
+                return Subscriptions.empty();
+            }
+
+            final ScheduledIOSAction scheduledAction = new ScheduledIOSAction(action, operationQueue);
+            final ScheduledExecutorService executor = IOSScheduledExecutorPool.getInstance();
+
+            Future<?> future;
+            if (delay <= 0) {
+                future = executor.submit(scheduledAction);
+            } else {
+                future = executor.schedule(scheduledAction, delay, unit);
+            }
+
+            scheduledAction.add(Subscriptions.from(future));
+            scheduledAction.addParent(innerSubscription);
+
+            return scheduledAction;
         }
     }
+
+
+    private static final class IOSScheduledExecutorPool {
+
+        private static final RxThreadFactory THREAD_FACTORY = new RxThreadFactory(THREAD_PREFIX);
+
+        private static IOSScheduledExecutorPool INSTANCE = new IOSScheduledExecutorPool();
+        private final ScheduledExecutorService executorService;
+
+        private IOSScheduledExecutorPool() {
+            executorService = Executors.newScheduledThreadPool(1, THREAD_FACTORY);
+        }
+
+        public static ScheduledExecutorService getInstance() {
+            return INSTANCE.executorService;
+        }
+    }
+
 }
diff --git a/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/ScheduledIOSAction.java b/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/ScheduledIOSAction.java
new file mode 100644
index 0000000000..c7e2bfd476
--- /dev/null
+++ b/rxjava-contrib/rxjava-ios/src/main/java/rx/ios/schedulers/ScheduledIOSAction.java
@@ -0,0 +1,130 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * Copyright 2014 Ashley Williams
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rx.ios.schedulers;
+
+import org.robovm.apple.foundation.NSBlockOperation;
+import org.robovm.apple.foundation.NSOperationQueue;
+import rx.Subscription;
+import rx.functions.Action0;
+import rx.subscriptions.CompositeSubscription;
+
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+/**
+ * Based on {@code ScheduledAction} - A {@code Runnable} that executes an {@code Action0}
+ * that can be cancelled.
+ */
+final class ScheduledIOSAction implements Runnable, Subscription {
+    final CompositeSubscription cancel;
+    final Action0 action;
+    NSBlockOperation nsBlockOperation;
+    final NSOperationQueue operationQueue;
+    volatile int once;
+    static final AtomicIntegerFieldUpdater<ScheduledIOSAction> ONCE_UPDATER
+            = AtomicIntegerFieldUpdater.newUpdater(ScheduledIOSAction.class, ""once"");
+
+    public ScheduledIOSAction(Action0 action, NSOperationQueue operationQueue) {
+        this.action = action;
+        this.operationQueue = operationQueue;
+        this.cancel = new CompositeSubscription();
+
+        nsBlockOperation = new NSBlockOperation();
+    }
+
+    @Override
+    public void run() {
+        try {
+
+            final Runnable actionRunner = new Runnable() {
+                @Override
+                public void run() {
+                    action.call();
+                }
+            };
+
+            nsBlockOperation.addExecutionBlock$(actionRunner);
+
+            /* Add operation to operation queue*/
+            operationQueue.addOperation(nsBlockOperation);
+
+        } finally {
+            unsubscribe();
+        }
+    }
+
+    @Override
+    public boolean isUnsubscribed() {
+        return cancel.isUnsubscribed();
+    }
+
+    @Override
+    public void unsubscribe() {
+        if (ONCE_UPDATER.compareAndSet(this, 0, 1)) {
+            nsBlockOperation.cancel();
+            cancel.unsubscribe();
+            System.err.println(""cancelled"");
+        }
+    }
+
+    /**
+     * Adds a {@code Subscription} to the {@link CompositeSubscription} to be later cancelled on unsubscribe
+     *
+     * @param s subscription to add
+     */
+    public void add(Subscription s) {
+        cancel.add(s);
+    }
+
+    /**
+     * Adds a parent {@link rx.subscriptions.CompositeSubscription} to this {@code ScheduledIOSAction} so when
+     * the action is cancelled or terminates, it can remove itself from this parent
+     * @param parent the parent {@code CompositeSubscription} to add
+     */
+    public void addParent(CompositeSubscription parent) {
+        cancel.add(new Remover(this, parent));
+    }
+
+
+    /**
+     * Remove a child subscription from a composite when unsubscribing
+     */
+    private static final class Remover implements Subscription {
+        final Subscription s;
+        final CompositeSubscription parent;
+        volatile int once;
+        static final AtomicIntegerFieldUpdater<Remover> ONCE_UPDATER
+                = AtomicIntegerFieldUpdater.newUpdater(Remover.class, ""once"");
+
+        public Remover(Subscription s, CompositeSubscription parent) {
+            this.s = s;
+            this.parent = parent;
+        }
+
+        @Override
+        public boolean isUnsubscribed() {
+            return s.isUnsubscribed();
+        }
+
+        @Override
+        public void unsubscribe() {
+            if (ONCE_UPDATER.compareAndSet(this, 0, 1)) {
+                parent.remove(s);
+            }
+        }
+    }
+}
\ No newline at end of file"
4f19dccda7d8779636f6cc4752552d5b80cce8bb,intellij-community,implement open hash addressing in index leaf- page to avoid large moves--,p,https://github.com/JetBrains/intellij-community,"diff --git a/platform/util/src/com/intellij/util/io/IntToIntBtree.java b/platform/util/src/com/intellij/util/io/IntToIntBtree.java
index f918cf1e532ba..d836016675035 100644
--- a/platform/util/src/com/intellij/util/io/IntToIntBtree.java
+++ b/platform/util/src/com/intellij/util/io/IntToIntBtree.java
@@ -1,7 +1,10 @@
 package com.intellij.util.io;
 
+import gnu.trove.TIntIntHashMap;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+
 /**
 * Created by IntelliJ IDEA.
 * User: maximmossienko
@@ -14,8 +17,12 @@ abstract class IntToIntBtree {
 
   final int pageSize;
   private final short maxInteriorNodes;
+  private final short maxLeafNodes;
   final BtreeIndexNodeView root;
   private int maxStepsSearched;
+  private int maxStepsSearchedInHash;
+  private int totalHashStepsSearched;
+  private int hashSearchRequests;
   private int pagesCount;
   private int count;
   private int movedMembersCount;
@@ -23,7 +30,10 @@ abstract class IntToIntBtree {
   private final byte[] buffer;
   private boolean isLarge = true;
   private final ISimpleStorage storage;
-  private boolean offloadToSiblingsBeforeSplit = false; // TODO till effective insertion to page
+  private final boolean offloadToSiblingsBeforeSplit = false; // TODO till effective insertion to page
+  private final boolean indexNodeIsHashTable = true;
+  final int metaDataLeafPageLength;
+  final int hashPageCapacity;
 
   public IntToIntBtree(int _pageSize, int rootAddress, ISimpleStorage _storage, boolean initial) {
     pageSize = _pageSize;
@@ -33,9 +43,34 @@ public IntToIntBtree(int _pageSize, int rootAddress, ISimpleStorage _storage, bo
     root = new BtreeIndexNodeView(this);
     root.setAddress(rootAddress);
 
-    int i = (pageSize - BtreePage.META_PAGE_LEN) / BtreeIndexNodeView.INTERIOR_SIZE - 1;
+    int i = (pageSize - BtreePage.RESERVED_META_PAGE_LEN) / BtreeIndexNodeView.INTERIOR_SIZE - 1;
     assert i < Short.MAX_VALUE && i % 2 == 0;
     maxInteriorNodes = (short)i;
+
+    int metaPageLen = BtreePage.RESERVED_META_PAGE_LEN;
+
+    if (indexNodeIsHashTable) {
+      ++i;
+      final double bitsPerState = BtreeIndexNodeView.haveDeleteState? 2d:1d;
+      while(Math.ceil(bitsPerState * i / 8) + i * BtreeIndexNodeView.INTERIOR_SIZE + BtreePage.RESERVED_META_PAGE_LEN > pageSize ||
+            !isPrime(i)
+           ) {
+        i -= 2;
+      }
+
+      hashPageCapacity = i;
+      metaPageLen = BtreePage.RESERVED_META_PAGE_LEN + (int)Math.ceil(bitsPerState * hashPageCapacity / 8);
+      i = (int)(hashPageCapacity * 0.8);
+      if ((i & 1) == 1) ++i;
+    } else {
+      hashPageCapacity = -1;
+    }
+
+    metaDataLeafPageLength = metaPageLen;
+
+    assert i > 0 && i % 2 == 0;
+    maxLeafNodes = (short) i;
+
     pagesCount = 1;
     ((BtreePage)root).load();
 
@@ -45,6 +80,29 @@ public IntToIntBtree(int _pageSize, int rootAddress, ISimpleStorage _storage, bo
     }
   }
 
+  public void persistVars(BtreeDataStorage storage, boolean toDisk) {
+    maxStepsSearched = storage.persistInt(0, maxStepsSearched, toDisk);
+    pagesCount = storage.persistInt(4, pagesCount, toDisk);
+    movedMembersCount = storage.persistInt(8, movedMembersCount, toDisk);
+    maxStepsSearchedInHash = storage.persistInt(12, maxStepsSearchedInHash, toDisk);
+    count = storage.persistInt(16, count, toDisk);
+    hashSearchRequests = storage.persistInt(20, hashSearchRequests, toDisk);
+    totalHashStepsSearched = storage.persistInt(24, totalHashStepsSearched, toDisk);
+  }
+
+  interface BtreeDataStorage {
+    int persistInt(int offset, int value, boolean toDisk);
+  }
+  
+  private static boolean isPrime(int val) {
+    if (val % 2 == 0) return false;
+    int maxDivisor = (int)Math.sqrt(val);
+    for(int i = 3; i <= maxDivisor; i+=2) {
+      if (val % i == 0) return false;
+    }
+    return true;
+  }
+
   protected abstract int allocEmptyPage();
 
   private int nextPage() {
@@ -69,7 +127,7 @@ public void put(int key, int value) {
 
     if (index < 0) {
       ++count;
-      currentIndexNode.insert(key, value, -index - 1);
+      currentIndexNode.insert(key, value);
     } else {
       currentIndexNode.setAddressAt(index, value);
     }
@@ -80,6 +138,7 @@ public int remove(int key) {
     //BtreeIndexNodeView currentIndexNode = new BtreeIndexNodeView(this);
     //currentIndexNode.setAddress(root.address);
     //int index = currentIndexNode.locate(key, false);
+    myAssert(BtreeIndexNodeView.haveDeleteState);
     throw new UnsupportedOperationException(""Remove does not work yet ""+key);
   }
 
@@ -87,36 +146,12 @@ void setRootAddress(int newRootAddress) {
     root.setAddress(newRootAddress);
   }
 
-  public int getMaxStepsSearched() {
-    return maxStepsSearched;
-  }
-
-  public void setMaxStepsSearched(int _maxStepsSearched) {
-    maxStepsSearched = _maxStepsSearched;
-  }
-
-  public int getPageCount() {
-    return pagesCount;
-  }
-
-  public void setPagesCount(int pagesCount) {
-    this.pagesCount = pagesCount;
-  }
-
-  public int getMovedMembersCount() {
-    return movedMembersCount;
-  }
-
-  public void setMovedMembersCount(int movedMembersCount) {
-    this.movedMembersCount = movedMembersCount;
-  }
-
   void dumpStatistics() {
-    IOStatistics.dump(""pagecount:"" + pagesCount + "", height:"" + maxStepsSearched + "", movedMembers:""+movedMembersCount);
+    IOStatistics.dump(""pagecount:"" + pagesCount + "", height:"" + maxStepsSearched + "", movedMembers:""+movedMembersCount +
+                      "", hash steps:"" + maxStepsSearchedInHash + "", avg search in hash:"" + (totalHashStepsSearched / hashSearchRequests));
   }
 
   void doFlush() {
-    //pagesCache.clear();
   }
 
   static void myAssert(boolean b) {
@@ -127,12 +162,11 @@ static void myAssert(boolean b) {
   }
 
   static class BtreePage {
+    static final int RESERVED_META_PAGE_LEN = 8;
+
     protected final IntToIntBtree btree;
     protected int address;
     private short myChildrenCount;
-    private byte[] buffer;
-
-    // TODO link pages of the same height
 
     public BtreePage(IntToIntBtree btree) {
       this.btree = btree;
@@ -143,89 +177,76 @@ void setAddress(int _address) {
       if (doSanityCheck) myAssert(_address % btree.pageSize == 0);
       address = _address;
       myChildrenCount = -1;
-      buffer = null;
     }
 
-    final short getChildrenCount() {
+    protected final boolean getFlag(int mask) {
+      return (btree.storage.get(address) & mask) == mask;
+    }
+
+    protected final void setFlag(int mask, boolean flag) {
+      byte b = btree.storage.get(address);
+      if (flag) b |= mask;
+      else b &= ~mask;
+      btree.storage.put(address, b);
+    }
+
+    protected final short getChildrenCount() {
       if (myChildrenCount == -1) {
-        myChildrenCount = (short)(((getByte(address + 1) & 0xFF) << 8) + (getByte(address + 2) & 0xFF));
+        myChildrenCount = (short)(((btree.storage.get(address + 1) & 0xFF) << 8) + (btree.storage.get(address + 2) & 0xFF));
       }
       return myChildrenCount;
     }
 
-    final void setChildrenCount(short value) {
+    protected final void setChildrenCount(short value) {
       myChildrenCount = value;
-      putByte(address + 1, (byte)((value >> 8) & 0xFF));
-      putByte(address + 2, (byte)(value & 0xFF));
+      btree.storage.put(address + 1, (byte)((value >> 8) & 0xFF));
+      btree.storage.put(address + 2, (byte)(value & 0xFF));
     }
 
-    protected final int getInt(int address) {
-      //getBytes(address, btree.typedBuffer, 0, 4);
-      //return Bits.getInt(btree.typedBuffer, 0);
-      return btree.storage.getInt(address);
+    protected final void setNextPage(int nextPage) {
+      putInt(address + 3, nextPage);
     }
 
-    protected final void putInt(int offset, int value) {
-      //Bits.putInt(btree.typedBuffer, 0, value);
-      //putBytes(offset, btree.typedBuffer, 0, 4);
-      btree.storage.putInt(offset, value);
+    // TODO: use it
+    protected final int getNextPage() {
+      return getInt(address + 3);
     }
 
-    protected final byte getByte(int address) {
-      return btree.storage.get(address);
-      //getBytes(address, btree.typedBuffer, 0, 1);
-      //return btree.typedBuffer[0];
+    protected final int getInt(int address) {
+      return btree.storage.getInt(address);
     }
 
-    protected final void putByte(int address, byte b) {
-      btree.storage.put(address, b);
-      //btree.typedBuffer[0] = b;
-      //putBytes(address, btree.typedBuffer, 0, 1);
+    protected final void putInt(int offset, int value) {
+      btree.storage.putInt(offset, value);
     }
 
     protected final void getBytes(int address, byte[] dst, int offset, int length) {
       btree.storage.get(address, dst, offset, length);
-      //if (buffer == null) load();
-      //
-      //int base = address - this.address;
-      //for(int i = 0; i < length; ++i) {
-      //  dst[offset + i] = buffer[base + i];
-      //}
     }
 
     private void load() {
-      //if (address == btree.root.address && btree.root != this) {
-      //  buffer = ((BtreePage)btree.root).buffer;
-      //} else {
-      //  buffer = btree.loadPage(address);
-      //}
     }
 
     protected final void putBytes(int address, byte[] src, int offset, int length) {
       btree.storage.put(address, src, offset, length);
-      //if (buffer == null) load();
-      //int base = address - this.address;
-      //for(int i = 0; i < length; ++i) {
-      //  buffer[base + i] = src[offset + i];
-      //}
     }
 
     void sync() {
-      if (buffer != null) {
-        //btree.savePage(address, buffer);
-      }
     }
-
-    static int META_PAGE_LEN = 8;
-  }
+}
 
   // Leaf index node
   // (value_address {<0 if address in duplicates segment}, hash key) {getChildrenCount()}
   // (|next_node {<0} , hash key|) {getChildrenCount()} , next_node {<0}
   // next_node[i] is pointer to all less than hash_key[i] except for the last
   static class BtreeIndexNodeView extends BtreePage {
+    static final int INTERIOR_SIZE = 8;
+    static final int KEY_OFFSET = 4;
+
     private boolean isIndexLeaf;
     private boolean isIndexLeafSet;
+    private boolean isHashedLeaf;
+    private boolean isHashedLeafSet;
     private static final int LARGE_MOVE_THRESHOLD = 5;
 
     BtreeIndexNodeView(IntToIntBtree btree) {
@@ -236,34 +257,42 @@ static class BtreeIndexNodeView extends BtreePage {
     void setAddress(int _address) {
       super.setAddress(_address);
       isIndexLeafSet = false;
+      isHashedLeafSet = false;
     }
 
-    static int INTERIOR_SIZE = 8;
+    static final int HASH_FREE = 0;
+    static final int HASH_FULL = 1;
+    static final int HASH_REMOVED = 2;
 
-    // binary search with negative result means insertion index
     int search(int value) {
-      int hi = getChildrenCount() - 1;
-      int lo = 0;
-
-      while(lo <= hi) {
-        int mid = lo + (hi - lo) / 2;
-        int keyAtMid = keyAt(mid);
-
-        if (value > keyAtMid) {
-          lo = mid + 1;
-        } else if (value < keyAtMid) {
-          hi = mid - 1;
-        } else {
-          return mid;
+      if (isIndexLeaf() && isHashedLeaf()) {
+        return hashIndex(value);
+      }
+      else {
+        int hi = getChildrenCount() - 1;
+        int lo = 0;
+
+        while(lo <= hi) {
+          int mid = lo + (hi - lo) / 2;
+          int keyAtMid = keyAt(mid);
+
+          if (value > keyAtMid) {
+            lo = mid + 1;
+          } else if (value < keyAtMid) {
+            hi = mid - 1;
+          } else {
+            return mid;
+          }
         }
+        return -(lo + 1);
       }
-      return -(lo + 1);
     }
 
     final int addressAt(int i) {
       if (doSanityCheck) {
         short childrenCount = getChildrenCount();
-        myAssert(i < childrenCount || (!isIndexLeaf() && i == childrenCount));
+        if (isHashedLeaf()) myAssert(i < btree.hashPageCapacity);
+        else myAssert(i < childrenCount || (!isIndexLeaf() && i == childrenCount));
       }
       return getInt(indexToOffset(i));
     }
@@ -272,38 +301,58 @@ private void setAddressAt(int i, int value) {
       int offset = indexToOffset(i);
       if (doSanityCheck) {
         short childrenCount = getChildrenCount();
-        myAssert(i < childrenCount || (!isIndexLeaf() && i == childrenCount));
-        myAssert(offset + 4 < address + btree.pageSize);
-        myAssert(offset >= address + META_PAGE_LEN);
+        final int metaPageLen;
+
+        if (isHashedLeaf()) {
+          myAssert(i < btree.hashPageCapacity);
+          metaPageLen = btree.metaDataLeafPageLength;
+        }
+        else {
+          myAssert(i < childrenCount || (!isIndexLeaf() && i == childrenCount));
+          metaPageLen = RESERVED_META_PAGE_LEN;
+        }
+        myAssert(offset + 4 <= address + btree.pageSize);
+        myAssert(offset >= address + metaPageLen);
       }
       putInt(offset, value);
     }
 
     private final int indexToOffset(int i) {
-      return address + i * INTERIOR_SIZE + META_PAGE_LEN;
+      return address + i * INTERIOR_SIZE + (isHashedLeaf() ? btree.metaDataLeafPageLength:RESERVED_META_PAGE_LEN);
     }
 
-    final int keyAt(int i) {
-      if (doSanityCheck) myAssert(i < getChildrenCount());
-      return getInt(indexToOffset(i) + 4);
+    private final int keyAt(int i) {
+      if (doSanityCheck) {
+        if (isHashedLeaf()) myAssert(i < btree.hashPageCapacity);
+        else myAssert(i < getChildrenCount());
+      }
+      return getInt(indexToOffset(i) + KEY_OFFSET);
     }
 
     private void setKeyAt(int i, int value) {
-      int offset = indexToOffset(i) + 4;
+      final int offset = indexToOffset(i) + KEY_OFFSET;
       if (doSanityCheck) {
-        myAssert(i < getChildrenCount());
-        myAssert(offset + 4 < address + btree.pageSize);
-        myAssert(offset >= address + META_PAGE_LEN);
+        final int metaPageLen;
+        if (isHashedLeaf()) {
+          myAssert(i < btree.hashPageCapacity);
+          metaPageLen = btree.metaDataLeafPageLength;
+        }
+        else {
+          myAssert(i < getChildrenCount());
+          metaPageLen = RESERVED_META_PAGE_LEN;
+        }
+        myAssert(offset + 4 <= address + btree.pageSize);
+        myAssert(offset >= address + metaPageLen);
       }
       putInt(offset, value);
     }
 
-    static int INDEX_LEAF_MASK = 0x1;
+    static final int INDEX_LEAF_MASK = 0x1;
+    static final int HASHED_LEAF_MASK = 0x2;
 
-    boolean isIndexLeaf() {
+    final boolean isIndexLeaf() {
       if (!isIndexLeafSet) {
-        byte b = getByte(address);
-        isIndexLeaf = (b & INDEX_LEAF_MASK) == INDEX_LEAF_MASK;
+        isIndexLeaf = getFlag(INDEX_LEAF_MASK);
         isIndexLeafSet = true;
       }
       return isIndexLeaf;
@@ -311,14 +360,24 @@ boolean isIndexLeaf() {
 
     void setIndexLeaf(boolean value) {
       isIndexLeaf = value;
-      byte b = getByte(address);
-      if (value) b |= INDEX_LEAF_MASK;
-      else b &= ~INDEX_LEAF_MASK;
-      putByte(address, b);
+      setFlag(INDEX_LEAF_MASK, value);
+    }
+
+    final boolean isHashedLeaf() {
+      if (!isHashedLeafSet) {
+        isHashedLeaf = getFlag(HASHED_LEAF_MASK);
+        isHashedLeafSet = true;
+      }
+      return isHashedLeaf;
+    }
+
+    void setHashedLeaf(boolean value) {
+      isHashedLeaf = value;
+      setFlag(HASHED_LEAF_MASK, value);
     }
 
     final short getMaxChildrenCount() {
-      return btree.maxInteriorNodes;
+      return isIndexLeaf() ? btree.maxLeafNodes:btree.maxInteriorNodes;
     }
 
     final boolean isFull() {
@@ -329,6 +388,29 @@ final boolean isFull() {
       return childrenCount == getMaxChildrenCount();
     }
 
+    int[] exportKeys() {
+      assert isIndexLeaf();
+      short childrenCount = getChildrenCount();
+      int[] keys = new int[childrenCount];
+
+      if (isHashedLeaf()) {
+        getBytes(indexToOffset(0), btree.buffer, 0, btree.pageSize - btree.metaDataLeafPageLength);
+        int keyNumber = 0;
+
+        for(int i = 0; i < btree.hashPageCapacity; ++i) {
+          if (hashGetState(i) == HASH_FULL) {
+            int key = Bits.getInt(btree.buffer, i * INTERIOR_SIZE + KEY_OFFSET);
+            keys[keyNumber++] = key;
+          }
+        }
+      } else {
+        for(int i = 0; i < childrenCount; ++i) {
+          keys[i] = keyAt(i);
+        }
+      }
+      return keys;
+    }
+    
     private int splitNode(int parentAddress) {
       if (doSanityCheck) {
         myAssert(isFull());
@@ -353,33 +435,64 @@ private int splitNode(int parentAddress) {
       boolean indexLeaf = isIndexLeaf();
       newIndexNode.setIndexLeaf(indexLeaf);
 
-      short recordCount = getChildrenCount();
+      int nextPage = getNextPage();
+      setNextPage(newIndexNode.address);
+      newIndexNode.setNextPage(nextPage);
+
+      final short recordCount = getChildrenCount();
 
-      short recordCountInNewNode = (short)(recordCount - maxIndex);
-      newIndexNode.setChildrenCount(recordCountInNewNode);
       int medianKey;
 
-      if (btree.isLarge) {
-        final int bytesToMove = recordCountInNewNode * INTERIOR_SIZE;
-        getBytes(indexToOffset(maxIndex), btree.buffer, 0, bytesToMove);
-        newIndexNode.putBytes(newIndexNode.indexToOffset(0), btree.buffer, 0, bytesToMove);
-      } else {
-        for(int i = 0; i < recordCountInNewNode; ++i) {
-          newIndexNode.setAddressAt(i, addressAt(i + maxIndex));
-          newIndexNode.setKeyAt(i, keyAt(i + maxIndex));
+      if (indexLeaf && isHashedLeaf()) {
+        TIntIntHashMap map = new TIntIntHashMap(recordCount);
+        getBytes(indexToOffset(0), btree.buffer, 0, btree.pageSize - btree.metaDataLeafPageLength);
+        int[] keys = new int[recordCount];
+        int keyNumber = 0;
+        
+        for(int i = 0; i < btree.hashPageCapacity; ++i) {
+          if (hashGetState(i) == HASH_FULL) {
+            int key = Bits.getInt(btree.buffer, i * INTERIOR_SIZE + KEY_OFFSET);
+            keys[keyNumber++] = key;
+            map.put(key, Bits.getInt(btree.buffer, i * INTERIOR_SIZE));
+            hashSetState(i, HASH_FREE);
+          }
         }
-      }
 
-      if (indexLeaf) {
-        medianKey = newIndexNode.keyAt(0);
+        setChildrenCount((short)0);
+        newIndexNode.setChildrenCount((short)0);
+
+        Arrays.sort(keys);
+        final int avg = keys.length / 2;
+        medianKey = keys[avg];
+        
+        for(int i = 0; i < avg; ++i) {
+          insert(keys[i], map.get(keys[i]));
+          newIndexNode.insert(keys[avg + i], map.get(keys[avg + i]));
+        }
       } else {
-        newIndexNode.setAddressAt(recordCountInNewNode, addressAt(recordCount));
-        --maxIndex;
-        medianKey = keyAt(maxIndex);     // key count is odd (since children count is even) and middle key goes to parent
+        short recordCountInNewNode = (short)(recordCount - maxIndex);
+        newIndexNode.setChildrenCount(recordCountInNewNode);
+        
+        if (btree.isLarge) {
+          final int bytesToMove = recordCountInNewNode * INTERIOR_SIZE;
+          getBytes(indexToOffset(maxIndex), btree.buffer, 0, bytesToMove);
+          newIndexNode.putBytes(newIndexNode.indexToOffset(0), btree.buffer, 0, bytesToMove);
+        } else {
+          for(int i = 0; i < recordCountInNewNode; ++i) {
+            newIndexNode.setAddressAt(i, addressAt(i + maxIndex));
+            newIndexNode.setKeyAt(i, keyAt(i + maxIndex));
+          }
+        }
+        if (indexLeaf) {
+          medianKey = newIndexNode.keyAt(0);
+        } else {
+          newIndexNode.setAddressAt(recordCountInNewNode, addressAt(recordCount));
+          --maxIndex;
+          medianKey = keyAt(maxIndex);     // key count is odd (since children count is even) and middle key goes to parent
+        }
+        setChildrenCount(maxIndex);
       }
 
-      setChildrenCount(maxIndex);
-
       if (parent != null) {
         if (doSanityCheck) {
           int medianKeyInParent = parent.search(medianKey);
@@ -451,7 +564,7 @@ private boolean doOffloadToSiblings(BtreeIndexNodeView parent) {
             parent.dump(""parent before"");
           }
 
-          sibling.insert(keyAt(0), addressAt(0), sibling.getChildrenCount());
+          sibling.insert(keyAt(0), addressAt(0));
           if (doSanityCheck) {
             sibling.dump(""Left sibling after"");
           }
@@ -508,7 +621,7 @@ private void insertToRightSibling(BtreeIndexNodeView parent, int indexInParent,
         }
 
         int lastChildIndex = getChildrenCount() - 1;
-        sibling.insert(keyAt(lastChildIndex), addressAt(lastChildIndex), 0);
+        sibling.insert(keyAt(lastChildIndex), addressAt(lastChildIndex));
         if (doSanityCheck) {
           sibling.dump(""Right sibling after"");
         }
@@ -562,26 +675,42 @@ private int locate(int valueHC, boolean split) {
     }
 
     private void insert(int valueHC, int newValueId) {
-      int medianKeyInParent = search(valueHC);
-      myAssert(medianKeyInParent < 0);
-      insert(valueHC, newValueId, -medianKeyInParent - 1);
-    }
-
-    private void insert(int valueHC, int newValueId, int index) {
       if (doSanityCheck) myAssert(!isFull());
-      insertToNotFull(valueHC, newValueId, index);
-    }
-
-    private void insertToNotFull(int valueHC, int newValueId, int index) {
       short recordCount = getChildrenCount();
       if (doSanityCheck) myAssert(recordCount < getMaxChildrenCount());
+
+      final boolean indexLeaf = isIndexLeaf();
+
+      if (indexLeaf) {
+        if (recordCount == 0 && btree.indexNodeIsHashTable) {
+          setHashedLeaf(true);
+        }
+
+        if (isHashedLeaf()) {
+          int index = hashInsertionIndex(valueHC);
+
+          if (index < 0) {
+            index = -index - 1;
+          }
+
+          setKeyAt(index, valueHC);
+          hashSetState(index, HASH_FULL);
+          setAddressAt(index, newValueId);
+          setChildrenCount((short)(recordCount + 1));
+          sync();
+          return;
+        }
+      }
+
+      int medianKeyInParent = search(valueHC);
+      if (doSanityCheck) myAssert(medianKeyInParent < 0);
+      int index = -medianKeyInParent - 1;
       setChildrenCount((short)(recordCount + 1));
 
       final int itemsToMove = recordCount - index;
       btree.movedMembersCount += itemsToMove;
 
-      // TODO Clever books tell us to use Btree for cheaper elements shifting within page
-      if (isIndexLeaf()) {
+      if (indexLeaf) {
         if (btree.isLarge && itemsToMove > LARGE_MOVE_THRESHOLD) {
           final int bytesToMove = itemsToMove * INTERIOR_SIZE;
           getBytes(indexToOffset(index), btree.buffer, 0, bytesToMove);
@@ -625,5 +754,151 @@ private void insertToNotFull(int valueHC, int newValueId, int index) {
 
       sync();
     }
+
+    private int hashIndex(int value) {
+      int hash, probe, index;
+
+      final int length = btree.hashPageCapacity;
+      hash = hash(value) & 0x7fffffff;
+      index = hash % length;
+      int state = hashGetState(index);
+      int total = 0;
+
+      btree.hashSearchRequests++;
+
+      if (state != HASH_FREE &&
+          (state == HASH_REMOVED || keyAt(index) != value)) {
+        // see Knuth, p. 529
+        probe = 1 + (hash % (length - 2));
+
+        do {
+          index -= probe;
+          if (index < 0) {
+            index += length;
+          }
+          state = hashGetState(index);
+          ++total;
+        }
+        while (state != HASH_FREE &&
+               (state == HASH_REMOVED || keyAt(index) != value));
+      }
+
+      btree.maxStepsSearchedInHash = Math.max(btree.maxStepsSearchedInHash, total);
+      btree.totalHashStepsSearched += total;
+
+      return state == HASH_FREE ? -1 : index;
+    }
+
+    protected int hashInsertionIndex(int val) {
+      int hash, probe, index;
+
+      final int length = btree.hashPageCapacity;
+      hash = hash(val) & 0x7fffffff;
+      index = hash % length;
+      btree.hashSearchRequests++;
+
+      int state = hashGetState(index);
+      if (state == HASH_FREE) {
+        return index;       // empty, all done
+      }
+      else if (state == HASH_FULL && keyAt(index) == val) {
+        return -index - 1;   // already stored
+      }
+      else {                // already FULL or REMOVED, must probe
+        // compute the double hash
+        probe = 1 + (hash % (length - 2));
+        int total = 0;
+
+        // starting at the natural offset, probe until we find an
+        // offset that isn't full.
+        do {
+          index -= probe;
+          if (index < 0) {
+            index += length;
+          }
+
+          ++total;
+          state = hashGetState(index);
+        }
+        while (state == HASH_FULL && keyAt(index) != val);
+
+        // if the index we found was removed: continue probing until we
+        // locate a free location or an element which equal()s the
+        // one we have.
+        if (state == HASH_REMOVED) {
+          int firstRemoved = index;
+          while (state != HASH_FREE &&
+                 (state == HASH_REMOVED || keyAt(index) != val)) {
+            index -= probe;
+            if (index < 0) {
+              index += length;
+            }
+            state = hashGetState(index);
+            ++total;
+          }
+          return state == HASH_FULL ? -index - 1 : firstRemoved;
+        }
+
+        btree.maxStepsSearchedInHash = Math.max(btree.maxStepsSearchedInHash, total);
+        btree.totalHashStepsSearched += total;
+
+        // if it's full, the key is already stored
+        return state == HASH_FULL ? -index - 1 : index;
+      }
+    }
+
+    private final int hash(int val) {
+      return val * 0x278DDE6D;
+    }
+
+    static final int STATE_MASK = 0x3;
+    static final int STATE_MASK_WITHOUT_DELETE = 0x1;
+    
+    private final int hashGetState(int index) {
+      byte b = btree.storage.get(hashOccupiedStatusByteOffset(index));
+      if (haveDeleteState) {
+        return ((b & 0xFF) >> hashOccupiedStatusShift(index)) & STATE_MASK;
+      } else {
+        return ((b & 0xFF) >> hashOccupiedStatusShift(index)) & STATE_MASK_WITHOUT_DELETE;
+      }
+    }
+
+    private final int hashOccupiedStatusShift(int index) {
+      if (haveDeleteState) {
+        return 6 - ((index & 0x3) << 1);
+      } else {
+        return 7 - (index & 0x7);
+      }
+    }
+
+    private final int hashOccupiedStatusByteOffset(int index) {
+      if (haveDeleteState) {
+        return address + BtreePage.RESERVED_META_PAGE_LEN + (index >> 2);
+      } else {
+        return address + BtreePage.RESERVED_META_PAGE_LEN + (index >> 3);
+      }
+    }
+
+    private static final boolean haveDeleteState = false;
+
+    private void hashSetState(int index, int value) {
+      if (doSanityCheck) {
+        if (haveDeleteState) myAssert(value >= HASH_FREE && value <= HASH_REMOVED);
+        else myAssert(value >= HASH_FREE && value < HASH_REMOVED);
+      }
+
+      int hashOccupiedStatusOffset = hashOccupiedStatusByteOffset(index);
+      byte b = btree.storage.get(hashOccupiedStatusOffset);
+      int shift = hashOccupiedStatusShift(index);
+
+      if (haveDeleteState) {
+        b = (byte)(((b & 0xFF) & ~(STATE_MASK << shift)) | (value << shift));
+      } else {
+        b = (byte)(((b & 0xFF) & ~(STATE_MASK_WITHOUT_DELETE << shift)) | (value << shift));
+      }
+      btree.storage.put(hashOccupiedStatusOffset, b);
+
+      if (doSanityCheck) myAssert(hashGetState(index) == value);
+    }
   }
 }
diff --git a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
index 8421f284b49d2..30f4a58734edf 100644
--- a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
+++ b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
@@ -27,7 +27,7 @@
 public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Data> {
   private static final Logger LOG = Logger.getInstance(""#com.intellij.util.io.PersistentEnumerator"");
   protected static final int NULL_ID = 0;
-  private static final int PAGE_SIZE = IntToIntBtree.doSanityCheck ? 64:2048;
+  private static final int PAGE_SIZE = /*IntToIntBtree.doSanityCheck ? 64:*/2048;
   private static final int RECORD_SIZE = 4;
   private final byte[] myBuffer;
 
@@ -101,13 +101,19 @@ private void storeVars(boolean toDisk) {
 
   private void storeBTreeVars(boolean toDisk) {
     if (btree != null) {
-      btree.setMaxStepsSearched(store(DATA_START + 36, btree.getMaxStepsSearched(), toDisk));
-      btree.setPagesCount(store(DATA_START + 40, btree.getPageCount(), toDisk));
-      btree.setMovedMembersCount(store(DATA_START + 44, btree.getMovedMembersCount(), toDisk));
+      final int BTREE_DATA_START = DATA_START + 36;
+      btree.persistVars(new IntToIntBtree.BtreeDataStorage() {
+        @Override
+        public int persistInt(int offset, int value, boolean toDisk) {
+          return store(BTREE_DATA_START + offset, value, toDisk);
+        }
+      }, toDisk);
     }
   }
 
   private int store(int offset, int value, boolean toDisk) {
+    assert offset + 4 < PAGE_SIZE;
+
     if (toDisk) {
       myStorage.putInt(offset, value);
     } else {
@@ -170,9 +176,8 @@ public boolean traverseAllRecords(RecordsProcessor p) throws IOException {
         collectLeafPages(btree.root, leafPages);
 
         out:
-        for(IntToIntBtree.BtreeIndexNodeView value:leafPages) {
-          for(int i = 0; i < value.getChildrenCount(); ++i) {
-            int key = value.keyAt(i);
+        for(IntToIntBtree.BtreeIndexNodeView page:leafPages) {
+          for(int key:page.exportKeys()) {
             Integer record = btree.get(key);
             p.setCurrentKey(key);
             assert record != null;
@@ -277,7 +282,7 @@ protected int enumerateImpl(final Data value, final boolean saveNewValue) throws
       int newValueId = writeData(value, valueHC);
       ++valuesCount;
 
-      if (valuesCount % 10000 == 0 && IOStatistics.DEBUG) {
+      if (valuesCount % 20000 == 0 && IOStatistics.DEBUG) {
         IOStatistics.dump(""Index "" +
                           myFile +
                           "", values "" +
diff --git a/platform/util/src/com/intellij/util/io/PersistentEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentEnumerator.java
index e8cc6cd927524..d6ed9b8f43fbe 100644
--- a/platform/util/src/com/intellij/util/io/PersistentEnumerator.java
+++ b/platform/util/src/com/intellij/util/io/PersistentEnumerator.java
@@ -182,7 +182,7 @@ protected int writeData(final Data value, int hashCode) {
     int id = super.writeData(value, hashCode);
     ++valuesCount;
 
-    if (valuesCount % 10000 == 0 && IOStatistics.DEBUG) {
+    if (valuesCount % 20000 == 0 && IOStatistics.DEBUG) {
       IOStatistics.dump(""Index "" + myFile + "", values "" + valuesCount + "", storage size:"" + myStorage.length());
     }
     return id;"
610fa618aae58af50c12ee8d0c29d12b7460fd8a,spring-framework,SPR-9056 Make DelegatingWebMvcConfiguration- config callbacks not final--It should be possible to progress from extending-WebMvcConfigurerAdapter (w/ @EnableWebMvc) to extending-WebMvcConfigurationSupport directly,a,https://github.com/spring-projects/spring-framework,"diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
index 5571532ed7dd..68d2043269b4 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
@@ -51,52 +51,52 @@ public void setConfigurers(List<WebMvcConfigurer> configurers) {
 	}
 
 	@Override
-	protected final void addInterceptors(InterceptorRegistry registry) {
+	protected void addInterceptors(InterceptorRegistry registry) {
 		configurers.addInterceptors(registry);
 	}
 
 	@Override
-	protected final void addViewControllers(ViewControllerRegistry registry) {
+	protected void addViewControllers(ViewControllerRegistry registry) {
 		configurers.addViewControllers(registry);
 	}
 
 	@Override
-	protected final void addResourceHandlers(ResourceHandlerRegistry registry) {
+	protected void addResourceHandlers(ResourceHandlerRegistry registry) {
 		configurers.addResourceHandlers(registry);
 	}
 
 	@Override
-	protected final void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+	protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
 		configurers.configureDefaultServletHandling(configurer);
 	}
 	
 	@Override
-	protected final void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+	protected void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
 		configurers.addArgumentResolvers(argumentResolvers);
 	}
 
 	@Override
-	protected final void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
+	protected void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
 		configurers.addReturnValueHandlers(returnValueHandlers);
 	}
 
 	@Override
-	protected final void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+	protected void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
 		configurers.configureMessageConverters(converters);
 	}
 
 	@Override
-	protected final void addFormatters(FormatterRegistry registry) {
+	protected void addFormatters(FormatterRegistry registry) {
 		configurers.addFormatters(registry);
 	}
 
 	@Override
-	protected final Validator getValidator() {
+	protected Validator getValidator() {
 		return configurers.getValidator();
 	}
 
 	@Override
-	protected final void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
+	protected void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
 		configurers.configureHandlerExceptionResolvers(exceptionResolvers);
 	}"
e106a9c058ec31a3048be99359aa35f1dfb16d69,aeshell$aesh,"further completion support
",a,https://github.com/aeshell/aesh,"diff --git a/src/main/java/Example.java b/src/main/java/Example.java
index 175af4841..88866babd 100644
--- a/src/main/java/Example.java
+++ b/src/main/java/Example.java
@@ -1,7 +1,10 @@
+import org.jboss.jreadline.complete.Completion;
 import org.jboss.jreadline.console.Console;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author <a href=""mailto:stale.pedersen@jboss.org"">Ståle W. Pedersen</a>
@@ -15,6 +18,20 @@ public static void main(String[] args) throws IOException {
 
         PrintWriter out = new PrintWriter(System.out);
 
+        Completion completer = new Completion() {
+            @Override
+            public List<String> complete(String line, int cursor) {
+                // very simple completor
+                List<String> commands = new ArrayList<String>();
+                if(line.length() < 1 || line.startsWith(""f"") || line.startsWith(""fo""))
+                    commands.add(""foo"");
+
+                return commands;
+            }
+        };
+
+        console.addCompletion(completer);
+
         String line;
         while ((line = console.read(""> "")) != null) {
             console.pushToConsole(""======>\"""" + line + ""\n"");
diff --git a/src/main/java/org/jboss/jreadline/console/Console.java b/src/main/java/org/jboss/jreadline/console/Console.java
index 0aa5815d0..f8e01f292 100644
--- a/src/main/java/org/jboss/jreadline/console/Console.java
+++ b/src/main/java/org/jboss/jreadline/console/Console.java
@@ -266,7 +266,7 @@ else if(action == Action.CASE) {
                 changeCase();
             }
             else if(action == Action.COMPLETE) {
-                //complete();
+                complete();
             }
             else if(action == Action.EXIT) {
                 //deleteCurrentCharacter();
@@ -544,7 +544,7 @@ private boolean undo() throws IOException {
             return false;
     }
 
-    private void complete() {
+    private void complete() throws IOException {
         if(completionList.size() < 1)
             return;
 
@@ -560,21 +560,45 @@ private void complete() {
             return;
         // only one hit, do a completion
         else if(possibleCompletions.size() == 1)
-            doCompletion(possibleCompletions.get(0));
+            displayCompletion(possibleCompletions.get(0));
         // more than one hit...
         else {
-           //TODO: implement this
+            String startsWith = buffer.findStartsWith(possibleCompletions);
+            if(startsWith.length() > 0)
+                displayCompletion(startsWith);
+            else {
+                displayCompletions(possibleCompletions);
+            }
         }
 
     }
 
     /**
      * TODO: insert the completion into the buffer
+     * 1. go back a word
+     * 2. insert the word
      *
      * @param completion
+     * @throws java.io.IOException stream
      */
-    private void doCompletion(String completion) {
+    private void displayCompletion(String completion) throws IOException {
+        performAction(new PrevWordAction(buffer.getCursor(), Action.DELETE));
+        buffer.write(completion);
+        outStream.write(completion);
 
+        redrawLineFromCursor();
     }
 
+    private void displayCompletions(List<String> possibleCompletions) {
+        if(possibleCompletions.size() > 50) {
+            // display ask...
+        }
+        // display all
+        else {
+
+        }
+
+    }
+
+
 }"
906c7a7d7f8b0b325111b4cfb5748904bce7074b,tapiji,"Adapts the namespace of all TapiJI plug-ins to org.eclipselabs.tapiji.*.
",p,https://github.com/tapiji/tapiji,"diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/.classpath b/org.eclipselabs.tapiji.tools.core/.classpath
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/.classpath
rename to org.eclipselabs.tapiji.tools.core/.classpath
diff --git a/at.ac.tuwien.inso.eclipse.i18n/.project b/org.eclipselabs.tapiji.tools.core/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/.project
rename to org.eclipselabs.tapiji.tools.core/.project
diff --git a/at.ac.tuwien.inso.eclipse.i18n/.settings/org.eclipse.jdt.core.prefs b/org.eclipselabs.tapiji.tools.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipselabs.tapiji.tools.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/at.ac.tuwien.inso.eclipse.i18n/.settings/org.eclipse.pde.core.prefs b/org.eclipselabs.tapiji.tools.core/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/.settings/org.eclipse.pde.core.prefs
rename to org.eclipselabs.tapiji.tools.core/.settings/org.eclipse.pde.core.prefs
diff --git a/at.ac.tuwien.inso.eclipse.i18n/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.core/META-INF/MANIFEST.MF
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/META-INF/MANIFEST.MF
rename to org.eclipselabs.tapiji.tools.core/META-INF/MANIFEST.MF
diff --git a/at.ac.tuwien.inso.eclipse.i18n/Splash.bmp b/org.eclipselabs.tapiji.tools.core/Splash.bmp
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/Splash.bmp
rename to org.eclipselabs.tapiji.tools.core/Splash.bmp
diff --git a/at.ac.tuwien.inso.eclipse.i18n/TapiJI.png b/org.eclipselabs.tapiji.tools.core/TapiJI.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/TapiJI.png
rename to org.eclipselabs.tapiji.tools.core/TapiJI.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/about.html b/org.eclipselabs.tapiji.tools.core/about.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/about.html
rename to org.eclipselabs.tapiji.tools.core/about.html
diff --git a/at.ac.tuwien.inso.eclipse.i18n/about.ini b/org.eclipselabs.tapiji.tools.core/about.ini
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/about.ini
rename to org.eclipselabs.tapiji.tools.core/about.ini
diff --git a/at.ac.tuwien.inso.eclipse.i18n/about.mappings b/org.eclipselabs.tapiji.tools.core/about.mappings
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/about.mappings
rename to org.eclipselabs.tapiji.tools.core/about.mappings
diff --git a/at.ac.tuwien.inso.eclipse.i18n/about.properties b/org.eclipselabs.tapiji.tools.core/about.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/about.properties
rename to org.eclipselabs.tapiji.tools.core/about.properties
diff --git a/at.ac.tuwien.inso.eclipse.i18n/build.properties b/org.eclipselabs.tapiji.tools.core/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/build.properties
rename to org.eclipselabs.tapiji.tools.core/build.properties
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/epl-v10.html b/org.eclipselabs.tapiji.tools.core/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/epl-v10.html
rename to org.eclipselabs.tapiji.tools.core/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/Folder.png b/org.eclipselabs.tapiji.tools.core/icons/Folder.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/Folder.png
rename to org.eclipselabs.tapiji.tools.core/icons/Folder.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/Glossary.psd b/org.eclipselabs.tapiji.tools.core/icons/Glossary.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/Glossary.psd
rename to org.eclipselabs.tapiji.tools.core/icons/Glossary.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/NewGlossary.png b/org.eclipselabs.tapiji.tools.core/icons/NewGlossary.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/NewGlossary.png
rename to org.eclipselabs.tapiji.tools.core/icons/NewGlossary.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary.png b/org.eclipselabs.tapiji.tools.core/icons/OpenGlossary.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary.png
rename to org.eclipselabs.tapiji.tools.core/icons/OpenGlossary.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary2.png b/org.eclipselabs.tapiji.tools.core/icons/OpenGlossary2.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary2.png
rename to org.eclipselabs.tapiji.tools.core/icons/OpenGlossary2.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary3.png b/org.eclipselabs.tapiji.tools.core/icons/OpenGlossary3.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary3.png
rename to org.eclipselabs.tapiji.tools.core/icons/OpenGlossary3.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary4.png b/org.eclipselabs.tapiji.tools.core/icons/OpenGlossary4.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary4.png
rename to org.eclipselabs.tapiji.tools.core/icons/OpenGlossary4.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary5.png b/org.eclipselabs.tapiji.tools.core/icons/OpenGlossary5.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/OpenGlossary5.png
rename to org.eclipselabs.tapiji.tools.core/icons/OpenGlossary5.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/Resource16.png b/org.eclipselabs.tapiji.tools.core/icons/Resource16.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/Resource16.png
rename to org.eclipselabs.tapiji.tools.core/icons/Resource16.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/Resource16_small.png b/org.eclipselabs.tapiji.tools.core/icons/Resource16_small.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/Resource16_small.png
rename to org.eclipselabs.tapiji.tools.core/icons/Resource16_small.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/Resource16_warning_small.png b/org.eclipselabs.tapiji.tools.core/icons/Resource16_warning_small.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/Resource16_warning_small.png
rename to org.eclipselabs.tapiji.tools.core/icons/Resource16_warning_small.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI.png b/org.eclipselabs.tapiji.tools.core/icons/TapiJI.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI.png
rename to org.eclipselabs.tapiji.tools.core/icons/TapiJI.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_128.png b/org.eclipselabs.tapiji.tools.core/icons/TapiJI_128.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_128.png
rename to org.eclipselabs.tapiji.tools.core/icons/TapiJI_128.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_16.png b/org.eclipselabs.tapiji.tools.core/icons/TapiJI_16.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_16.png
rename to org.eclipselabs.tapiji.tools.core/icons/TapiJI_16.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_32.png b/org.eclipselabs.tapiji.tools.core/icons/TapiJI_32.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_32.png
rename to org.eclipselabs.tapiji.tools.core/icons/TapiJI_32.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_48.png b/org.eclipselabs.tapiji.tools.core/icons/TapiJI_48.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_48.png
rename to org.eclipselabs.tapiji.tools.core/icons/TapiJI_48.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_64.png b/org.eclipselabs.tapiji.tools.core/icons/TapiJI_64.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/TapiJI_64.png
rename to org.eclipselabs.tapiji.tools.core/icons/TapiJI_64.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/.cvsignore b/org.eclipselabs.tapiji.tools.core/icons/countries/.cvsignore
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/.cvsignore
rename to org.eclipselabs.tapiji.tools.core/icons/countries/.cvsignore
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/__.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/__.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/__.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/__.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/_f.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/_f.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/_f.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/_f.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ad.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ad.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ad.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ad.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ae.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ae.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ae.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ae.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/af.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/af.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/af.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/af.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ag.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ag.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ag.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ag.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/al.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/al.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/al.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/al.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/am.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/am.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/am.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/am.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ao.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ao.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ao.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ao.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/aq.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/aq.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/aq.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/aq.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ar.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ar.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ar.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ar.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/at.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/at.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/at.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/at.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/au.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/au.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/au.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/au.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/az.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/az.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/az.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/az.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ba.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ba.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ba.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ba.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/be.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/be.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/be.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/be.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bf.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bf.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bf.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bf.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bi.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bi.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bi.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bi.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/blank.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/blank.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/blank.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/blank.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bo.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bo.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bo.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bo.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/br.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/br.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/br.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/br.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bs.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bs.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bs.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bs.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/by.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/by.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/by.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/by.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/bz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/bz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/bz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/bz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ca.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ca.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ca.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ca.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cf.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cf.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cf.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cf.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ch.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ch.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ch.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ch.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ci.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ci.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ci.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ci.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/co.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/co.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/co.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/co.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cs.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cs.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cs.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cs.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/cz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/cz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/cz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/cz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/dd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/dd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/dd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/dd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/de.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/de.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/de.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/de.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/dj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/dj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/dj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/dj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/dk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/dk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/dk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/dk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/dm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/dm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/dm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/dm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/do.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/do.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/do.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/do.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/dz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/dz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/dz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/dz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ec.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ec.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ec.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ec.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ee.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ee.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ee.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ee.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/eg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/eg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/eg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/eg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/eh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/eh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/eh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/eh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/er.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/er.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/er.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/er.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/es.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/es.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/es.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/es.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/et.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/et.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/et.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/et.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/eu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/eu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/eu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/eu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/fi.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/fi.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/fi.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/fi.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/fj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/fj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/fj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/fj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/fm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/fm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/fm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/fm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/fr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/fr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/fr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/fr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ga.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ga.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ga.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ga.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ge.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ge.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ge.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ge.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gq.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gq.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gq.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gq.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/gy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/gy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/gy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/gy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/hk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/hk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/hk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/hk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/hn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/hn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/hn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/hn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/hr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/hr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/hr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/hr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ht.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ht.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ht.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ht.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/hu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/hu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/hu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/hu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/id.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/id.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/id.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/id.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ie.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ie.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ie.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ie.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/il.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/il.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/il.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/il.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/in.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/in.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/in.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/in.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/iq.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/iq.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/iq.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/iq.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ir.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ir.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ir.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ir.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/is.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/is.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/is.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/is.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/it.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/it.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/it.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/it.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/jm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/jm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/jm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/jm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/jo.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/jo.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/jo.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/jo.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/jp.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/jp.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/jp.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/jp.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ke.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ke.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ke.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ke.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ki.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ki.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ki.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ki.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/km.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/km.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/km.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/km.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kp.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kp.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kp.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kp.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/kz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/kz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/kz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/kz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/la.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/la.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/la.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/la.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/li.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/li.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/li.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/li.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ls.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ls.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ls.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ls.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/lv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/lv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/lv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/lv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ly.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ly.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ly.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ly.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ma.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ma.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ma.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ma.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/md.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/md.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/md.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/md.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ml.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ml.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ml.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ml.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mx.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mx.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mx.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mx.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/my.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/my.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/my.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/my.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/mz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/mz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/mz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/mz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/na.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/na.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/na.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/na.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ne.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ne.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ne.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ne.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ng.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ng.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ng.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ng.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ni.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ni.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ni.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ni.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/nl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/nl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/nl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/nl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/no.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/no.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/no.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/no.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/np.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/np.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/np.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/np.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/nr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/nr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/nr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/nr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/nu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/nu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/nu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/nu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/nz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/nz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/nz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/nz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/om.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/om.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/om.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/om.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pa.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pa.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pa.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pa.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pe.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pe.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pe.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pe.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ph.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ph.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ph.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ph.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ps.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ps.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ps.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ps.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/pw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/pw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/pw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/pw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/py.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/py.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/py.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/py.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/qa.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/qa.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/qa.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/qa.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ro.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ro.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ro.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ro.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ru.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ru.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ru.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ru.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/rw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/rw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/rw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/rw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sa.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sa.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sa.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sa.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/se.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/se.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/se.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/se.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/si.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/si.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/si.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/si.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/__.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/__.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/__.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/__.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/_f.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/_f.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/_f.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/_f.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ad.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ad.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ad.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ad.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ae.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ae.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ae.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ae.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/af.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/af.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/af.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/af.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ag.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ag.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ag.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ag.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/al.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/al.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/al.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/al.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/am.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/am.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/am.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/am.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ao.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ao.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ao.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ao.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/aq.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/aq.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/aq.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/aq.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ar.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ar.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ar.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ar.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/at.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/at.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/at.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/at.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/au.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/au.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/au.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/au.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/az.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/az.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/az.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/az.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ba.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ba.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ba.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ba.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/be.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/be.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/be.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/be.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bf.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bf.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bf.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bf.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bi.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bi.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bi.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bi.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/blank.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/blank.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/blank.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/blank.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bo.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bo.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bo.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bo.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/br.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/br.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/br.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/br.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bs.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bs.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bs.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bs.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/by.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/by.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/by.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/by.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/bz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/bz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/bz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ca.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ca.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ca.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ca.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cf.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cf.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cf.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cf.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ch.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ch.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ch.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ch.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ci.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ci.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ci.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ci.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/co.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/co.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/co.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/co.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cs.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cs.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cs.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cs.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/cz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/cz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/cz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/dd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/dd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/de.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/de.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/de.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/de.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/dj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/dj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/dk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/dk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/dm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/dm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/do.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/do.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/do.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/do.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/dz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/dz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/dz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ec.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ec.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ec.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ec.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ee.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ee.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ee.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ee.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/eg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/eg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/eg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/eg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/eh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/eh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/eh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/eh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/er.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/er.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/er.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/er.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/es.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/es.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/es.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/es.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/et.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/et.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/et.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/et.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/eu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/eu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/eu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/eu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fi.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/fi.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fi.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/fi.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/fj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/fj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/fm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/fm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/fr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/fr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/fr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ga.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ga.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ga.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ga.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ge.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ge.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ge.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ge.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gq.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gq.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gq.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gq.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/gy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/gy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/gy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/hk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/hk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/hn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/hn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/hr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/hr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ht.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ht.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ht.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ht.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/hu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/hu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/hu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/id.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/id.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/id.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/id.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ie.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ie.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ie.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ie.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/il.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/il.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/il.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/il.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/in.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/in.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/in.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/in.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/iq.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/iq.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/iq.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/iq.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ir.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ir.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ir.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ir.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/is.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/is.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/is.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/is.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/it.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/it.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/it.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/it.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/jm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/jm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/jm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/jm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/jo.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/jo.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/jo.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/jo.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/jp.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/jp.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/jp.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/jp.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ke.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ke.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ke.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ke.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ki.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ki.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ki.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ki.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/km.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/km.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/km.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/km.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kp.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kp.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kp.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kp.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/kz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/kz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/kz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/la.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/la.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/la.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/la.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/li.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/li.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/li.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/li.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ls.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ls.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ls.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ls.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/lv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/lv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/lv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ly.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ly.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ly.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ly.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ma.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ma.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ma.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ma.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/md.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/md.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/md.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/md.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mh.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mh.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mh.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mh.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ml.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ml.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ml.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ml.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mx.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mx.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mx.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mx.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/my.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/my.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/my.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/my.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/mz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/mz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/mz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/na.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/na.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/na.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/na.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ne.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ne.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ne.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ne.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ng.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ng.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ng.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ng.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ni.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ni.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ni.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ni.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/nl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/nl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/no.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/no.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/no.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/no.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/np.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/np.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/np.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/np.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/nr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/nr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/nu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/nu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/nz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/nz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/nz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/om.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/om.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/om.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/om.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pa.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pa.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pa.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pa.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pe.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pe.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pe.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pe.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ph.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ph.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ph.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ph.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ps.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ps.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ps.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ps.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/pw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/pw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/pw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/py.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/py.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/py.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/py.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/qa.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/qa.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/qa.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/qa.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ro.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ro.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ro.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ro.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ru.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ru.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ru.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ru.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/rw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/rw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/rw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/rw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sa.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sa.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sa.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sa.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sb.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sb.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sb.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sb.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sd.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sd.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sd.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sd.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/se.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/se.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/se.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/se.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/si.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/si.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/si.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/si.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sk.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sk.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sk.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sk.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sl.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sl.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sl.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sl.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/so.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/so.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/so.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/so.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/st.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/st.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/st.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/st.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/su.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/su.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/su.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/su.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/sz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/sz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/sz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/td.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/td.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/td.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/td.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/th.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/th.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/th.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/th.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/to.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/to.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/to.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/to.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tp.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tp.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tp.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tp.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/tz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/tz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/tz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ua.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ua.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ua.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ua.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ug.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ug.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ug.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ug.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/un.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/un.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/un.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/un.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/us.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/us.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/us.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/us.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/uy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/uy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/uy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/uy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/uz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/uz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/uz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/uz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/va.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/va.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/va.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/va.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/vc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/vc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/vc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/vc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ve.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ve.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ve.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ve.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/vn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/vn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/vn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/vn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/vu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/vu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/vu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/vu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ws.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ws.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ws.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ws.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ya.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ya.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ya.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ya.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ye.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ye.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ye.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ye.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ye0.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/ye0.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/ye0.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/ye0.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/yu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/yu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/yu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/yu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/za.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/za.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/za.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/za.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/zm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/zm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/zm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/zm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/zw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/small/zw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/small/zw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/small/zw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/so.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/so.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/so.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/so.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/st.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/st.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/st.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/st.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/su.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/su.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/su.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/su.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/sz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/sz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/sz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/sz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/td.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/td.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/td.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/td.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tg.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tg.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tg.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tg.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/th.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/th.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/th.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/th.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tj.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/to.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/to.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/to.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/to.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tp.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tp.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tp.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tp.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tr.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tr.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tr.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tr.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tt.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tt.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tt.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tt.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tv.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tv.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tv.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tv.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/tz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/tz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/tz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/tz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ua.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ua.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ua.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ua.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ug.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ug.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ug.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ug.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/un.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/un.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/un.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/un.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/us.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/us.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/us.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/us.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/uy.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/uy.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/uy.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/uy.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/uz.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/uz.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/uz.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/uz.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/va.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/va.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/va.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/va.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/vc.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/vc.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/vc.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/vc.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ve.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ve.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ve.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ve.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/vn.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/vn.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/vn.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/vn.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/vu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/vu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/vu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/vu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ws.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ws.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ws.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ws.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ya.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ya.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ya.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ya.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ye.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ye.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ye.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ye.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/ye0.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/ye0.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/ye0.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/ye0.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/yu.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/yu.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/yu.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/yu.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/za.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/za.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/za.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/za.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/zm.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/zm.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/zm.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/zm.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/countries/zw.gif b/org.eclipselabs.tapiji.tools.core/icons/countries/zw.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/countries/zw.gif
rename to org.eclipselabs.tapiji.tools.core/icons/countries/zw.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/duplicate.gif b/org.eclipselabs.tapiji.tools.core/icons/duplicate.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/duplicate.gif
rename to org.eclipselabs.tapiji.tools.core/icons/duplicate.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/entry.gif b/org.eclipselabs.tapiji.tools.core/icons/entry.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/entry.gif
rename to org.eclipselabs.tapiji.tools.core/icons/entry.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/exclude.png b/org.eclipselabs.tapiji.tools.core/icons/exclude.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/exclude.png
rename to org.eclipselabs.tapiji.tools.core/icons/exclude.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/file_obj.gif b/org.eclipselabs.tapiji.tools.core/icons/file_obj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/file_obj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/file_obj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/flatLayout.gif b/org.eclipselabs.tapiji.tools.core/icons/flatLayout.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/flatLayout.gif
rename to org.eclipselabs.tapiji.tools.core/icons/flatLayout.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/fldr_obj.gif b/org.eclipselabs.tapiji.tools.core/icons/fldr_obj.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/fldr_obj.gif
rename to org.eclipselabs.tapiji.tools.core/icons/fldr_obj.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/hierarchicalLayout.gif b/org.eclipselabs.tapiji.tools.core/icons/hierarchicalLayout.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/hierarchicalLayout.gif
rename to org.eclipselabs.tapiji.tools.core/icons/hierarchicalLayout.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/icon_new_memory_view.png b/org.eclipselabs.tapiji.tools.core/icons/icon_new_memory_view.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/icon_new_memory_view.png
rename to org.eclipselabs.tapiji.tools.core/icons/icon_new_memory_view.png
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/incomplete.gif b/org.eclipselabs.tapiji.tools.core/icons/incomplete.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/incomplete.gif
rename to org.eclipselabs.tapiji.tools.core/icons/incomplete.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/int.gif b/org.eclipselabs.tapiji.tools.core/icons/int.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/int.gif
rename to org.eclipselabs.tapiji.tools.core/icons/int.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/key.gif b/org.eclipselabs.tapiji.tools.core/icons/key.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/key.gif
rename to org.eclipselabs.tapiji.tools.core/icons/key.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/keyCommented.gif b/org.eclipselabs.tapiji.tools.core/icons/keyCommented.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/keyCommented.gif
rename to org.eclipselabs.tapiji.tools.core/icons/keyCommented.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/keyNone.gif b/org.eclipselabs.tapiji.tools.core/icons/keyNone.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/keyNone.gif
rename to org.eclipselabs.tapiji.tools.core/icons/keyNone.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/newpropertiesfile.gif b/org.eclipselabs.tapiji.tools.core/icons/newpropertiesfile.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/newpropertiesfile.gif
rename to org.eclipselabs.tapiji.tools.core/icons/newpropertiesfile.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/no_int1.gif b/org.eclipselabs.tapiji.tools.core/icons/no_int1.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/no_int1.gif
rename to org.eclipselabs.tapiji.tools.core/icons/no_int1.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/no_int2.gif b/org.eclipselabs.tapiji.tools.core/icons/no_int2.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/no_int2.gif
rename to org.eclipselabs.tapiji.tools.core/icons/no_int2.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/original/entry.gif b/org.eclipselabs.tapiji.tools.core/icons/original/entry.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/original/entry.gif
rename to org.eclipselabs.tapiji.tools.core/icons/original/entry.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/original/entry.psd b/org.eclipselabs.tapiji.tools.core/icons/original/entry.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/original/entry.psd
rename to org.eclipselabs.tapiji.tools.core/icons/original/entry.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/IconResource.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/IconResource.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/IconResource.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/IconResource.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/NewGlossary.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/NewGlossary.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/NewGlossary.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/NewGlossary.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/OpenGlossary.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/OpenGlossary.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/OpenGlossary.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/OpenGlossary.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Resource16.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/Resource16.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Resource16.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/Resource16.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Resource16_small.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/Resource16_small.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Resource16_small.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/Resource16_small.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Resource16_warning_small.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/Resource16_warning_small.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Resource16_warning_small.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/Resource16_warning_small.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Splash.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/Splash.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/Splash.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/Splash.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/TJ.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/TJ.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/TJ.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/TJ.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/TapiJI.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/TapiJI.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/TapiJI.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/TapiJI.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/exclude.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/exclude.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/exclude.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/exclude.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/exclude2.psd b/org.eclipselabs.tapiji.tools.core/icons/photoshop/exclude2.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/photoshop/exclude2.psd
rename to org.eclipselabs.tapiji.tools.core/icons/photoshop/exclude2.psd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/propertiesfile.gif b/org.eclipselabs.tapiji.tools.core/icons/propertiesfile.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/propertiesfile.gif
rename to org.eclipselabs.tapiji.tools.core/icons/propertiesfile.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/read_only.gif b/org.eclipselabs.tapiji.tools.core/icons/read_only.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/read_only.gif
rename to org.eclipselabs.tapiji.tools.core/icons/read_only.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/resourcebundle.gif b/org.eclipselabs.tapiji.tools.core/icons/resourcebundle.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/resourcebundle.gif
rename to org.eclipselabs.tapiji.tools.core/icons/resourcebundle.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/sample.gif b/org.eclipselabs.tapiji.tools.core/icons/sample.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/sample.gif
rename to org.eclipselabs.tapiji.tools.core/icons/sample.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/similar.gif b/org.eclipselabs.tapiji.tools.core/icons/similar.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/similar.gif
rename to org.eclipselabs.tapiji.tools.core/icons/similar.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/toc_open.gif b/org.eclipselabs.tapiji.tools.core/icons/toc_open.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/toc_open.gif
rename to org.eclipselabs.tapiji.tools.core/icons/toc_open.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/warning.gif b/org.eclipselabs.tapiji.tools.core/icons/warning.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/warning.gif
rename to org.eclipselabs.tapiji.tools.core/icons/warning.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/icons/warningGrey.gif b/org.eclipselabs.tapiji.tools.core/icons/warningGrey.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/icons/warningGrey.gif
rename to org.eclipselabs.tapiji.tools.core/icons/warningGrey.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/plugin.xml b/org.eclipselabs.tapiji.tools.core/plugin.xml
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/plugin.xml
rename to org.eclipselabs.tapiji.tools.core/plugin.xml
diff --git a/at.ac.tuwien.inso.eclipse.i18n/schema/org.eclipselabs.tapiji.tools.core.builderExtension.exsd b/org.eclipselabs.tapiji.tools.core/schema/org.eclipselabs.tapiji.tools.core.builderExtension.exsd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/schema/org.eclipselabs.tapiji.tools.core.builderExtension.exsd
rename to org.eclipselabs.tapiji.tools.core/schema/org.eclipselabs.tapiji.tools.core.builderExtension.exsd
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/Activator.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/Activator.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/Activator.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/Activator.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/Logger.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/Logger.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/Logger.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/Logger.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/InternationalizationNature.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/InternationalizationNature.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/InternationalizationNature.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/InternationalizationNature.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/StringLiteralAuditor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/ViolationResolutionGenerator.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/ViolationResolutionGenerator.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/ViolationResolutionGenerator.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/ViolationResolutionGenerator.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/RBAuditor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/RBAuditor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/RBAuditor.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/RBAuditor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceBundleDetectionVisitor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceBundleDetectionVisitor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceBundleDetectionVisitor.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceBundleDetectionVisitor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceFinder.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceFinder.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceFinder.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/analyzer/ResourceFinder.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundle.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundle.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundle.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundle.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundleEntry.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundleEntry.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundleEntry.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/CreateResourceBundleEntry.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/IncludeResource.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/IncludeResource.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/IncludeResource.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/builder/quickfix/IncludeResource.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/extensions/I18nResourceAuditor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/extensions/I18nResourceAuditor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/extensions/I18nResourceAuditor.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/extensions/I18nResourceAuditor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/extensions/ILocation.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/extensions/ILocation.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/extensions/ILocation.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/extensions/ILocation.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/extensions/IMarkerConstants.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/extensions/IMarkerConstants.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/extensions/IMarkerConstants.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/extensions/IMarkerConstants.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/IResourceBundleChangedListener.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/IResourceBundleChangedListener.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/IResourceBundleChangedListener.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/IResourceBundleChangedListener.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/IResourceDescriptor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/IResourceDescriptor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/IResourceDescriptor.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/IResourceDescriptor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/IResourceExclusionListener.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/IResourceExclusionListener.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/IResourceExclusionListener.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/IResourceExclusionListener.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/ResourceDescriptor.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/ResourceDescriptor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/ResourceDescriptor.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/ResourceDescriptor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/SLLocation.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/SLLocation.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/SLLocation.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/SLLocation.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/exception/NoSuchResourceAuditorException.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/exception/NoSuchResourceAuditorException.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/exception/NoSuchResourceAuditorException.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/exception/NoSuchResourceAuditorException.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/exception/ResourceBundleException.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/exception/ResourceBundleException.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/exception/ResourceBundleException.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/exception/ResourceBundleException.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleChangedEvent.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleChangedEvent.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleChangedEvent.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleChangedEvent.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleDetector.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleDetector.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleDetector.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleDetector.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleManager.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleManager.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleManager.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceBundleManager.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceExclusionEvent.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceExclusionEvent.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceExclusionEvent.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/manager/ResourceExclusionEvent.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/view/MessagesViewState.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/view/MessagesViewState.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/view/MessagesViewState.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/view/MessagesViewState.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/view/SortInfo.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/view/SortInfo.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/model/view/SortInfo.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/model/view/SortInfo.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/decorators/ExcludedResource.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/decorators/ExcludedResource.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/decorators/ExcludedResource.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/decorators/ExcludedResource.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/CreateResourceBundleEntryDialog.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/CreateResourceBundleEntryDialog.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/CreateResourceBundleEntryDialog.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/CreateResourceBundleEntryDialog.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/DialogFactory.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/DialogFactory.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/DialogFactory.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/DialogFactory.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/GenerateBundleAccessorDialog.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/GenerateBundleAccessorDialog.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/GenerateBundleAccessorDialog.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/GenerateBundleAccessorDialog.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/InsertResourceBundleReferenceDialog.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/InsertResourceBundleReferenceDialog.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/InsertResourceBundleReferenceDialog.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/InsertResourceBundleReferenceDialog.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/ResourceBundleSelectionDialog.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/ResourceBundleSelectionDialog.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/ResourceBundleSelectionDialog.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/dialogs/ResourceBundleSelectionDialog.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/filters/PropertiesFileFilter.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/filters/PropertiesFileFilter.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/filters/PropertiesFileFilter.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/filters/PropertiesFileFilter.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/markers/StringLiterals.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/markers/StringLiterals.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/markers/StringLiterals.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/markers/StringLiterals.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/menus/InternationalizationMenu.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/MessagesView.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/ResourceBundleEntry.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/ResourceBundleEntry.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/ResourceBundleEntry.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/ResourceBundleEntry.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemDropTarget.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemDropTarget.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemDropTarget.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemDropTarget.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemTransfer.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemTransfer.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemTransfer.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/KeyTreeItemTransfer.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDragSource.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDragSource.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDragSource.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDragSource.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDropTarget.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDropTarget.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDropTarget.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/views/messagesview/dnd/MessagesDropTarget.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/MVTextTransfer.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/MVTextTransfer.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/MVTextTransfer.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/MVTextTransfer.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/PropertyKeySelectionTree.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/PropertyKeySelectionTree.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/PropertyKeySelectionTree.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/PropertyKeySelectionTree.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/ResourceSelector.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/ResourceSelector.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/ResourceSelector.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/ResourceSelector.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/event/ResourceSelectionEvent.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/event/ResourceSelectionEvent.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/event/ResourceSelectionEvent.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/event/ResourceSelectionEvent.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/ExactMatcher.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/ExactMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/ExactMatcher.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/ExactMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FilterInfo.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FilterInfo.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FilterInfo.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FilterInfo.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FuzzyMatcher.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FuzzyMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FuzzyMatcher.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/FuzzyMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/StringMatcher.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/StringMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/StringMatcher.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/filter/StringMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/listener/IResourceSelectionListener.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/listener/IResourceSelectionListener.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/listener/IResourceSelectionListener.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/listener/IResourceSelectionListener.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeContentProvider.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeContentProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeContentProvider.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeContentProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeLabelProvider.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeLabelProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeLabelProvider.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/KeyTreeLabelProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/LightKeyTreeLabelProvider.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/LightKeyTreeLabelProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/LightKeyTreeLabelProvider.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/LightKeyTreeLabelProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeContentProvider.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeContentProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeContentProvider.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeContentProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeLabelProvider.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeLabelProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeLabelProvider.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ResKeyTreeLabelProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ValueKeyTreeLabelProvider.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ValueKeyTreeLabelProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ValueKeyTreeLabelProvider.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/provider/ValueKeyTreeLabelProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/sorter/ValuedKeyTreeItemSorter.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/sorter/ValuedKeyTreeItemSorter.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/ui/widgets/sorter/ValuedKeyTreeItemSorter.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/ui/widgets/sorter/ValuedKeyTreeItemSorter.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/EditorUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/EditorUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/EditorUtils.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/EditorUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/FileUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FileUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/FileUtils.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FileUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/FontUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FontUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/FontUtils.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/FontUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/ImageUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/ImageUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/ImageUtils.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/ImageUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/LocaleUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/LocaleUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/LocaleUtils.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/LocaleUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/OverlayIcon.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/OverlayIcon.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/OverlayIcon.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/OverlayIcon.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/ResourceUtils.java b/org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/ResourceUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/src/org/eclipselabs/tapiji/tools/core/util/ResourceUtils.java
rename to org.eclipselabs.tapiji.tools.core/src/org/eclipselabs/tapiji/tools/core/util/ResourceUtils.java
diff --git a/at.ac.tuwien.inso.eclpise.i18n.feature/.project b/org.eclipselabs.tapiji.tools.feature/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclpise.i18n.feature/.project
rename to org.eclipselabs.tapiji.tools.feature/.project
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf.feature/build.properties b/org.eclipselabs.tapiji.tools.feature/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf.feature/build.properties
rename to org.eclipselabs.tapiji.tools.feature/build.properties
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf.feature/epl-v10.html b/org.eclipselabs.tapiji.tools.feature/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf.feature/epl-v10.html
rename to org.eclipselabs.tapiji.tools.feature/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclpise.i18n.feature/feature.xml b/org.eclipselabs.tapiji.tools.feature/feature.xml
similarity index 100%
rename from at.ac.tuwien.inso.eclpise.i18n.feature/feature.xml
rename to org.eclipselabs.tapiji.tools.feature/feature.xml
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/.classpath b/org.eclipselabs.tapiji.tools.java/.classpath
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/.classpath
rename to org.eclipselabs.tapiji.tools.java/.classpath
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/.project b/org.eclipselabs.tapiji.tools.java/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/.project
rename to org.eclipselabs.tapiji.tools.java/.project
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/.settings/org.eclipse.jdt.core.prefs b/org.eclipselabs.tapiji.tools.java/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipselabs.tapiji.tools.java/.settings/org.eclipse.jdt.core.prefs
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/META-INF/MANIFEST.MF
rename to org.eclipselabs.tapiji.tools.java/META-INF/MANIFEST.MF
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/build.properties b/org.eclipselabs.tapiji.tools.java/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/build.properties
rename to org.eclipselabs.tapiji.tools.java/build.properties
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/epl-v10.html b/org.eclipselabs.tapiji.tools.java/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/epl-v10.html
rename to org.eclipselabs.tapiji.tools.java/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/plugin.xml b/org.eclipselabs.tapiji.tools.java/plugin.xml
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/plugin.xml
rename to org.eclipselabs.tapiji.tools.java/plugin.xml
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/JavaResourceAuditor.java b/org.eclipselabs.tapiji.tools.java/src/auditor/JavaResourceAuditor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/JavaResourceAuditor.java
rename to org.eclipselabs.tapiji.tools.java/src/auditor/JavaResourceAuditor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/MethodParameterDescriptor.java b/org.eclipselabs.tapiji.tools.java/src/auditor/MethodParameterDescriptor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/MethodParameterDescriptor.java
rename to org.eclipselabs.tapiji.tools.java/src/auditor/MethodParameterDescriptor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/ResourceAuditVisitor.java b/org.eclipselabs.tapiji.tools.java/src/auditor/ResourceAuditVisitor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/ResourceAuditVisitor.java
rename to org.eclipselabs.tapiji.tools.java/src/auditor/ResourceAuditVisitor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/model/SLLocation.java b/org.eclipselabs.tapiji.tools.java/src/auditor/model/SLLocation.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/auditor/model/SLLocation.java
rename to org.eclipselabs.tapiji.tools.java/src/auditor/model/SLLocation.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ExportToResourceBundleResolution.java b/org.eclipselabs.tapiji.tools.java/src/quickfix/ExportToResourceBundleResolution.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ExportToResourceBundleResolution.java
rename to org.eclipselabs.tapiji.tools.java/src/quickfix/ExportToResourceBundleResolution.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleDefReference.java b/org.eclipselabs.tapiji.tools.java/src/quickfix/ReplaceResourceBundleDefReference.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleDefReference.java
rename to org.eclipselabs.tapiji.tools.java/src/quickfix/ReplaceResourceBundleDefReference.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleReference.java b/org.eclipselabs.tapiji.tools.java/src/quickfix/ReplaceResourceBundleReference.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/quickfix/ReplaceResourceBundleReference.java
rename to org.eclipselabs.tapiji.tools.java/src/quickfix/ReplaceResourceBundleReference.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/ConstantStringHover.java b/org.eclipselabs.tapiji.tools.java/src/ui/ConstantStringHover.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/ConstantStringHover.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/ConstantStringHover.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/MessageCompletionProposalComputer.java b/org.eclipselabs.tapiji.tools.java/src/ui/MessageCompletionProposalComputer.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/MessageCompletionProposalComputer.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/MessageCompletionProposalComputer.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java b/org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/InsertResourceBundleReferenceProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/MessageCompletionProposal.java b/org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/MessageCompletionProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/MessageCompletionProposal.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/MessageCompletionProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java b/org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/NewResourceBundleEntryProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NoActionProposal.java b/org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/NoActionProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/NoActionProposal.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/NoActionProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/Sorter.java b/org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/Sorter.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/Sorter.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/Sorter.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/ValueOfResourceBundleProposal.java b/org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/ValueOfResourceBundleProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/ui/autocompletion/ValueOfResourceBundleProposal.java
rename to org.eclipselabs.tapiji.tools.java/src/ui/autocompletion/ValueOfResourceBundleProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.java/src/util/ASTutils.java b/org.eclipselabs.tapiji.tools.java/src/util/ASTutils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.java/src/util/ASTutils.java
rename to org.eclipselabs.tapiji.tools.java/src/util/ASTutils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf.feature/.project b/org.eclipselabs.tapiji.tools.jsf.feature/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf.feature/.project
rename to org.eclipselabs.tapiji.tools.jsf.feature/.project
diff --git a/at.ac.tuwien.inso.eclpise.i18n.feature/build.properties b/org.eclipselabs.tapiji.tools.jsf.feature/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclpise.i18n.feature/build.properties
rename to org.eclipselabs.tapiji.tools.jsf.feature/build.properties
diff --git a/at.ac.tuwien.inso.eclipse.i18n/epl-v10.html b/org.eclipselabs.tapiji.tools.jsf.feature/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/epl-v10.html
rename to org.eclipselabs.tapiji.tools.jsf.feature/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf.feature/feature.xml b/org.eclipselabs.tapiji.tools.jsf.feature/feature.xml
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf.feature/feature.xml
rename to org.eclipselabs.tapiji.tools.jsf.feature/feature.xml
diff --git a/at.ac.tuwien.inso.eclipse.i18n/.classpath b/org.eclipselabs.tapiji.tools.jsf/.classpath
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n/.classpath
rename to org.eclipselabs.tapiji.tools.jsf/.classpath
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/.project b/org.eclipselabs.tapiji.tools.jsf/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/.project
rename to org.eclipselabs.tapiji.tools.jsf/.project
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/.settings/org.eclipse.jdt.core.prefs b/org.eclipselabs.tapiji.tools.jsf/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipselabs.tapiji.tools.jsf/.settings/org.eclipse.jdt.core.prefs
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/META-INF/MANIFEST.MF
rename to org.eclipselabs.tapiji.tools.jsf/META-INF/MANIFEST.MF
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/build.properties b/org.eclipselabs.tapiji.tools.jsf/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/build.properties
rename to org.eclipselabs.tapiji.tools.jsf/build.properties
diff --git a/at.ac.tuwien.inso.eclipse.rbe/epl-v10.html b/org.eclipselabs.tapiji.tools.jsf/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/epl-v10.html
rename to org.eclipselabs.tapiji.tools.jsf/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/plugin.xml b/org.eclipselabs.tapiji.tools.jsf/plugin.xml
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/plugin.xml
rename to org.eclipselabs.tapiji.tools.jsf/plugin.xml
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/auditor/JSFResourceAuditor.java b/org.eclipselabs.tapiji.tools.jsf/src/auditor/JSFResourceAuditor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/auditor/JSFResourceAuditor.java
rename to org.eclipselabs.tapiji.tools.jsf/src/auditor/JSFResourceAuditor.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/auditor/JSFResourceBundleDetector.java b/org.eclipselabs.tapiji.tools.jsf/src/auditor/JSFResourceBundleDetector.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/auditor/JSFResourceBundleDetector.java
rename to org.eclipselabs.tapiji.tools.jsf/src/auditor/JSFResourceBundleDetector.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/auditor/model/SLLocation.java b/org.eclipselabs.tapiji.tools.jsf/src/auditor/model/SLLocation.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/auditor/model/SLLocation.java
rename to org.eclipselabs.tapiji.tools.jsf/src/auditor/model/SLLocation.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/quickfix/ExportToResourceBundleResolution.java b/org.eclipselabs.tapiji.tools.jsf/src/quickfix/ExportToResourceBundleResolution.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/quickfix/ExportToResourceBundleResolution.java
rename to org.eclipselabs.tapiji.tools.jsf/src/quickfix/ExportToResourceBundleResolution.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/quickfix/ReplaceResourceBundleDefReference.java b/org.eclipselabs.tapiji.tools.jsf/src/quickfix/ReplaceResourceBundleDefReference.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/quickfix/ReplaceResourceBundleDefReference.java
rename to org.eclipselabs.tapiji.tools.jsf/src/quickfix/ReplaceResourceBundleDefReference.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/quickfix/ReplaceResourceBundleReference.java b/org.eclipselabs.tapiji.tools.jsf/src/quickfix/ReplaceResourceBundleReference.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/quickfix/ReplaceResourceBundleReference.java
rename to org.eclipselabs.tapiji.tools.jsf/src/quickfix/ReplaceResourceBundleReference.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/JSFELMessageHover.java b/org.eclipselabs.tapiji.tools.jsf/src/ui/JSFELMessageHover.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/JSFELMessageHover.java
rename to org.eclipselabs.tapiji.tools.jsf/src/ui/JSFELMessageHover.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/BundleNameProposal.java b/org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/BundleNameProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/BundleNameProposal.java
rename to org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/BundleNameProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/MessageCompletionProposal.java b/org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/MessageCompletionProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/MessageCompletionProposal.java
rename to org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/MessageCompletionProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/NewResourceBundleEntryProposal.java b/org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/NewResourceBundleEntryProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/NewResourceBundleEntryProposal.java
rename to org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/NewResourceBundleEntryProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/jsf/MessageCompletionProposal.java b/org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/jsf/MessageCompletionProposal.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/ui/autocompletion/jsf/MessageCompletionProposal.java
rename to org.eclipselabs.tapiji.tools.jsf/src/ui/autocompletion/jsf/MessageCompletionProposal.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/util/ELUtils.java b/org.eclipselabs.tapiji.tools.jsf/src/util/ELUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/util/ELUtils.java
rename to org.eclipselabs.tapiji.tools.jsf/src/util/ELUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.i18n.jsf/src/validator/JSFInternationalizationValidator.java b/org.eclipselabs.tapiji.tools.jsf/src/validator/JSFInternationalizationValidator.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.i18n.jsf/src/validator/JSFInternationalizationValidator.java
rename to org.eclipselabs.tapiji.tools.jsf/src/validator/JSFInternationalizationValidator.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/.classpath b/org.eclipselabs.tapiji.translator.rbe/.classpath
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/.classpath
rename to org.eclipselabs.tapiji.translator.rbe/.classpath
diff --git a/at.ac.tuwien.inso.eclipse.rbe/.project b/org.eclipselabs.tapiji.translator.rbe/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/.project
rename to org.eclipselabs.tapiji.translator.rbe/.project
diff --git a/at.ac.tuwien.inso.eclipse.rbe/.settings/org.eclipse.jdt.core.prefs b/org.eclipselabs.tapiji.translator.rbe/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipselabs.tapiji.translator.rbe/.settings/org.eclipse.jdt.core.prefs
diff --git a/at.ac.tuwien.inso.eclipse.rbe/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.translator.rbe/META-INF/MANIFEST.MF
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/META-INF/MANIFEST.MF
rename to org.eclipselabs.tapiji.translator.rbe/META-INF/MANIFEST.MF
diff --git a/at.ac.tuwien.inso.eclipse.rbe/build.properties b/org.eclipselabs.tapiji.translator.rbe/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/build.properties
rename to org.eclipselabs.tapiji.translator.rbe/build.properties
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/epl-v10.html b/org.eclipselabs.tapiji.translator.rbe/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/epl-v10.html
rename to org.eclipselabs.tapiji.translator.rbe/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/analyze/ILevenshteinDistanceAnalyzer.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/analyze/ILevenshteinDistanceAnalyzer.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/analyze/ILevenshteinDistanceAnalyzer.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/analyze/ILevenshteinDistanceAnalyzer.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundle.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundle.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundle.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundle.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleEntry.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleEntry.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleEntry.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleEntry.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleGroup.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleGroup.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleGroup.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/bundle/IBundleGroup.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTree.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTree.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTree.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTree.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTreeItem.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTreeItem.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTreeItem.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IKeyTreeItem.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IValuedKeyTreeItem.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IValuedKeyTreeItem.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IValuedKeyTreeItem.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/IValuedKeyTreeItem.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/updater/IKeyTreeUpdater.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/updater/IKeyTreeUpdater.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/updater/IKeyTreeUpdater.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/model/tree/updater/IKeyTreeUpdater.java
diff --git a/at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/ui/wizards/IResourceBundleWizard.java b/org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/ui/wizards/IResourceBundleWizard.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.rbe/src/org/eclipselabs/tapiji/translator/rbe/ui/wizards/IResourceBundleWizard.java
rename to org.eclipselabs.tapiji.translator.rbe/src/org/eclipselabs/tapiji/translator/rbe/ui/wizards/IResourceBundleWizard.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/.classpath b/org.eclipselabs.tapiji.translator/.classpath
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/.classpath
rename to org.eclipselabs.tapiji.translator/.classpath
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/.project b/org.eclipselabs.tapiji.translator/.project
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/.project
rename to org.eclipselabs.tapiji.translator/.project
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/.settings/org.eclipse.jdt.core.prefs b/org.eclipselabs.tapiji.translator/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipselabs.tapiji.translator/.settings/org.eclipse.jdt.core.prefs
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/META-INF/MANIFEST.MF b/org.eclipselabs.tapiji.translator/META-INF/MANIFEST.MF
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/META-INF/MANIFEST.MF
rename to org.eclipselabs.tapiji.translator/META-INF/MANIFEST.MF
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/build.properties b/org.eclipselabs.tapiji.translator/build.properties
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/build.properties
rename to org.eclipselabs.tapiji.translator/build.properties
diff --git a/at.ac.tuwien.inso.eclpise.i18n.feature/epl-v10.html b/org.eclipselabs.tapiji.translator/epl-v10.html
similarity index 100%
rename from at.ac.tuwien.inso.eclpise.i18n.feature/epl-v10.html
rename to org.eclipselabs.tapiji.translator/epl-v10.html
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/NewGlossary.png b/org.eclipselabs.tapiji.translator/icons/NewGlossary.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/NewGlossary.png
rename to org.eclipselabs.tapiji.translator/icons/NewGlossary.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/Open.png b/org.eclipselabs.tapiji.translator/icons/Open.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/Open.png
rename to org.eclipselabs.tapiji.translator/icons/Open.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary.png b/org.eclipselabs.tapiji.translator/icons/OpenGlossary.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary.png
rename to org.eclipselabs.tapiji.translator/icons/OpenGlossary.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary2.png b/org.eclipselabs.tapiji.translator/icons/OpenGlossary2.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary2.png
rename to org.eclipselabs.tapiji.translator/icons/OpenGlossary2.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary3.png b/org.eclipselabs.tapiji.translator/icons/OpenGlossary3.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary3.png
rename to org.eclipselabs.tapiji.translator/icons/OpenGlossary3.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary4.png b/org.eclipselabs.tapiji.translator/icons/OpenGlossary4.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary4.png
rename to org.eclipselabs.tapiji.translator/icons/OpenGlossary4.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary5.png b/org.eclipselabs.tapiji.translator/icons/OpenGlossary5.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/OpenGlossary5.png
rename to org.eclipselabs.tapiji.translator/icons/OpenGlossary5.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/OpenRB.png b/org.eclipselabs.tapiji.translator/icons/OpenRB.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/OpenRB.png
rename to org.eclipselabs.tapiji.translator/icons/OpenRB.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/Splash.bmp b/org.eclipselabs.tapiji.translator/icons/Splash.bmp
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/Splash.bmp
rename to org.eclipselabs.tapiji.translator/icons/Splash.bmp
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI.png b/org.eclipselabs.tapiji.translator/icons/TapiJI.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI.png
rename to org.eclipselabs.tapiji.translator/icons/TapiJI.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_128.png b/org.eclipselabs.tapiji.translator/icons/TapiJI_128.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_128.png
rename to org.eclipselabs.tapiji.translator/icons/TapiJI_128.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_16.png b/org.eclipselabs.tapiji.translator/icons/TapiJI_16.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_16.png
rename to org.eclipselabs.tapiji.translator/icons/TapiJI_16.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_32.png b/org.eclipselabs.tapiji.translator/icons/TapiJI_32.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_32.png
rename to org.eclipselabs.tapiji.translator/icons/TapiJI_32.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_48.png b/org.eclipselabs.tapiji.translator/icons/TapiJI_48.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_48.png
rename to org.eclipselabs.tapiji.translator/icons/TapiJI_48.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_64.png b/org.eclipselabs.tapiji.translator/icons/TapiJI_64.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/TapiJI_64.png
rename to org.eclipselabs.tapiji.translator/icons/TapiJI_64.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/open.gif b/org.eclipselabs.tapiji.translator/icons/open.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/open.gif
rename to org.eclipselabs.tapiji.translator/icons/open.gif
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/photoshop/OpenGlossary.png b/org.eclipselabs.tapiji.translator/icons/photoshop/OpenGlossary.png
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/photoshop/OpenGlossary.png
rename to org.eclipselabs.tapiji.translator/icons/photoshop/OpenGlossary.png
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/photoshop/OpenRB.psd b/org.eclipselabs.tapiji.translator/icons/photoshop/OpenRB.psd
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/photoshop/OpenRB.psd
rename to org.eclipselabs.tapiji.translator/icons/photoshop/OpenRB.psd
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/propertiesfile.gif b/org.eclipselabs.tapiji.translator/icons/propertiesfile.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/propertiesfile.gif
rename to org.eclipselabs.tapiji.translator/icons/propertiesfile.gif
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/resourcebundle.gif b/org.eclipselabs.tapiji.translator/icons/resourcebundle.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/resourcebundle.gif
rename to org.eclipselabs.tapiji.translator/icons/resourcebundle.gif
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/icons/sample.gif b/org.eclipselabs.tapiji.translator/icons/sample.gif
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/icons/sample.gif
rename to org.eclipselabs.tapiji.translator/icons/sample.gif
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/org.eclipselabs.tapiji.translator.product b/org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/org.eclipselabs.tapiji.translator.product
rename to org.eclipselabs.tapiji.translator/org.eclipselabs.tapiji.translator.product
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/plugin.xml b/org.eclipselabs.tapiji.translator/plugin.xml
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/plugin.xml
rename to org.eclipselabs.tapiji.translator/plugin.xml
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/splash.bmp b/org.eclipselabs.tapiji.translator/splash.bmp
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/splash.bmp
rename to org.eclipselabs.tapiji.translator/splash.bmp
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/Activator.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/Activator.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/Activator.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/Activator.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/Application.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/Application.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/Application.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/Application.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/ApplicationActionBarAdvisor.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/ApplicationActionBarAdvisor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/ApplicationActionBarAdvisor.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/ApplicationActionBarAdvisor.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchAdvisor.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchAdvisor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchAdvisor.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchAdvisor.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchWindowAdvisor.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchWindowAdvisor.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchWindowAdvisor.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/ApplicationWorkbenchWindowAdvisor.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/Perspective.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/Perspective.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/Perspective.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/Perspective.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/FileOpenAction.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/actions/NewGlossaryAction.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/NewGlossaryAction.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/actions/NewGlossaryAction.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/NewGlossaryAction.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/actions/OpenGlossaryAction.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/OpenGlossaryAction.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/actions/OpenGlossaryAction.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/actions/OpenGlossaryAction.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/core/GlossaryManager.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/core/GlossaryManager.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/core/GlossaryManager.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/core/GlossaryManager.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/core/ILoadGlossaryListener.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/core/ILoadGlossaryListener.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/core/ILoadGlossaryListener.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/core/ILoadGlossaryListener.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/core/LoadGlossaryEvent.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/core/LoadGlossaryEvent.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/core/LoadGlossaryEvent.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/core/LoadGlossaryEvent.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Glossary.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Glossary.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Glossary.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Glossary.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Info.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Info.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Info.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Info.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Term.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Term.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Term.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Term.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Translation.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Translation.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/model/Translation.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/model/Translation.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/tests/JaxBTest.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/tests/JaxBTest.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/tests/JaxBTest.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/tests/JaxBTest.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/utils/FileUtils.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/utils/FileUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/utils/FileUtils.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/utils/FileUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/utils/FontUtils.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/utils/FontUtils.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/utils/FontUtils.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/utils/FontUtils.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/GlossaryView.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/GlossaryView.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/GlossaryView.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/GlossaryView.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleContentProvider.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleContentProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleContentProvider.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleContentProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleLabelProvider.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleLabelProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleLabelProvider.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/dialog/LocaleLabelProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/menus/GlossaryEntryMenuContribution.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/menus/GlossaryEntryMenuContribution.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/menus/GlossaryEntryMenuContribution.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/menus/GlossaryEntryMenuContribution.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/GlossaryWidget.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/GlossaryWidget.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/GlossaryWidget.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/GlossaryWidget.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDragSource.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDragSource.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDragSource.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDragSource.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDropTarget.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDropTarget.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDropTarget.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/GlossaryDropTarget.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/TermTransfer.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/TermTransfer.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/TermTransfer.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/dnd/TermTransfer.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/ExactMatcher.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/ExactMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/ExactMatcher.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/ExactMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FilterInfo.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FilterInfo.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FilterInfo.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FilterInfo.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FuzzyMatcher.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FuzzyMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FuzzyMatcher.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/FuzzyMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/SelectiveMatcher.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/SelectiveMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/SelectiveMatcher.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/SelectiveMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/StringMatcher.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/StringMatcher.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/filter/StringMatcher.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/filter/StringMatcher.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/model/GlossaryViewState.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/model/GlossaryViewState.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/model/GlossaryViewState.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/model/GlossaryViewState.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryContentProvider.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryContentProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryContentProvider.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryContentProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryLabelProvider.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryLabelProvider.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryLabelProvider.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/provider/GlossaryLabelProvider.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/GlossaryEntrySorter.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/GlossaryEntrySorter.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/GlossaryEntrySorter.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/GlossaryEntrySorter.java
diff --git a/at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/SortInfo.java b/org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/SortInfo.java
similarity index 100%
rename from at.ac.tuwien.inso.eclipse.tapiji/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/SortInfo.java
rename to org.eclipselabs.tapiji.translator/src/org/eclipselabs/tapiji/translator/views/widgets/sorter/SortInfo.java"
0f92fdd8e6422d5b79c610a7fd8409d222315a49,ReactiveX-RxJava,RunAsync method for outputting multiple values--,a,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java
index e091e78a9c..4f04f5fb47 100644
--- a/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java
+++ b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java
@@ -20,10 +20,16 @@
 import java.util.concurrent.FutureTask;
 
 import rx.Observable;
+import rx.Observer;
 import rx.Scheduler;
 import rx.Scheduler.Inner;
+import rx.Subscriber;
+import rx.Subscription;
 import rx.schedulers.Schedulers;
 import rx.subjects.AsyncSubject;
+import rx.subjects.PublishSubject;
+import rx.subjects.Subject;
+import rx.subscriptions.SerialSubscription;
 import rx.util.async.operators.Functionals;
 import rx.util.async.operators.OperationDeferFuture;
 import rx.util.async.operators.OperationForEachFuture;
@@ -1711,4 +1717,54 @@ public static <R> Observable<R> fromCallable(Callable<? extends R> callable, Sch
     public static <R> Observable<R> fromRunnable(final Runnable run, final R result, Scheduler scheduler) {
         return Observable.create(OperationFromFunctionals.fromRunnable(run, result)).subscribeOn(scheduler);
     }
+    /**
+     * Runs the provided action on the given scheduler and allows propagation
+     * of multiple events to the observers of the returned StoppableObservable.
+     * The action is immediately executed and unobserved values will be lost.
+     * @param <T> the output value type
+     * @param scheduler the scheduler where the action is executed
+     * @param action the action to execute, receives an Observer where the events can be pumped
+     *               and a Subscription which lets check for cancellation condition.
+     * @return an Observable which provides a Subscription interface to cancel the action
+     */
+    public static <T> StoppableObservable<T> runAsync(Scheduler scheduler, 
+            final Action2<? super Observer<? super T>, ? super Subscription> action) {
+        return runAsync(scheduler, PublishSubject.<T>create(), action);
+    }
+    /**
+     * Runs the provided action on the given scheduler and allows propagation
+     * of multiple events to the observers of the returned StoppableObservable.
+     * The action is immediately executed and unobserved values might be lost,
+     * depending on the subject type used.
+     * @param <T> the output value of the action
+     * @param <U> the output type of the observable sequence
+     * @param scheduler the scheduler where the action is executed
+     * @param subject the subject to use to distribute values emitted by the action
+     * @param action the action to execute, receives an Observer where the events can be pumped
+     *               and a Subscription which lets check for cancellation condition.
+     * @return an Observable which provides a Subscription interface to cancel the action
+     */
+    public static <T, U> StoppableObservable<U> runAsync(Scheduler scheduler,
+            final Subject<T, U> subject, 
+            final Action2<? super Observer<? super T>, ? super Subscription> action) {
+        final SerialSubscription csub = new SerialSubscription();
+        
+        StoppableObservable<U> co = new StoppableObservable<U>(new Observable.OnSubscribe<U>() {
+            @Override
+            public void call(Subscriber<? super U> t1) {
+                subject.subscribe(t1);
+            }
+        }, csub);
+        
+        csub.set(scheduler.schedule(new Action1<Inner>() {
+            @Override
+            public void call(Inner t1) {
+                if (!csub.isUnsubscribed()) {
+                    action.call(subject, csub);
+                }
+            }
+        }));
+        
+        return co;
+    }
 }
diff --git a/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/StoppableObservable.java b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/StoppableObservable.java
new file mode 100644
index 0000000000..ebd9538ed5
--- /dev/null
+++ b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/StoppableObservable.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.util.async;
+
+import rx.Observable;
+import rx.Subscription;
+
+/**
+ * An Observable which provides a Subscription interface to signal a stop
+ * condition to an asynchronous task.
+ */
+public class StoppableObservable<T> extends Observable<T> implements Subscription {
+    private final Subscription token;
+    public StoppableObservable(Observable.OnSubscribe<T> onSubscribe, Subscription token) {
+        super(onSubscribe);
+        this.token = token;
+    }
+    
+    @Override
+    public boolean isUnsubscribed() {
+        return token.isUnsubscribed();
+    }
+    
+    @Override
+    public void unsubscribe() {
+        token.unsubscribe();
+    }
+}
diff --git a/rxjava-contrib/rxjava-async-util/src/test/java/rx/util/async/AsyncTest.java b/rxjava-contrib/rxjava-async-util/src/test/java/rx/util/async/AsyncTest.java
index d83d01b047..3146681c5f 100644
--- a/rxjava-contrib/rxjava-async-util/src/test/java/rx/util/async/AsyncTest.java
+++ b/rxjava-contrib/rxjava-async-util/src/test/java/rx/util/async/AsyncTest.java
@@ -16,8 +16,8 @@
 
 package rx.util.async;
 
+import java.util.concurrent.CountDownLatch;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -35,6 +35,7 @@
 
 import rx.Observable;
 import rx.Observer;
+import rx.Subscription;
 import rx.observers.TestObserver;
 import rx.schedulers.Schedulers;
 import rx.schedulers.TestScheduler;
@@ -818,4 +819,47 @@ public String answer(InvocationOnMock invocation) throws Throwable {
         verify(func, times(1)).call();
     }
 
+    @Test
+    public void testRunAsync() throws InterruptedException {
+        final CountDownLatch cdl = new CountDownLatch(1);
+        final CountDownLatch cdl2 = new CountDownLatch(1);
+        Action2<Observer<? super Integer>, Subscription> action = new Action2<Observer<? super Integer>, Subscription>() {
+            @Override
+            public void call(Observer<? super Integer> t1, Subscription t2) {
+                try {
+                    cdl.await();
+                } catch (InterruptedException ex) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+                for (int i = 0; i < 10 && !t2.isUnsubscribed(); i++) {
+                    t1.onNext(i);
+                }
+                t1.onCompleted();
+                cdl2.countDown();
+            }
+        };
+        
+        @SuppressWarnings(""unchecked"")
+        Observer<Object> o = mock(Observer.class);
+        InOrder inOrder = inOrder(o);
+        
+        StoppableObservable<Integer> so = Async.<Integer>runAsync(Schedulers.io(), action);
+        
+        so.subscribe(o);
+        
+        cdl.countDown();
+        
+        if (!cdl2.await(2, TimeUnit.SECONDS)) {
+            fail(""Didn't complete"");
+        }
+        
+        for (int i = 0; i < 10; i++) {
+            inOrder.verify(o).onNext(i);
+        }
+        inOrder.verify(o).onCompleted();
+        inOrder.verifyNoMoreInteractions();
+        verify(o, never()).onError(any(Throwable.class));
+        
+    }
 }"
5df2cde8e95c496ed4c61bd1df5f3a0e12e7e6e9,Delta Spike,"move properties section to the top of the pom
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 38bb6c33b..83d6a40ce 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -34,85 +34,6 @@
     <name>Apache DeltaSpike Parent</name>
     <description>Apache DeltaSpike Parent</description>
 
-    <repositories>
-        <repository>
-            <id>Apache Snapshot Repository</id>
-            <url>https://repository.apache.org/content/repositories/snapshots</url>
-        </repository>
-    </repositories>
-
-    <profiles>
-        <profile>
-            <id>JBossArchive</id>
-            <repositories>
-                <repository>
-                    <id>JBoss-Archive</id>
-                    <name>JBoss Archive</name>
-                    <url>https://repository.jboss.org/nexus/content/groups/public</url>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>JBossSnapshots</id>
-            <repositories>
-                <repository>
-                    <id>JBoss-Snapshots</id>
-                    <name>JBoss Snapshots</name>
-                    <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <id>coverage</id>
-            <!--
-             * Activate this profile to gather unit test coverage
-             * Start with:
-             * $> mvn clean install -Pcoverage
-             * The generated information will be in target/site/jacoco/index.html
-            -->
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.arquillian.extension</groupId>
-                    <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha3</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>org.jacoco.core</artifactId>
-                    <version>${jacoco.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>${jacoco.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>report</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>report</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <issueManagement>
         <system>jira</system>
         <url>https://issues.apache.org/jira/browse/DELTASPIKE</url>
@@ -176,7 +97,6 @@
         <deltaspike.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</deltaspike.osgi.import.default.version>
         <deltaspike.osgi.import.defaults>
             org.springframework.*;version=""[3,4)"",
-
         </deltaspike.osgi.import.defaults>
         <deltaspike.osgi.import.before.defaults />
         <deltaspike.osgi.import.additional />
@@ -202,6 +122,86 @@
 
     </properties>
 
+    <repositories>
+        <repository>
+            <id>Apache Snapshot Repository</id>
+            <url>https://repository.apache.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
+    <profiles>
+        <profile>
+            <id>JBossArchive</id>
+            <repositories>
+                <repository>
+                    <id>JBoss-Archive</id>
+                    <name>JBoss Archive</name>
+                    <url>https://repository.jboss.org/nexus/content/groups/public</url>
+                </repository>
+            </repositories>
+        </profile>
+        <profile>
+            <id>JBossSnapshots</id>
+            <repositories>
+                <repository>
+                    <id>JBoss-Snapshots</id>
+                    <name>JBoss Snapshots</name>
+                    <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+                </repository>
+            </repositories>
+        </profile>
+
+        <profile>
+            <id>coverage</id>
+            <!--
+             * Activate this profile to gather unit test coverage
+             * Start with:
+             * $> mvn clean install -Pcoverage
+             * The generated information will be in target/site/jacoco/index.html
+            -->
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.arquillian.extension</groupId>
+                    <artifactId>arquillian-jacoco</artifactId>
+                    <version>1.0.0.Alpha3</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>org.jacoco.core</artifactId>
+                    <version>${jacoco.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>${jacoco.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>report</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
     <modules>
         <module>code</module>
     </modules>"
a449a6993aa2850d828e87676210224b6f24d35b,tapiji,"updated licenses
",p,https://github.com/tapiji/tapiji,"diff --git a/at.ac.tuwien.inso.eclpise.i18n.feature/epl-v10.html b/at.ac.tuwien.inso.eclpise.i18n.feature/epl-v10.html
new file mode 100644
index 00000000..ed4b1966
--- /dev/null
+++ b/at.ac.tuwien.inso.eclpise.i18n.feature/epl-v10.html
@@ -0,0 +1,328 @@
+<html xmlns:o=""urn:schemas-microsoft-com:office:office""
+xmlns:w=""urn:schemas-microsoft-com:office:word""
+xmlns=""http://www.w3.org/TR/REC-html40"">
+
+<head>
+<meta http-equiv=Content-Type content=""text/html; charset=windows-1252"">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content=""Microsoft Word 9"">
+<meta name=Originator content=""Microsoft Word 9"">
+<link rel=File-List
+href=""./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"""";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:""Times New Roman"";
+	mso-fareast-font-family:""Times New Roman"";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:""Times New Roman"";
+	mso-fareast-font-family:""Times New Roman"";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:""Balloon Text"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:""Times New Roman"";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/at.ac.tuwien.inso.eclpise.i18n.feature/feature.xml b/at.ac.tuwien.inso.eclpise.i18n.feature/feature.xml
index 02e71b03..df57a461 100644
--- a/at.ac.tuwien.inso.eclpise.i18n.feature/feature.xml
+++ b/at.ac.tuwien.inso.eclpise.i18n.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <feature
-      id=""at.ac.tuwien.inso.eclpise.i18n""
+      id=""at.ac.tuwien.inso.eclpise.i18n.feature""
       label=""Internationalization Feature""
       version=""0.0.1.qualifier""
       provider-name=""Vienna University of Technology""
@@ -21,227 +21,227 @@ task and introduces additional complexity into development.
    </copyright>
 
    <license url=""http://www.eclipse.org/legal/epl-v10.html"">
-      *Eclipse Public License - v 1.0*
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
-
-*1. DEFINITIONS*
-
-&quot;Contribution&quot; means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-&apos;originates&apos; from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor&apos;s behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the Program
-under their own license agreement, and (ii) are not derivative works of
-the Program.
-
-&quot;Contributor&quot; means any person or entity that distributes the Program.
-
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-&quot;Program&quot; means the Contributions distributed in accordance with this
-Agreement.
-
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-*2. GRANT OF RIGHTS*
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent license
-under Licensed Patents to make, use, sell, offer to sell, import and
-otherwise transfer the Contribution of such Contributor, if any, in
-source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the
-Contribution is added by the Contributor, such addition of the
-Contribution causes such combination to be covered by the Licensed
-Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient&apos;s responsibility to acquire
-that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-*3. REQUIREMENTS*
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or conditions
-of title and non-infringement, and implied warranties or conditions of
-merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-*4. COMMERCIAL DISTRIBUTION*
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor&apos;s responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-*5. NO WARRANTY*
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
-ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
-OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
-A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program
-and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program
-errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-*6. DISCLAIMER OF LIABILITY*
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-*7. GENERAL*
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient&apos;s rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient&apos;s rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient&apos;s
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to distribute the Program (including
-its Contributions) under the new version. Except as expressly stated in
-Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
-to the intellectual property of any Contributor under this Agreement,
-whether expressly, by implication, estoppel or otherwise. All rights in
-the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to
-this Agreement will bring a legal action under this Agreement more than
-one year after the cause of action arose. Each party waives its rights
+      *Eclipse Public License - v 1.0*
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+*1. DEFINITIONS*
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and
+are distributed by that particular Contributor. A Contribution
+&apos;originates&apos; from a Contributor if it was added to the Program by such
+Contributor itself or anyone acting on such Contributor&apos;s behalf.
+Contributions do not include additions to the Program which: (i) are
+separate modules of software distributed in conjunction with the Program
+under their own license agreement, and (ii) are not derivative works of
+the Program.
+
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this
+Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+*2. GRANT OF RIGHTS*
+
+a) Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free copyright
+license to reproduce, prepare derivative works of, publicly display,
+publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and
+object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free patent license
+under Licensed Patents to make, use, sell, offer to sell, import and
+otherwise transfer the Contribution of such Contributor, if any, in
+source code and object code form. This patent license shall apply to the
+combination of the Contribution and the Program if, at the time the
+Contribution is added by the Contributor, such addition of the
+Contribution causes such combination to be covered by the Licensed
+Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are
+provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient&apos;s responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright
+license set forth in this Agreement.
+
+*3. REQUIREMENTS*
+
+A Contributor may choose to distribute the Program in object code form
+under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties
+and conditions, express and implied, including warranties or conditions
+of title and non-infringement, and implied warranties or conditions of
+merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and
+consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable
+manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+*4. COMMERCIAL DISTRIBUTION*
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program, the
+Contributor who includes the Program in a commercial product offering
+should do so in a manner which does not create potential liability for
+other Contributors. Therefore, if a Contributor includes the Program in
+a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the
+Program in a commercial product offering. The obligations in this
+section do not apply to any claims or Losses relating to any actual or
+alleged intellectual property infringement. In order to qualify, an
+Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial
+Contributor to control, and cooperate with the Commercial Contributor
+in, the defense and any related settlement negotiations. The Indemnified
+Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor&apos;s responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+*5. NO WARRANTY*
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
+ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
+OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
+A PARTICULAR PURPOSE. Each Recipient is solely responsible for
+determining the appropriateness of using and distributing the Program
+and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program
+errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+*6. DISCLAIMER OF LIABILITY*
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+*7. GENERAL*
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including
+a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails
+to comply with any of the material terms or conditions of this Agreement
+and does not cure such failure in a reasonable period of time after
+becoming aware of such noncompliance. If all Recipient&apos;s rights under
+this Agreement terminate, Recipient agrees to cease use and distribution
+of the Program as soon as reasonably practicable. However, Recipient&apos;s
+obligations under this Agreement and any licenses granted by Recipient
+relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and may
+only be modified in the following manner. The Agreement Steward reserves
+the right to publish new versions (including revisions) of this
+Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the
+initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is
+published, Contributor may elect to distribute the Program (including
+its Contributions) under the new version. Except as expressly stated in
+Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
+to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in
+the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to
+this Agreement will bring a legal action under this Agreement more than
+one year after the cause of action arose. Each party waives its rights
 to a jury trial in any resulting litigation.
    </license>"
381ccde48d11ef82c371789898e563233141b7ee,spring-framework,IdToEntityConverter defensively handles access to- getDeclaredMethods--Issue: SPR-11758-,c,https://github.com/spring-projects/spring-framework,"diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
index e80bd599cdfa..35f1d22350bc 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the ""License"");
  * you may not use this file except in compliance with the License.
@@ -31,20 +31,23 @@
  * Converts an entity identifier to a entity reference by calling a static finder method
  * on the target entity type.
  *
- * <p>For this converter to match, the finder method must be public, static, have the signature
+ * <p>For this converter to match, the finder method must be static, have the signature
  * {@code find[EntityName]([IdType])}, and return an instance of the desired entity type.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class IdToEntityConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public IdToEntityConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object.class));
@@ -53,7 +56,8 @@ public Set<ConvertiblePair> getConvertibleTypes() {
 	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		Method finder = getFinder(targetType.getType());
-		return finder != null && this.conversionService.canConvert(sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
+		return (finder != null &&
+				this.conversionService.canConvert(sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0])));
 	}
 
 	@Override
@@ -62,18 +66,31 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return null;
 		}
 		Method finder = getFinder(targetType.getType());
-		Object id = this.conversionService.convert(source, sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
+		Object id = this.conversionService.convert(
+				source, sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
 		return ReflectionUtils.invokeMethod(finder, source, id);
 	}
 
+
 	private Method getFinder(Class<?> entityClass) {
 		String finderMethod = ""find"" + getEntityName(entityClass);
-		Method[] methods = entityClass.getDeclaredMethods();
+		Method[] methods;
+		boolean localOnlyFiltered;
+		try {
+			methods = entityClass.getDeclaredMethods();
+			localOnlyFiltered = true;
+		}
+		catch (SecurityException ex) {
+			// Not allowed to access non-public methods...
+			// Fallback: check locally declared public methods only.
+			methods = entityClass.getMethods();
+			localOnlyFiltered = false;
+		}
 		for (Method method : methods) {
-			if (Modifier.isStatic(method.getModifiers()) && method.getParameterTypes().length == 1 && method.getReturnType().equals(entityClass)) {
-				if (method.getName().equals(finderMethod)) {
-					return method;
-				}
+			if (Modifier.isStatic(method.getModifiers()) && method.getName().equals(finderMethod) &&
+					method.getParameterTypes().length == 1 && method.getReturnType().equals(entityClass) &&
+					(localOnlyFiltered || method.getDeclaringClass().equals(entityClass))) {
+				return method;
 			}
 		}
 		return null;"
64740a5c0769d65dddc4af0dee65179b610270b0,hbase,HBASE-10556 Possible data loss due to non-handled- DroppedSnapshotException for user-triggered flush from client/shell--git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1571501 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hbase,"diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 12b810e51e22..cb31a9694d02 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -94,6 +94,7 @@
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
+import org.apache.hadoop.hbase.DroppedSnapshotException;
 import org.apache.hadoop.hbase.exceptions.FailedSanityCheckException;
 import org.apache.hadoop.hbase.exceptions.OperationConflictException;
 import org.apache.hadoop.hbase.exceptions.OutOfOrderScannerNextException;
@@ -3782,6 +3783,13 @@ public FlushRegionResponse flushRegion(final RpcController controller,
       }
       builder.setLastFlushTime(region.getLastFlushTime());
       return builder.build();
+    } catch (DroppedSnapshotException ex) {
+      // Cache flush can fail in a few places. If it fails in a critical
+      // section, we get a DroppedSnapshotException and a replay of hlog
+      // is required. Currently the only way to do this is a restart of
+      // the server.
+      abort(""Replay of HLog required. Forcing server shutdown"", ex);
+      throw new ServiceException(ex);
     } catch (IOException ie) {
       throw new ServiceException(ie);
     }"
aec021e668ad6786d20feaadf119f5407c2b3191,kotlin,Implemented better rendering for parameters with- default values in decompiler and descriptor renderer.-- -KT-1582 fixed-,p,https://github.com/JetBrains/kotlin,"diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 3d21cefaf2984..1d10cd18130c7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -79,7 +79,11 @@ public Void visitTypeParameterDescriptor(TypeParameterDescriptor descriptor, Str
 
         @Override
         public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) {
-            return super.visitVariableDescriptor(descriptor, builder);
+            super.visitVariableDescriptor(descriptor, builder);
+            if (descriptor.hasDefaultValue()) {
+                builder.append("" = ..."");
+            }
+            return null;
         }
     };
 
diff --git a/compiler/testData/renderer/GlobalFunctions.kt b/compiler/testData/renderer/GlobalFunctions.kt
index 1dcfd0b607792..21a4d40204ade 100644
--- a/compiler/testData/renderer/GlobalFunctions.kt
+++ b/compiler/testData/renderer/GlobalFunctions.kt
@@ -15,7 +15,7 @@ public fun Int.ext() : Int {}
 //internal final fun int() : jet.String defined in <module>.<root>.rendererTest
 //internal final fun int2(val ints : jet.IntArray) : jet.Int defined in <module>.<root>.rendererTest
 //value-parameter vararg val ints : jet.IntArray defined in <module>.<root>.rendererTest.int2
-//private final fun prv(val a : jet.String, val b : jet.Int) : jet.Int defined in <module>.<root>.rendererTest
+//private final fun prv(val a : jet.String, val b : jet.Int = ...) : jet.Int defined in <module>.<root>.rendererTest
 //value-parameter val a : jet.String defined in <module>.<root>.rendererTest.prv
 //value-parameter val b : jet.Int defined in <module>.<root>.rendererTest.prv
 //public final fun jet.Int.ext() : jet.Int defined in <module>.<root>.rendererTest
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
index 1b45b4b1b02c3..9a29e15afdf39 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
@@ -179,7 +179,9 @@ public int compare(DeclarationDescriptor o1, DeclarationDescriptor o2) {
 
     private void appendDescriptor(DeclarationDescriptor descriptor, String indent) {
         int startOffset = myBuilder.length();
-        myBuilder.append(DescriptorRenderer.COMPACT.render(descriptor));
+        String renderedDescriptor = DescriptorRenderer.COMPACT.render(descriptor);
+        renderedDescriptor = renderedDescriptor.replace(""= ..."", ""= "" + DECOMPILED_COMMENT);
+        myBuilder.append(renderedDescriptor);
         int endOffset = myBuilder.length();
 
         if (descriptor instanceof FunctionDescriptor || descriptor instanceof PropertyDescriptor) {
diff --git a/idea/testData/libraries/decompiled/namespace.kt b/idea/testData/libraries/decompiled/namespace.kt
index 0b9274c42a103..100819a064765 100644
--- a/idea/testData/libraries/decompiled/namespace.kt
+++ b/idea/testData/libraries/decompiled/namespace.kt
@@ -17,7 +17,7 @@ package testData.libraries
 
 [public final fun func(val a : jet.Int, val b : jet.Int) : Unit { /* compiled code */ }]
 
-[public final fun func(val a : jet.Int, val b : jet.String) : Unit { /* compiled code */ }]
+[public final fun func(val a : jet.Int, val b : jet.String = /* compiled code */) : Unit { /* compiled code */ }]
 
 [public final fun func(val str : jet.String) : Unit { /* compiled code */ }]"
063f561c851a1bfd717762d96a9d379b79bbb941,orientdb,Issue -71:- http://code.google.com/p/orient/issues/detail?id=71 Working in progress--,a,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/ORecordFactory.java b/core/src/main/java/com/orientechnologies/orient/core/record/ORecordFactory.java
index 04b8a5e9eb9..25c7793c58d 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/record/ORecordFactory.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/record/ORecordFactory.java
@@ -55,6 +55,19 @@ public static ORecordFactory instance() {
 		return instance;
 	}
 
+	public static String getRecordTypeName(final byte iRecordType) {
+		if (iRecordType == ODocument.RECORD_TYPE)
+			return ""document"";
+		else if (iRecordType == ORecordFlat.RECORD_TYPE)
+			return ""flat"";
+		else if (iRecordType == ORecordBytes.RECORD_TYPE)
+			return ""bytes"";
+		else if (iRecordType == ORecordColumn.RECORD_TYPE)
+			return ""column"";
+
+		throw new IllegalArgumentException(""Unsupported record type"" + iRecordType);
+	}
+
 	public static ORecordInternal<?> newInstance(final byte iRecordType) {
 		if (iRecordType == ODocument.RECORD_TYPE)
 			return new ODocument();
@@ -65,6 +78,6 @@ else if (iRecordType == ORecordBytes.RECORD_TYPE)
 		else if (iRecordType == ORecordColumn.RECORD_TYPE)
 			return new ORecordColumn();
 
-		throw new IllegalArgumentException(""Unsuppurted record type"" + iRecordType);
+		throw new IllegalArgumentException(""Unsupported record type"" + iRecordType);
 	}
 }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/filter/OSQLFilterItemRecordAttrib.java b/core/src/main/java/com/orientechnologies/orient/core/sql/filter/OSQLFilterItemRecordAttrib.java
new file mode 100644
index 00000000000..44dcb14617a
--- /dev/null
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/filter/OSQLFilterItemRecordAttrib.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 1999-2010 Luca Garulli (l.garulli--at--orientechnologies.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.orientechnologies.orient.core.sql.filter;
+
+import java.io.IOException;
+
+import com.orientechnologies.orient.core.command.OCommandToParse;
+import com.orientechnologies.orient.core.record.ORecordFactory;
+import com.orientechnologies.orient.core.record.ORecordInternal;
+import com.orientechnologies.orient.core.record.ORecordSchemaAware;
+
+/**
+ * Represent a special attribute of the record such as:
+ * <ul>
+ * <li>@rid, the record id</li>
+ * <li>@class, the record class if it's schema aware</li>
+ * <li>@version, the version</li>
+ * <li>@type, the type between: 'document', 'column', 'flat', 'bytes'</li>
+ * <li>@size, the size on disk in bytes
+ * </ul>
+ * 
+ * @author Luca Garulli
+ * 
+ */
+public class OSQLFilterItemRecordAttrib extends OSQLFilterItemAbstract {
+	public OSQLFilterItemRecordAttrib(final OCommandToParse iQueryToParse, final String iName) {
+		super(iQueryToParse, iName);
+	}
+
+	public Object getValue(final ORecordInternal<?> iRecord) {
+		if (name.equals(""@rid""))
+			return transformValue(iRecord.getDatabase(), iRecord.getIdentity());
+		else if (name.equals(""@version""))
+			return transformValue(iRecord.getDatabase(), iRecord.getVersion());
+		else if (name.equals(""@class"") && iRecord instanceof ORecordSchemaAware<?>)
+			return transformValue(iRecord.getDatabase(), ((ORecordSchemaAware<?>) iRecord).getClassName());
+		else if (name.equals(""@type""))
+			return transformValue(iRecord.getDatabase(), ORecordFactory.getRecordTypeName(iRecord.getRecordType()));
+		else if (name.equals(""@size"")) {
+			byte[] stream;
+			try {
+				stream = iRecord.toStream();
+				if (stream != null)
+					transformValue(iRecord.getDatabase(), stream.length);
+			} catch (IOException e) {
+			}
+		}
+
+		return null;
+	}
+}"
32510df2df13cdf6a03ead228a2b4f2c6be67b6b,drools,fix incremental compilation when updating a- kiemodule without changing the release id (for snaphots)--,c,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
index 2a670144eeb..9162fbd3ed8 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
@@ -73,7 +73,11 @@ public void updateToVersion(ReleaseId newReleaseId) {
             throw new UnsupportedOperationException( ""It is not possible to update a classpath container to a new version."" );
         }
         ReleaseId currentReleaseId = kProject.getGAV();
-        InternalKieModule currentKM = (InternalKieModule) kr.getKieModule( currentReleaseId );
+
+        // if the new and the current release are equal (a snapshot) check if there is an older version with the same releaseId
+        InternalKieModule currentKM = currentReleaseId.equals( newReleaseId ) && !currentReleaseId.equals(kr.getDefaultReleaseId()) ?
+                                      (InternalKieModule) ((KieRepositoryImpl)kr).getOldKieModule( currentReleaseId ) :
+                                      (InternalKieModule) kr.getKieModule( currentReleaseId );
         InternalKieModule newKM = (InternalKieModule) kr.getKieModule( newReleaseId );
         
         ChangeSetBuilder csb = new ChangeSetBuilder();
diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieRepositoryImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieRepositoryImpl.java
index 85ffd7a9701..50f6c5c7173 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieRepositoryImpl.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieRepositoryImpl.java
@@ -70,10 +70,13 @@ public KieModule getKieModule(ReleaseId releaseId) {
         return getKieModule(releaseId, null);
     }
 
-    public KieModule getKieModule(ReleaseId releaseId, byte[] pomXml) {
-        VersionRange versionRange = new VersionRange(releaseId.getVersion());
+    KieModule getOldKieModule(ReleaseId releaseId) {
+        KieModule kieModule = kieModuleRepo.loadOldAndRemove(releaseId);
+        return kieModule != null ? kieModule : getKieModule(releaseId);
+    }
 
-        KieModule kieModule = kieModuleRepo.load(releaseId, versionRange);
+    public KieModule getKieModule(ReleaseId releaseId, byte[] pomXml) {
+        KieModule kieModule = kieModuleRepo.load(releaseId);
         if ( kieModule == null ) {
             log.debug( ""KieModule Lookup. ReleaseId {} was not in cache, checking classpath"",
                     releaseId.toExternalForm() );
@@ -188,6 +191,7 @@ public KieModule getKieModule(Resource resource) {
 
     private static class KieModuleRepo {
         private final Map<String, TreeMap<ComparableVersion, KieModule>> kieModules = new HashMap<String, TreeMap<ComparableVersion, KieModule>>();
+        private final Map<ReleaseId, KieModule> oldKieModules = new HashMap<ReleaseId, KieModule>();
 
         void store(KieModule kieModule) {
             ReleaseId releaseId = kieModule.getReleaseId();
@@ -198,7 +202,19 @@ void store(KieModule kieModule) {
                 artifactMap = new TreeMap<ComparableVersion, KieModule>();
                 kieModules.put(ga, artifactMap);
             }
-            artifactMap.put(new ComparableVersion(releaseId.getVersion()), kieModule);
+            ComparableVersion comparableVersion = new ComparableVersion(releaseId.getVersion());
+            if (oldKieModules.get(releaseId) == null) {
+                oldKieModules.put(releaseId, artifactMap.get(comparableVersion));
+            }
+            artifactMap.put(comparableVersion, kieModule);
+        }
+
+        private KieModule loadOldAndRemove(ReleaseId releaseId) {
+            return oldKieModules.remove(releaseId);
+        }
+
+        KieModule load(ReleaseId releaseId) {
+            return load(releaseId, new VersionRange(releaseId.getVersion()));
         }
 
         KieModule load(ReleaseId releaseId, VersionRange versionRange) {"
eeae29080b4a8b4a53d3968cb21870fd841b87c9,Valadoc,"gtkdoc-importer: Allow mixed content in refsect2
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index c6b16c0eb7..f3718ceddb 100644
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -952,7 +952,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 			parse_docbook_spaces ();
 		}
 
-		this.append_block_content_not_null_all (content, parse_block_content ());
+		this.append_block_content_not_null_all (content, parse_mixed_content ());
 
 		if (!check_xml_close_tag (""refsect2"")) {
 			this.report_unexpected_token (current, ""</refsect2>"");"
1cda4eacbf8e44d03ecdfb6f16ab523306677cbc,restlet-framework-java,        - The Request-isConfidential() method has- been refactored to           be supported by Message and Response as well.- The method           Request-setConfidential() has been removed (back to- Restlet           1.0 state). Added Protocol-isConfidential() method to- support           the new implementation which rely on Request-getProtocol().-           Reported by Kevin Conaway.--,p,https://github.com/restlet/restlet-framework-java,"diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
index 3bb3740fe2..51208741e0 100644
--- a/build/tmpl/text/changes.txt
+++ b/build/tmpl/text/changes.txt
@@ -44,6 +44,12 @@ Changes log
           ""style"" attributes are required.
         - Added the ability the give a title to WadlApplication or 
           WadlResource instances. Suggested by Jérôme Bernard.
+        - The Request#isConfidential() method has been refactored to 
+          be supported by Message and Response as well. The method
+          Request#setConfidential() has been removed (back to Restlet
+          1.0 state). Added Protocol#isConfidential() method to support
+          the new implementation which rely on Request#getProtocol().
+          Reported by Kevin Conaway. 
     - Misc
         - Updated JAX-RS API to version 1.0. The implementation of the
           runtime environment is not fully finished yet. We are 
diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java
index 4239efb2cf..6d9f19d948 100644
--- a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java
+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ChildClientDispatcher.java
@@ -72,9 +72,6 @@ public void doHandle(Request request, Response response) {
         final Protocol protocol = request.getProtocol();
 
         if (protocol.equals(Protocol.RIAP)) {
-            // Consider that the request is confidential
-            request.setConfidential(true);
-
             // Let's dispatch it
             final LocalReference cr = new LocalReference(request
                     .getResourceRef());
diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java
index fc66f6e836..d81f983b14 100644
--- a/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java
+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/component/ComponentClientDispatcher.java
@@ -64,9 +64,6 @@ protected void doHandle(Request request, Response response) {
         final Protocol protocol = request.getProtocol();
 
         if (protocol.equals(Protocol.RIAP)) {
-            // Consider that the request is confidential
-            request.setConfidential(true);
-
             // Let's dispatch it
             final LocalReference cr = new LocalReference(request
                     .getResourceRef());
diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java b/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java
index ab6f7fa405..120613d7f6 100644
--- a/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java
+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/http/HttpRequest.java
@@ -103,14 +103,6 @@ public HttpRequest(Context context, HttpServerCall httpCall) {
         // Set the properties
         setMethod(Method.valueOf(httpCall.getMethod()));
 
-        if (getHttpCall().isConfidential()) {
-            setConfidential(true);
-        } else {
-            // We don't want to autocreate the security data just for this
-            // information, because that will by the default value of this
-            // property if read by someone.
-        }
-
         // Set the host reference
         final StringBuilder sb = new StringBuilder();
         sb.append(httpCall.getProtocol().getSchemeName()).append(""://"");
diff --git a/modules/org.restlet/src/org/restlet/data/Message.java b/modules/org.restlet/src/org/restlet/data/Message.java
index d5ba7847fc..72fdfcd15e 100644
--- a/modules/org.restlet/src/org/restlet/data/Message.java
+++ b/modules/org.restlet/src/org/restlet/data/Message.java
@@ -78,49 +78,50 @@ public Message(Representation entity) {
         this.saxRepresentation = null;
     }
 
-/**
-	 * Returns the modifiable map of attributes that can be used by developers
-	 * to save information relative to the message. Creates a new instance if no
-	 * one has been set. This is an easier alternative to the creation of a
-	 * wrapper instance around the whole message.<br>
-	 * <br>
-	 * 
-	 * In addition, this map is a shared space between the developer and the
-	 * connectors. In this case, it is used to exchange information that is not
-	 * uniform across all protocols and couldn't therefore be directly included
-	 * in the API. For this purpose, all attribute names starting with
-	 * ""org.restlet"" are reserved. Currently the following attributes are used:
-	 * <table>
-	 * <tr>
-	 * <th>Attribute name</th>
-	 * <th>Class name</th>
-	 * <th>Description</th>
-	 * </tr>
-	 * <tr>
-	 * <td>org.restlet.http.headers</td>
-	 * <td>org.restlet.data.Form</td>
-	 * <td>Server HTTP connectors must provide all request headers and client
-	 * HTTP connectors must provide all response headers, exactly as they were
-	 * received. In addition, developers can also use this attribute to specify
-	 * <b>non-standard</b> headers that should be added to the request or to
-	 * the response. </td>
-	 * </tr>
-	 * <tr>
-	 * <td>org.restlet.https.clientCertificates</td>
-	 * <td>List<java.security.cert.Certificate></td>
-	 * <td>For requests received via a secure connector, indicates the ordered
-	 * list of client certificates, if they are available and accessible.</td>
-	 * </tr>
-	 * </table><br>
-	 * Most of the standard HTTP headers are directly supported via the Restlet
-	 * API. Thus, adding such HTTP headers is forbidden because it could
-	 * conflict with the connector's internal behavior, limit portability or
-	 * prevent future optimizations. The other standard HTTP headers (that are
-	 * not supported) can be added as attributes via the
-	 * ""org.restlet.http.headers"" key.<br>
-	 * 
-	 * @return The modifiable attributes map.
-	 */
+    /**
+     * Returns the modifiable map of attributes that can be used by developers
+     * to save information relative to the message. Creates a new instance if no
+     * one has been set. This is an easier alternative to the creation of a
+     * wrapper instance around the whole message.<br>
+     * <br>
+     * 
+     * In addition, this map is a shared space between the developer and the
+     * connectors. In this case, it is used to exchange information that is not
+     * uniform across all protocols and couldn't therefore be directly included
+     * in the API. For this purpose, all attribute names starting with
+     * ""org.restlet"" are reserved. Currently the following attributes are used:
+     * <table>
+     * <tr>
+     * <th>Attribute name</th>
+     * <th>Class name</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td>org.restlet.http.headers</td>
+     * <td>org.restlet.data.Form</td>
+     * <td>Server HTTP connectors must provide all request headers and client
+     * HTTP connectors must provide all response headers, exactly as they were
+     * received. In addition, developers can also use this attribute to specify
+     * <b>non-standard</b> headers that should be added to the request or to the
+     * response.</td>
+     * </tr>
+     * <tr>
+     * <td>org.restlet.https.clientCertificates</td>
+     * <td>List<java.security.cert.Certificate></td>
+     * <td>For requests received via a secure connector, indicates the ordered
+     * list of client certificates, if they are available and accessible.</td>
+     * </tr>
+     * </table>
+     * <br>
+     * Most of the standard HTTP headers are directly supported via the Restlet
+     * API. Thus, adding such HTTP headers is forbidden because it could
+     * conflict with the connector's internal behavior, limit portability or
+     * prevent future optimizations. The other standard HTTP headers (that are
+     * not supported) can be added as attributes via the
+     * ""org.restlet.http.headers"" key.<br>
+     * 
+     * @return The modifiable attributes map.
+     */
     public Map<String, Object> getAttributes() {
         if (this.attributes == null) {
             this.attributes = new TreeMap<String, Object>();
@@ -234,6 +235,14 @@ public SaxRepresentation getEntityAsSax() {
         return this.saxRepresentation;
     }
 
+    /**
+     * Indicates if the message was or will be exchanged confidentially, for
+     * example via a SSL-secured connection.
+     * 
+     * @return True if the message is confidential.
+     */
+    public abstract boolean isConfidential();
+
     /**
      * Indicates if a content is available and can be sent. Several conditions
      * must be met: the content must exists and have some available data.
diff --git a/modules/org.restlet/src/org/restlet/data/Protocol.java b/modules/org.restlet/src/org/restlet/data/Protocol.java
index f21d806ff5..65669bbd3e 100644
--- a/modules/org.restlet/src/org/restlet/data/Protocol.java
+++ b/modules/org.restlet/src/org/restlet/data/Protocol.java
@@ -59,7 +59,7 @@ public final class Protocol extends Metadata {
      * @see org.restlet.data.LocalReference
      */
     public static final Protocol CLAP = new Protocol(""clap"", ""CLAP"",
-            ""Class Loader Access Protocol"", UNKNOWN_PORT);
+            ""Class Loader Access Protocol"", UNKNOWN_PORT, true);
 
     /**
      * FILE is a standard scheme to access to representations stored in the file
@@ -72,7 +72,7 @@ public final class Protocol extends Metadata {
      * @see org.restlet.data.LocalReference
      */
     public static final Protocol FILE = new Protocol(""file"", ""FILE"",
-            ""Local File System Protocol"", UNKNOWN_PORT);
+            ""Local File System Protocol"", UNKNOWN_PORT, true);
 
     /** FTP protocol. */
     public static final Protocol FTP = new Protocol(""ftp"", ""FTP"",
@@ -84,7 +84,7 @@ public final class Protocol extends Metadata {
 
     /** HTTPS protocol (via SSL socket). */
     public static final Protocol HTTPS = new Protocol(""https"", ""HTTPS"",
-            ""HyperText Transport Protocol (Secure)"", 443);
+            ""HyperText Transport Protocol (Secure)"", 443, true);
 
     /**
      * JAR (Java ARchive) is a common scheme to access to representations inside
@@ -94,7 +94,7 @@ public final class Protocol extends Metadata {
      * @see org.restlet.data.LocalReference
      */
     public static final Protocol JAR = new Protocol(""jar"", ""JAR"",
-            ""Java ARchive"", UNKNOWN_PORT);
+            ""Java ARchive"", UNKNOWN_PORT, true);
 
     /** JDBC protocol. */
     public static final Protocol JDBC = new Protocol(""jdbc"", ""JDBC"",
@@ -106,7 +106,7 @@ public final class Protocol extends Metadata {
 
     /** POPS protocol (via SSL/TLS socket).. */
     public static final Protocol POPS = new Protocol(""pops"", ""POPS"",
-            ""Post Office Protocol (Secure)"", 995);
+            ""Post Office Protocol (Secure)"", 995, true);
 
     /**
      * RIAP (Restlet Internal Access Protocol) is a custom scheme to access
@@ -120,7 +120,7 @@ public final class Protocol extends Metadata {
      * @see org.restlet.data.LocalReference
      */
     public static final Protocol RIAP = new Protocol(""riap"", ""RIAP"",
-            ""Restlet Internal Access Protocol"", UNKNOWN_PORT);
+            ""Restlet Internal Access Protocol"", UNKNOWN_PORT, true);
 
     /** SMTP protocol. */
     public static final Protocol SMTP = new Protocol(""smtp"", ""SMTP"",
@@ -135,15 +135,16 @@ public final class Protocol extends Metadata {
     @Deprecated
     public static final Protocol SMTP_STARTTLS = new Protocol(""smtp"",
             ""SMTP_STARTTLS"",
-            ""Simple Mail Transfer Protocol (starting a TLS encryption)"", 25);
+            ""Simple Mail Transfer Protocol (starting a TLS encryption)"", 25,
+            true);
 
     /** SMTPS protocol (via SSL/TLS socket). */
     public static final Protocol SMTPS = new Protocol(""smtps"", ""SMTPS"",
-            ""Simple Mail Transfer Protocol (Secure)"", 465);
+            ""Simple Mail Transfer Protocol (Secure)"", 465, true);
 
     /** Local Web Archive access protocol. */
     public static final Protocol WAR = new Protocol(""war"", ""WAR"",
-            ""Web Archive Access Protocol"", UNKNOWN_PORT);
+            ""Web Archive Access Protocol"", UNKNOWN_PORT, true);
 
     /**
      * Creates the protocol associated to a URI scheme name. If an existing
@@ -195,6 +196,9 @@ public static Protocol valueOf(final String name) {
         return result;
     }
 
+    /** The confidentiality. */
+    private volatile boolean confidential;
+
     /** The default port if known or -1. */
     private volatile int defaultPort;
 
@@ -226,9 +230,30 @@ public Protocol(final String schemeName) {
      */
     public Protocol(final String schemeName, final String name,
             final String description, int defaultPort) {
+        this(schemeName, name, description, defaultPort, false);
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param schemeName
+     *            The scheme name.
+     * @param name
+     *            The unique name.
+     * @param description
+     *            The description.
+     * @param defaultPort
+     *            The default port.
+     * @param confidential
+     *            The confidentiality.
+     */
+    public Protocol(final String schemeName, final String name,
+            final String description, int defaultPort,
+            final boolean confidential) {
         super(name, description);
         this.schemeName = schemeName;
         this.defaultPort = defaultPort;
+        this.confidential = confidential;
     }
 
     /** {@inheritDoc} */
@@ -261,4 +286,15 @@ public String getSchemeName() {
     public int hashCode() {
         return (getName() == null) ? 0 : getName().toLowerCase().hashCode();
     }
+
+    /**
+     * Indicates if the protocol guarantees the confidentially of the messages
+     * exchanged, for example via a SSL-secured connection.
+     * 
+     * @return True if the protocol is confidential.
+     */
+    public boolean isConfidential() {
+        return this.confidential;
+    }
+
 }
diff --git a/modules/org.restlet/src/org/restlet/data/Request.java b/modules/org.restlet/src/org/restlet/data/Request.java
index 9c81cbd5d5..300e05e0ab 100644
--- a/modules/org.restlet/src/org/restlet/data/Request.java
+++ b/modules/org.restlet/src/org/restlet/data/Request.java
@@ -109,9 +109,6 @@ public static Request getCurrent() {
     /** The condition data. */
     private volatile Conditions conditions;
 
-    /** Indicates if the call came over a confidential channel. */
-    private volatile boolean confidential;
-
     /** The cookies provided by the client. */
     private volatile Series<Cookie> cookies;
 
@@ -140,7 +137,6 @@ public static Request getCurrent() {
      * Constructor.
      */
     public Request() {
-        this.confidential = false;
     }
 
     /**
@@ -387,13 +383,12 @@ public Reference getRootRef() {
     }
 
     /**
-     * Indicates if the call came over a confidential channel such as an
-     * SSL-secured connection.
-     * 
-     * @return True if the call came over a confidential channel.
+     * Implemented based on the {@link Protocol#isConfidential()} method for the
+     * request's protocol returned by {@link #getProtocol()};
      */
+    @Override
     public boolean isConfidential() {
-        return this.confidential;
+        return (getProtocol() == null) ? false : getProtocol().isConfidential();
     }
 
     /**
@@ -444,17 +439,6 @@ public void setConditions(Conditions conditions) {
         this.conditions = conditions;
     }
 
-    /**
-     * Indicates if the call came over a confidential channel such as an
-     * SSL-secured connection.
-     * 
-     * @param confidential
-     *            True if the call came over a confidential channel.
-     */
-    public void setConfidential(boolean confidential) {
-        this.confidential = confidential;
-    }
-
     /**
      * Sets the cookies provided by the client.
      * 
diff --git a/modules/org.restlet/src/org/restlet/data/Response.java b/modules/org.restlet/src/org/restlet/data/Response.java
index cd34d0b5a1..b88c96c3ef 100644
--- a/modules/org.restlet/src/org/restlet/data/Response.java
+++ b/modules/org.restlet/src/org/restlet/data/Response.java
@@ -307,6 +307,11 @@ public Status getStatus() {
         return this.status;
     }
 
+    @Override
+    public boolean isConfidential() {
+        return getRequest().isConfidential();
+    }
+
     /**
      * Permanently redirects the client to a target URI. The client is expected
      * to reuse the same method for the new request.
diff --git a/modules/org.restlet/src/org/restlet/util/WrapperRequest.java b/modules/org.restlet/src/org/restlet/util/WrapperRequest.java
index 039e608531..a8c52196d0 100644
--- a/modules/org.restlet/src/org/restlet/util/WrapperRequest.java
+++ b/modules/org.restlet/src/org/restlet/util/WrapperRequest.java
@@ -315,18 +315,6 @@ public void setChallengeResponse(ChallengeResponse response) {
         getWrappedRequest().setChallengeResponse(response);
     }
 
-    /**
-     * Indicates if the call came over a confidential channel such as an
-     * SSL-secured connection.
-     * 
-     * @param confidential
-     *            True if the call came over a confidential channel.
-     */
-    @Override
-    public void setConfidential(boolean confidential) {
-        getWrappedRequest().setConfidential(confidential);
-    }
-
     /**
      * Sets the entity from a higher-level object. This object is converted to a
      * representation using the Application's converter service. If you want to
diff --git a/modules/org.restlet/src/org/restlet/util/WrapperResponse.java b/modules/org.restlet/src/org/restlet/util/WrapperResponse.java
index f75306c2c1..1fc4fdf01d 100644
--- a/modules/org.restlet/src/org/restlet/util/WrapperResponse.java
+++ b/modules/org.restlet/src/org/restlet/util/WrapperResponse.java
@@ -301,6 +301,17 @@ protected Response getWrappedResponse() {
         return this.wrappedResponse;
     }
 
+    /**
+     * Indicates if the call came over a confidential channel such as an
+     * SSL-secured connection.
+     * 
+     * @return True if the call came over a confidential channel.
+     */
+    @Override
+    public boolean isConfidential() {
+        return getWrappedResponse().isConfidential();
+    }
+
     /**
      * Indicates if a content is available and can be sent. Several conditions
      * must be met: the content must exists and have some available data."
1d54dde65fdeeba31a3a475cd13a23c2ae6cd2d4,drools,JBRULES-659: fixing the problem of multidimentional- arrays--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@9457 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-core/src/main/java/org/codehaus/jfdi/interpreter/ClassTypeResolver.java b/drools-core/src/main/java/org/codehaus/jfdi/interpreter/ClassTypeResolver.java
index 2c79505d51c..59049e2c0a3 100644
--- a/drools-core/src/main/java/org/codehaus/jfdi/interpreter/ClassTypeResolver.java
+++ b/drools-core/src/main/java/org/codehaus/jfdi/interpreter/ClassTypeResolver.java
@@ -1,283 +1,281 @@
-package org.codehaus.jfdi.interpreter;
-
-/*
- * Copyright 2005 JBoss Inc
- * 
- * Licensed under the Apache License, Version 2.0 (the ""License"");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an ""AS IS"" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class ClassTypeResolver
-    implements
-    TypeResolver {
-    private final List        imports;
-
-    private final ClassLoader classLoader;
-
-    private Map               cachedImports = new HashMap();
-
-    public ClassTypeResolver() {
-        this( Collections.EMPTY_LIST );
-    }
-
-    public ClassTypeResolver(final List imports) {
-        this( imports,
-              null );
-    }
-
-    public ClassTypeResolver(final List imports,
-                             ClassLoader classLoader) {
-        this.imports = imports;
-
-        if ( classLoader == null ) {
-            classLoader = Thread.currentThread().getContextClassLoader();
-        }
-
-        if ( classLoader == null ) {
-            classLoader = getClass().getClassLoader();
-        }
-
-        this.classLoader = classLoader;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.drools.semantics.base.Importer#getImports( Class clazz )
-     */
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.TypeResolver#getImports()
-     */
-    public List getImports() {
-        return this.imports;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.drools.semantics.base.Importer#addImports(org.drools.spi.ImportEntry)
-     */
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.TypeResolver#addImport(java.lang.String)
-     */
-    public void addImport(final String importEntry) {
-        if ( !this.imports.contains( importEntry ) ) {
-            this.imports.add( importEntry );
-        }
-    }
-
-    public Class lookupFromCache(final String className) {
-        return (Class) this.cachedImports.get( className );
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.drools.semantics.base.Importer#importClass(java.lang.ClassLoader,
-     *      java.lang.String)
-     */
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.TypeResolver#resolveType(java.lang.String)
-     */
-    public Class resolveType(String className) throws ClassNotFoundException {
-        Class clazz = null;
-        boolean isArray = false;
-
-        //is the class a primitive?
-        if ( ""boolean"".equals( className ) ) {
-            clazz = boolean.class;
-        } else if ( ""byte"".equals( className ) ) {
-            clazz = byte.class;
-        } else if ( ""short"".equals( className ) ) {
-            clazz = short.class;
-        } else if ( ""char"".equals( className ) ) {
-            clazz = char.class;
-        } else if ( ""int"".equals( className ) ) {
-            clazz = int.class;
-        } else if ( ""long"".equals( className ) ) {
-            clazz = long.class;
-        } else if ( ""float"".equals( className ) ) {
-            clazz = float.class;
-        } else if ( ""double"".equals( className ) ) {
-            clazz = double.class;
-            // Could also be a primitive array
-        } else if ( ""boolean[]"".equals( className ) ) {
-            clazz = boolean[].class;
-        } else if ( ""byte[]"".equals( className ) ) {
-            clazz = byte[].class;
-        } else if ( ""short[]"".equals( className ) ) {
-            clazz = short[].class;
-        } else if ( ""char[]"".equals( className ) ) {
-            clazz = char[].class;
-        } else if ( ""int[]"".equals( className ) ) {
-            clazz = int[].class;
-        } else if ( ""long[]"".equals( className ) ) {
-            clazz = long[].class;
-        } else if ( ""float[]"".equals( className ) ) {
-            clazz = float[].class;
-        } else if ( ""double[]"".equals( className ) ) {
-            clazz = double[].class;
-            // Could be primitive array of objects
-        } else if ( className.endsWith( ""[]"" ) ) {
-            String componentName = className.substring( 0,
-                                                        className.length() - 2 );
-            className = componentName;
-            isArray = true;
-        }
-
-        if ( clazz == null ) {
-            // Now try the package object type cache         
-            clazz = lookupFromCache( className );
-        }
-
-        // try loading className
-        if ( clazz == null ) {
-            try {
-                clazz = this.classLoader.loadClass( className );
-            } catch ( final ClassNotFoundException e ) {
-                clazz = null;
-            }
-        }
-
-        // Now try the className with each of the given imports 
-        if ( clazz == null ) {
-            final Set validClazzCandidates = new HashSet();
-
-            final Iterator it = this.imports.iterator();
-            while ( it.hasNext() ) {
-                clazz = importClass( (String) it.next(),
-                                     className );
-                if ( clazz != null ) {
-                    validClazzCandidates.add( clazz );
-                }
-            }
-
-            // If there are more than one possible resolutions, complain about
-            // the ambiguity
-            if ( validClazzCandidates.size() > 1 ) {
-                final StringBuffer sb = new StringBuffer();
-                final Iterator clazzCandIter = validClazzCandidates.iterator();
-                while ( clazzCandIter.hasNext() ) {
-                    if ( 0 != sb.length() ) {
-                        sb.append( "", "" );
-                    }
-                    sb.append( ((Class) clazzCandIter.next()).getName() );
-                }
-                throw new Error( ""Unable to find unambiguously defined class '"" + className + ""', candidates are: ["" + sb.toString() + ""]"" );
-            } else if ( validClazzCandidates.size() == 1 ) {
-                clazz = (Class) validClazzCandidates.toArray()[0];
-            } else {
-                clazz = null;
-            }
-
-        }
-
-        // Now try the java.lang package
-        if ( clazz == null ) {
-            clazz = defaultClass( className );
-        }
-
-        // If array component class was found, try to resolve the array class of it 
-        if( isArray && clazz != null ) {
-            String arrayClassName = new StringBuffer().append( ""[L"" ).append( clazz.getName() ).append( "";"" ).toString();
-            try {
-                clazz = Class.forName( arrayClassName );
-            } catch ( ClassNotFoundException e ) {
-                clazz = null;
-            }
-        }
-        
-        // We still can't find the class so throw an exception 
-        if ( clazz == null ) {
-            throw new ClassNotFoundException( ""Unable to find class '"" + className + ""'"" );
-        }
-
-        return clazz;
-    }
-
-    private Class importClass(final String importText,
-                              final String className) {
-        String qualifiedClass = null;
-        Class clazz = null;
-
-        // not python
-        if ( importText.endsWith( ""*"" ) ) {
-            qualifiedClass = importText.substring( 0,
-                                                   importText.indexOf( '*' ) ) + className;
-        } else if ( importText.endsWith( ""."" + className ) ) {
-            qualifiedClass = importText;
-        } else if ( importText.equals( className ) ) {
-            qualifiedClass = importText;
-        }
-
-        if ( qualifiedClass != null ) {
-            try {
-                clazz = this.classLoader.loadClass( qualifiedClass );
-            } catch ( final ClassNotFoundException e ) {
-                clazz = null;
-            }
-
-            // maybe its a nested class?
-            if ( clazz == null ) {
-                try {
-                    final int lastIndex = qualifiedClass.lastIndexOf( '.' );
-                    qualifiedClass = qualifiedClass.substring( 0,
-                                                               lastIndex ) + ""$"" + qualifiedClass.substring( lastIndex + 1 );
-                    clazz = this.classLoader.loadClass( qualifiedClass );
-                } catch ( final ClassNotFoundException e ) {
-                    clazz = null;
-                }
-            }
-        }
-
-        if ( clazz != null ) {
-            if ( this.cachedImports == Collections.EMPTY_MAP ) {
-                this.cachedImports = new HashMap();
-            }
-
-            this.cachedImports.put( className,
-                                    clazz );
-        }
-
-        return clazz;
-    }
-
-    private Class defaultClass(String className) {
-        String qualifiedClass = ""java.lang."" + className;
-        Class clazz = null;
-        try {
-            clazz = this.classLoader.loadClass( qualifiedClass );
-        } catch ( final ClassNotFoundException e ) {
-            // do nothing
-        }
-        if ( clazz != null ) {
-            if ( this.cachedImports == Collections.EMPTY_MAP ) {
-                this.cachedImports = new HashMap();
-            }
-            this.cachedImports.put( className,
-                                    clazz );
-        }
-        return clazz;
-    }
-
-    public boolean isEmpty() {
-        return this.imports.isEmpty();
-    }
+package org.codehaus.jfdi.interpreter;
+
+/*
+ * Copyright 2005 JBoss Inc
+ * 
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ClassTypeResolver
+    implements
+    TypeResolver {
+    private final List        imports;
+
+    private final ClassLoader classLoader;
+
+    private Map               cachedImports = new HashMap();
+    
+    private static Map internalNamesMap = new HashMap();
+    static {
+        internalNamesMap.put( ""int"", ""I"" );
+        internalNamesMap.put( ""boolean"", ""Z"" );
+        internalNamesMap.put( ""float"", ""F"" );
+        internalNamesMap.put( ""long"", ""J"" );
+        internalNamesMap.put( ""short"", ""S"" );
+        internalNamesMap.put( ""byte"", ""B"" );
+        internalNamesMap.put( ""double"", ""D"" );
+        internalNamesMap.put( ""char"", ""C"" );
+    }
+
+    public ClassTypeResolver() {
+        this( Collections.EMPTY_LIST );
+    }
+
+    public ClassTypeResolver(final List imports) {
+        this( imports,
+              null );
+    }
+
+    public ClassTypeResolver(final List imports,
+                             ClassLoader classLoader) {
+        this.imports = imports;
+
+        if ( classLoader == null ) {
+            classLoader = Thread.currentThread().getContextClassLoader();
+        }
+
+        if ( classLoader == null ) {
+            classLoader = getClass().getClassLoader();
+        }
+
+        this.classLoader = classLoader;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.drools.semantics.base.Importer#getImports( Class clazz )
+     */
+    /* (non-Javadoc)
+     * @see org.drools.semantics.java.TypeResolver#getImports()
+     */
+    public List getImports() {
+        return this.imports;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.drools.semantics.base.Importer#addImports(org.drools.spi.ImportEntry)
+     */
+    /* (non-Javadoc)
+     * @see org.drools.semantics.java.TypeResolver#addImport(java.lang.String)
+     */
+    public void addImport(final String importEntry) {
+        if ( !this.imports.contains( importEntry ) ) {
+            this.imports.add( importEntry );
+        }
+    }
+
+    public Class lookupFromCache(final String className) {
+        return (Class) this.cachedImports.get( className );
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.drools.semantics.base.Importer#importClass(java.lang.ClassLoader,
+     *      java.lang.String)
+     */
+    /* (non-Javadoc)
+     * @see org.drools.semantics.java.TypeResolver#resolveType(java.lang.String)
+     */
+    public Class resolveType(String className) throws ClassNotFoundException {
+        Class clazz = null;
+        boolean isArray = false;
+        StringBuffer arrayClassName = new StringBuffer();
+
+        //is the class a primitive type ?
+        if (internalNamesMap.containsKey(className)) {
+            clazz = Class.forName( ""["" + internalNamesMap.get(className),
+                                   true,
+                                   classLoader).getComponentType();
+            // Could also be a primitive array
+        } else if ( className.indexOf('[') > 0 ) {
+            isArray = true;
+            int bracketIndex = className.indexOf('[');
+            String componentName = className.substring( 0,
+                                                        bracketIndex );
+            arrayClassName.append('[');
+            while( (bracketIndex = className.indexOf( '[', bracketIndex+1 )) > 0 ) {
+                arrayClassName.append('[');
+            }
+            className = componentName;
+        }
+
+        if ( clazz == null ) {
+            // Now try the package object type cache         
+            clazz = lookupFromCache( className );
+        }
+
+        // try loading className
+        if ( clazz == null ) {
+            try {
+                clazz = this.classLoader.loadClass( className );
+            } catch ( final ClassNotFoundException e ) {
+                clazz = null;
+            }
+        }
+
+        // Now try the className with each of the given imports 
+        if ( clazz == null ) {
+            final Set validClazzCandidates = new HashSet();
+
+            final Iterator it = this.imports.iterator();
+            while ( it.hasNext() ) {
+                clazz = importClass( (String) it.next(),
+                                     className );
+                if ( clazz != null ) {
+                    validClazzCandidates.add( clazz );
+                }
+            }
+
+            // If there are more than one possible resolutions, complain about
+            // the ambiguity
+            if ( validClazzCandidates.size() > 1 ) {
+                final StringBuffer sb = new StringBuffer();
+                final Iterator clazzCandIter = validClazzCandidates.iterator();
+                while ( clazzCandIter.hasNext() ) {
+                    if ( 0 != sb.length() ) {
+                        sb.append( "", "" );
+                    }
+                    sb.append( ((Class) clazzCandIter.next()).getName() );
+                }
+                throw new Error( ""Unable to find unambiguously defined class '"" + className + ""', candidates are: ["" + sb.toString() + ""]"" );
+            } else if ( validClazzCandidates.size() == 1 ) {
+                clazz = (Class) validClazzCandidates.toArray()[0];
+            } else {
+                clazz = null;
+            }
+
+        }
+
+        // Now try the java.lang package
+        if ( clazz == null ) {
+            clazz = defaultClass( className );
+        }
+
+        // If array component class was found, try to resolve the array class of it 
+        if( isArray ) {
+            if (clazz == null && internalNamesMap.containsKey( className ) ) {
+                arrayClassName.append( internalNamesMap.get( className ) );
+            } else {
+                if( clazz != null ) {
+                    arrayClassName.append( ""L"" ).append( clazz.getName() ).append( "";"" );                
+                } else {
+                    // we know we will probably not be able to resolve this name, but nothing else we can do. 
+                    arrayClassName.append( ""L"" ).append( className ).append( "";"" );                
+                }
+            }
+            try {
+                clazz = Class.forName( arrayClassName.toString() );
+            } catch ( ClassNotFoundException e ) {
+                clazz = null;
+            }
+        }
+        
+        // We still can't find the class so throw an exception 
+        if ( clazz == null ) {
+            throw new ClassNotFoundException( ""Unable to find class '"" + className + ""'"" );
+        }
+
+        return clazz;
+    }
+
+    private Class importClass(final String importText,
+                              final String className) {
+        String qualifiedClass = null;
+        Class clazz = null;
+
+        // not python
+        if ( importText.endsWith( ""*"" ) ) {
+            qualifiedClass = importText.substring( 0,
+                                                   importText.indexOf( '*' ) ) + className;
+        } else if ( importText.endsWith( ""."" + className ) ) {
+            qualifiedClass = importText;
+        } else if ( importText.equals( className ) ) {
+            qualifiedClass = importText;
+        }
+
+        if ( qualifiedClass != null ) {
+            try {
+                clazz = this.classLoader.loadClass( qualifiedClass );
+            } catch ( final ClassNotFoundException e ) {
+                clazz = null;
+            }
+
+            // maybe its a nested class?
+            if ( clazz == null ) {
+                try {
+                    final int lastIndex = qualifiedClass.lastIndexOf( '.' );
+                    qualifiedClass = qualifiedClass.substring( 0,
+                                                               lastIndex ) + ""$"" + qualifiedClass.substring( lastIndex + 1 );
+                    clazz = this.classLoader.loadClass( qualifiedClass );
+                } catch ( final ClassNotFoundException e ) {
+                    clazz = null;
+                }
+            }
+        }
+
+        if ( clazz != null ) {
+            if ( this.cachedImports == Collections.EMPTY_MAP ) {
+                this.cachedImports = new HashMap();
+            }
+
+            this.cachedImports.put( className,
+                                    clazz );
+        }
+
+        return clazz;
+    }
+
+    private Class defaultClass(String className) {
+        String qualifiedClass = ""java.lang."" + className;
+        Class clazz = null;
+        try {
+            clazz = this.classLoader.loadClass( qualifiedClass );
+        } catch ( final ClassNotFoundException e ) {
+            // do nothing
+        }
+        if ( clazz != null ) {
+            if ( this.cachedImports == Collections.EMPTY_MAP ) {
+                this.cachedImports = new HashMap();
+            }
+            this.cachedImports.put( className,
+                                    clazz );
+        }
+        return clazz;
+    }
+
+    public boolean isEmpty() {
+        return this.imports.isEmpty();
+    }
 }
\ No newline at end of file"
018e2cf16558108622c98fd82bcbde3ce14270db,camel,polished--git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1209457 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/camel,"diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
index 6d78e9948e485..203573a0fdfc5 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
@@ -36,7 +36,7 @@ protected void verifyGradeA(String endpointUri) throws Exception {
             template.sendBody(endpointUri, new Student(95));
             fail();
         } catch (CamelExecutionException e) {
-            e.printStackTrace();
+            // expected
         }
         assertMockEndpointsSatisfied();
     }"
3161a555e1e898786041b84b98f0c45630b7c78e,hbase,HBASE-3070 Add to hbaseadmin means of shutting- down a regionserver--git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1003702 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hbase,"diff --git a/CHANGES.txt b/CHANGES.txt
index d5099dc0aa04..99088c3ae308 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -965,6 +965,7 @@ Release 0.21.0 - Unreleased
    HBASE-3066  We don't put the port for hregionserver up into znode since
                new master
    HBASE-2825  Scans respect row locks
+   HBASE-3070  Add to hbaseadmin means of shutting down a regionserver
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 279ee6ba3084..c2ba277fff69 100644
--- a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -1006,6 +1006,16 @@ public synchronized void stopMaster() throws IOException {
     }
   }
 
+  /**
+   * Stop the designated regionserver.
+   * @throws IOException if a remote or network exception occurs
+   */
+  public synchronized void stopRegionServer(final HServerAddress hsa)
+  throws IOException {
+    HRegionInterface rs = this.connection.getHRegionConnection(hsa);
+    rs.stop(""Called by admin client "" + this.connection.toString());
+  }
+
   /**
    * @return cluster status
    * @throws IOException if a remote or network exception occurs
diff --git a/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
index fbdec0b375ca..dc3f68c90e0c 100644
--- a/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
+++ b/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
@@ -64,7 +64,6 @@
 import org.apache.hadoop.hbase.util.Writables;
 import org.apache.hadoop.hbase.zookeeper.RootRegionTracker;
 import org.apache.hadoop.hbase.zookeeper.ZKTableDisable;
-import org.apache.hadoop.hbase.zookeeper.ZKUtil;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.apache.hadoop.ipc.RemoteException;
 import org.apache.zookeeper.KeeperException;
@@ -271,6 +270,12 @@ public HConnectionImplementation(Configuration conf)
       this.masterChecked = false;
     }
 
+    @Override
+    public String toString() {
+      // Return our zk identifier ... it 'hconnection + zk sessionid'.
+      return this.zooKeeper.toString();
+    }
+
     private long getPauseTime(int tries) {
       int ntries = tries;
       if (ntries >= HConstants.RETRY_BACKOFF.length) {"
ebfb482c3ee955f24be4d2802c1e06d6f0aa0d1c,restlet-framework-java,Removed debug traces.--,p,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/org.restlet.ext.odata/src/org/restlet/ext/odata/Query.java b/modules/org.restlet.ext.odata/src/org/restlet/ext/odata/Query.java
index 142b1c1b3a..4fee45c339 100755
--- a/modules/org.restlet.ext.odata/src/org/restlet/ext/odata/Query.java
+++ b/modules/org.restlet.ext.odata/src/org/restlet/ext/odata/Query.java
@@ -328,10 +328,8 @@ public void execute() throws Exception {
             ClientResource resource = new ClientResource(targetUri);
             resource.setChallengeResponse(service.getCredentials());
 
-            Representation result = new StringRepresentation(resource.get(
-                    MediaType.APPLICATION_ATOM).getText());
-            System.out.println(targetUri);
-            System.out.println(result.getText());
+            Representation result = resource.get(MediaType.APPLICATION_ATOM);
+
             service.setLatestRequest(resource.getRequest());
             service.setLatestResponse(resource.getResponse());"
83efcc0745f3364be1b21a46ec96895a734e3187,Valadoc,"libvaladoc/html: Keep error-reporter for derived doclets
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index a3329af427..04e0f59873 100755
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -33,7 +33,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 	protected Html.MarkupWriter writer;
 	protected Html.CssClassResolver cssresolver;
 	protected Charts.Factory image_factory;
-
+	protected ErrorReporter reporter;
 	protected string package_list_link = ""../index.html"";
 
 	// CSS:
@@ -98,6 +98,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 	private const string css_deprecated = ""deprecated"";
 
 	public virtual void process (Settings settings, Api.Tree tree, ErrorReporter reporter) {
+		this.reporter = reporter;
 		this.settings = settings;
 		this.tree = tree;"
01de4037a2111d2ded5cbf72a444e3e4088d95da,intellij-community,"nullable problems: disable warnings on- ""complex"" getters/setters (IDEA-63958)--",c,https://github.com/JetBrains/intellij-community,"diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
index 499a3452e92d6..2dec04e471098 100644
--- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
@@ -34,6 +34,7 @@
 import com.intellij.psi.search.searches.OverridingMethodsSearch;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.*;
+import com.intellij.refactoring.psi.PropertyUtils;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
@@ -114,14 +115,16 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
                                        ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AnnotateMethodFix(anno, ArrayUtil.toStringArray(annoToRemove)));
               }
             }
-            if (annotated.isDeclaredNotNull && manager.isNullable(getter, false)) {
-              holder.registerProblem(nameIdentifier, InspectionsBundle.message(
-                ""inspection.nullable.problems.annotated.field.getter.conflict"", StringUtil.getShortName(anno), nullableSimpleName),
-                                     ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AnnotateMethodFix(anno, ArrayUtil.toStringArray(annoToRemove)));
-            } else if (annotated.isDeclaredNullable && manager.isNotNull(getter, false)) {
-              holder.registerProblem(nameIdentifier, InspectionsBundle.message(
-                ""inspection.nullable.problems.annotated.field.getter.conflict"", StringUtil.getShortName(anno), notNullSimpleName),
-                                     ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AnnotateMethodFix(anno, ArrayUtil.toStringArray(annoToRemove)));
+            if (PropertyUtils.isSimpleGetter(getter)) {
+              if (annotated.isDeclaredNotNull && manager.isNullable(getter, false)) {
+                holder.registerProblem(nameIdentifier, InspectionsBundle.message(
+                  ""inspection.nullable.problems.annotated.field.getter.conflict"", StringUtil.getShortName(anno), nullableSimpleName),
+                                       ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AnnotateMethodFix(anno, ArrayUtil.toStringArray(annoToRemove)));
+              } else if (annotated.isDeclaredNullable && manager.isNotNull(getter, false)) {
+                holder.registerProblem(nameIdentifier, InspectionsBundle.message(
+                  ""inspection.nullable.problems.annotated.field.getter.conflict"", StringUtil.getShortName(anno), notNullSimpleName),
+                                       ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AnnotateMethodFix(anno, ArrayUtil.toStringArray(annoToRemove)));
+              }
             }
           }
 
@@ -141,22 +144,24 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
                                      ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                      new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
             }
-            if (annotated.isDeclaredNotNull && manager.isNullable(parameter, false)) {
-              final PsiIdentifier nameIdentifier1 = parameter.getNameIdentifier();
-              assert nameIdentifier1 != null : parameter;
-              holder.registerProblem(nameIdentifier1, InspectionsBundle.message(
-                                     ""inspection.nullable.problems.annotated.field.setter.parameter.conflict"",
-                                     StringUtil.getShortName(anno), nullableSimpleName),
-                                     ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                     new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
-            }
-            else if (annotated.isDeclaredNullable && manager.isNotNull(parameter, false)) {
-              final PsiIdentifier nameIdentifier1 = parameter.getNameIdentifier();
-              assert nameIdentifier1 != null : parameter;
-              holder.registerProblem(nameIdentifier1, InspectionsBundle.message(
-                ""inspection.nullable.problems.annotated.field.setter.parameter.conflict"", StringUtil.getShortName(anno), notNullSimpleName),
-                                     ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                     new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
+            if (PropertyUtils.isSimpleSetter(setter)) {
+              if (annotated.isDeclaredNotNull && manager.isNullable(parameter, false)) {
+                final PsiIdentifier nameIdentifier1 = parameter.getNameIdentifier();
+                assert nameIdentifier1 != null : parameter;
+                holder.registerProblem(nameIdentifier1, InspectionsBundle.message(
+                                       ""inspection.nullable.problems.annotated.field.setter.parameter.conflict"",
+                                       StringUtil.getShortName(anno), nullableSimpleName),
+                                       ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                                       new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
+              }
+              else if (annotated.isDeclaredNullable && manager.isNotNull(parameter, false)) {
+                final PsiIdentifier nameIdentifier1 = parameter.getNameIdentifier();
+                assert nameIdentifier1 != null : parameter;
+                holder.registerProblem(nameIdentifier1, InspectionsBundle.message(
+                  ""inspection.nullable.problems.annotated.field.setter.parameter.conflict"", StringUtil.getShortName(anno), notNullSimpleName),
+                                       ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                                       new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
+              }
             }
             if (containingClass == null) {
               return;
diff --git a/java/java-tests/testData/inspection/nullableProblems/getterSetterProblems/src/Test.java b/java/java-tests/testData/inspection/nullableProblems/getterSetterProblems/src/Test.java
index a908c2c615cac..c4034e91c761a 100644
--- a/java/java-tests/testData/inspection/nullableProblems/getterSetterProblems/src/Test.java
+++ b/java/java-tests/testData/inspection/nullableProblems/getterSetterProblems/src/Test.java
@@ -38,4 +38,13 @@ public C getC() {
   public void setC(@Nullable C c) {
     this.c = c;
   }
+
+  @NotNull C c1;
+  @Nullable
+  public C getC1() {
+    if (c1 != null) {
+      return null;
+    }
+    return c1;
+  }
 }
\ No newline at end of file"
d27180c451f4659c5719e6a2793283bc3c998af6,betterform$betterform,"[feature] readded SSL-Functionality for http-components:
- enabled 443,8443 as default ports
- renamed property from ""httpclient.ssl.factory"" to ""httpclient.ssl.context""
- renamed property from ""httpclient.ssl.factory.defaultPort"" to ""httpclient.ssl.context.customPort""
- renamed KeyStoreSSLProtocolSocketFactory to KeyStoreSSLContext
",p,https://github.com/betterform/betterform,"diff --git a/betty/betterform-config.xml b/betty/betterform-config.xml
index d7ad51e1b..47b2072ca 100644
--- a/betty/betterform-config.xml
+++ b/betty/betterform-config.xml
@@ -108,30 +108,32 @@
 
         <!--
              Full classpath of SSLProtocolSocketFactory which should be used by httpclient.
-             For now there is only one implementing Class in betterFORM, which allows verification of a server cert (KeyStoreSSLProtocolSocketFactory).
+             For now there is only one implementing Class in betterFORM, which allows verification of a server cert (KeyStoreSSLContext).
              SSLProtocolSocketFactory-Handling will be activated if the property is specified.
+             ! You have to uncomment this if you would like to use betterFORM with custom SSL-Certificates. !
         -->
 <!--
-        <property name=""httpclient.ssl.factory"" value=""de.betterform.connector.http.ssl.KeyStoreSSLProtocolSocketFactory"" description=""Full classpath of SSLProtocolSocketFactory which should be used by httpclient.""/>
+        <property name=""httpclient.ssl.context"" value=""de.betterform.connector.http.ssl.KeyStoreSSLContext"" description=""Full classpath of SSLProtocolSocketFactory which should be used by httpclient.""/>
 -->
         <!--
-            Specify defaultPort for SSLProtocolSocketFactory for httpclient.
-            If not specified 443 will be used.
+            Specify a customPort for SSLProtocolSocketFactory for httpclient.
+            Port 443,8443 are the default ports.
             See: http://hc.apache.org/httpclient-3.x/apidocs/org/apache/commons/httpclient/protocol/Protocol.html
         -->
-        <property name=""httpclient.ssl.factory.defaultPort"" value=""DEFAULT-SSL-PORT"" description=""Specify defaultPort for SSLProtocolSocketFactory for httpclient. 443 if not specified.""/>
-
+<!--
+        <property name=""httpclient.ssl.context.customPort"" value=""CUSTOM-SSL-PORT"" description=""Specify custom Port for SSLProtocolSocketFactory for httpclient. 443,8443 if not specified.""/>
+-->
         <!--
            Location of JAVA keystore used by httpclient to verify trusted ssl-certs.
-           If / is omitted in the value ""user.home"" will be used a relative path.
+           If / (root-dir) is omitted in the value ""user.home"" will be used as relative path.
            Otherwise an absolute path is expected.
-           Used by: KeyStoreSSLProtocolSocketFactory
+           Used by: KeyStoreSSLContext
         -->
         <property name=""httpclient.ssl.keystore.path"" value=""PATH-TO-KEYSTORE"" description=""Location of the keystore to be used by httpclient.""/>
 
         <!--
             Password to unlock JAVA keystore.
-            Used by: KeyStoreSSLProtocolSocketFactory
+            Used by: KeyStoreSSLContext
         -->
         <property name=""httpclient.ssl.keystore.passwd"" value=""KEYSTORE-PASSWD"" description=""Password to unlock keystore.""/>
 
diff --git a/core/src/main/java/de/betterform/connector/http/AbstractHTTPConnector.java b/core/src/main/java/de/betterform/connector/http/AbstractHTTPConnector.java
index 6ea2cc8f9..f84f41ab1 100644
--- a/core/src/main/java/de/betterform/connector/http/AbstractHTTPConnector.java
+++ b/core/src/main/java/de/betterform/connector/http/AbstractHTTPConnector.java
@@ -5,41 +5,38 @@
 
 package de.betterform.connector.http;
 
-import de.betterform.connector.ConnectorFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import de.betterform.connector.AbstractConnector;
+import de.betterform.connector.ConnectorFactory;
+import de.betterform.connector.http.ssl.KeyStoreSSLContext;
+import de.betterform.xml.config.Config;
 import de.betterform.xml.xforms.XFormsConstants;
 import de.betterform.xml.xforms.exception.XFormsException;
 import de.betterform.xml.xforms.exception.XFormsInternalSubmitException;
 import de.betterform.xml.xforms.model.submission.RequestHeader;
 import de.betterform.xml.xforms.model.submission.RequestHeaders;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.http.Header;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
-
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.Credentials;
+import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.AuthCache;
-
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.*;
 import org.apache.http.client.params.ClientPNames;
 import org.apache.http.client.params.CookiePolicy;
 import org.apache.http.client.protocol.ClientContext;
-import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.auth.AuthScope;
 import org.apache.http.impl.cookie.BrowserCompatSpec;
-import org.apache.http.message.BasicHeader;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.BasicHttpContext;
@@ -66,14 +63,14 @@ public class AbstractHTTPConnector extends AbstractConnector {
      * Custom-SSL:
      * Key for storing custom SSL-protocol
      */
-    public static final String SSL_CUSTOM_PROTOCOL = ""ssl-protocol"";
+    public static final String SSL_CUSTOM_SCHEME = ""ssl_custom_scheme"";
 
     /*
      * Custom-SSL:
      * SSL-factory properties, see betterform-config.xml for description.
      */
-    public static final String HTTPCLIENT_SSL_FACTORY= ""httpclient.ssl.factory"";
-    public static final String HTTPCLIENT_SSL_FACTORY_DEFAULTPORT= ""httpclient.ssl.factory.defaultPort"";
+    public static final String HTTPCLIENT_SSL_CONTEXT= ""httpclient.ssl.context"";
+    public static final String HTTPCLIENT_SSL_CONTEXT_CUSTOMPORT= ""httpclient.ssl.context.customPort"";
     public static final String HTTPCLIENT_SSL_KEYSTORE_PATH= ""httpclient.ssl.keystore.path"";
     public static final String HTTPCLIENT_SSL_KEYSTORE_PASSWD= ""httpclient.ssl.keystore.passwd"";
 
@@ -244,14 +241,16 @@ protected void execute(HttpRequestBase httpRequestBase) throws Exception{
             DefaultHttpClient client = ConnectorFactory.getFactory().getHttpClient(httpParams);
 
 
-/*
-        if (! getContext().containsKey(AbstractHTTPConnector.SSL_CUSTOM_PROTOCOL)) {
-            String factoryPath = Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_FACTORY);
-            if (factoryPath != null) {
-                initSSLProtocol(factoryPath);
+
+        if (! getContext().containsKey(AbstractHTTPConnector.SSL_CUSTOM_SCHEME)) {
+            LOGGER.debug(""SSL_CUSTOM_SCHEME"");
+            LOGGER.debug(""SSL_CUSTOM_SCHEME: Factory: "" + Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_CONTEXT));
+            String contextPath = Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_CONTEXT);
+            if (contextPath != null) {
+                initSSLScheme(contextPath);
             }
         }
-*/
+
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(""context params>>>"");
             Map map = getContext();
@@ -380,20 +379,18 @@ protected void execute(HttpRequestBase httpRequestBase) throws Exception{
                 throw new MalformedCookieException(""Cookies must be passed as org.apache.commons.httpclient.Cookie objects."");
             }
         }
-        HttpResponse httpResponse = client.execute(httpRequestBase);
 
-        try {
-            /* TODO
-            if (getContext().containsKey(AbstractHTTPConnector.SSL_CUSTOM_PROTOCOL)) {
-                LOGGER.debug(""Using customSSL-Protocol-Handler"");
+        if (getContext().containsKey(AbstractHTTPConnector.SSL_CUSTOM_SCHEME)) {
+            LOGGER.debug(""Using customSSL-Protocol-Handler"");
+            Iterator<Scheme> schemes = ((Vector<Scheme>) getContext().get(AbstractHTTPConnector.SSL_CUSTOM_SCHEME)).iterator();
 
-                HostConfiguration hc = new HostConfiguration();
-                hc.setHost(httpMethod.getURI().getHost(), httpMethod.getURI().getPort(), (Protocol) getContext().get(AbstractHTTPConnector.SSL_CUSTOM_PROTOCOL));
-                client.executeMethod(hc, httpMethod);
-            } else {
-                client.executeMethod(httpMethod);
-            }      */
+            while (schemes.hasNext()) {
+                client.getConnectionManager().getSchemeRegistry().register(schemes.next());
+            }
+        }
 
+        HttpResponse httpResponse = client.execute(httpRequestBase);
+        try {
             if (httpResponse.getStatusLine().getStatusCode() >= 300) {
                 // Allow 302 only
                 if (httpResponse.getStatusLine().getStatusCode() != 302) {
@@ -403,6 +400,7 @@ protected void execute(HttpRequestBase httpRequestBase) throws Exception{
             this.handleHttpMethod(httpResponse);
         }
         catch (Exception e) {
+            LOGGER.trace(""AbstractHTTPConnector Exception: "", e);
             try {
                 throw new XFormsInternalSubmitException(httpResponse.getStatusLine().getStatusCode(), httpResponse.getStatusLine().getReasonPhrase(), EntityUtils.toString(httpResponse.getEntity()), XFormsConstants.RESOURCE_ERROR);
             } catch (IOException e1) {
@@ -433,35 +431,37 @@ private void configureRequest(HttpEntityEnclosingRequestBase httpMethod, String
         //httpMethod.setHeader(new BasicHeader(""Content-Length"", String.valueOf(body.getBytes(encoding).length)));
     }
 
-    /*
-    private void initSSLProtocol(String factoryPath) throws Exception {
-        Protocol sslProtocol;
-            LOGGER.debug(""creating sslProtocol ..."");
-            LOGGER.debug(""ProtocolPath: "" + factoryPath);
-            Class sslClass = Class.forName(factoryPath);
-            Object sslFactory = sslClass.newInstance();
-            if (sslFactory instanceof SecureProtocolSocketFactory) {
-                int defaultPort;
-                if (Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_FACTORY_DEFAULTPORT) != null) {
+
+    private void initSSLScheme(String contextPath) throws Exception {
+            LOGGER.debug(""creating sslScheme ..."");
+            LOGGER.debug(""KeyStoreSSLContext: "" + contextPath);
+            Class contextClass = Class.forName(contextPath);
+            Object context = contextClass.newInstance();
+            Vector<Scheme> schemes = new Vector<Scheme>();
+
+            if (context instanceof KeyStoreSSLContext) {
+                int httpSSLPort = 443;
+                int tomcatSSLPort = 8443;
+
+                SSLSocketFactory socketFactory = new SSLSocketFactory(((KeyStoreSSLContext)context).getSSLContext());
+                if (Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_CONTEXT_CUSTOMPORT) != null) {
                     try {
-                        defaultPort = Integer.parseInt(Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_FACTORY_DEFAULTPORT));
+                        int customPort = Integer.parseInt(Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_CONTEXT_CUSTOMPORT));
+                        LOGGER.trace(""CustomPort: "" + customPort);
+                        Scheme sslScheme = new Scheme(""https"", customPort, socketFactory);
+                        schemes.add(sslScheme);
                     } catch (NumberFormatException nfe) {
-                        LOGGER.warn(AbstractHTTPConnector.HTTPCLIENT_SSL_FACTORY_DEFAULTPORT + "" is not parsable as a number. Check your settings in betterform-config.xml!"", nfe);
-                        LOGGER.warn(""Setting sslPort to 443"");
-                        defaultPort = 443;
+                        LOGGER.warn(AbstractHTTPConnector.HTTPCLIENT_SSL_CONTEXT_CUSTOMPORT + "" is not parsable as a number. Check your settings in betterform-config.xml!"", nfe);
                     }
-                } else {
-                    defaultPort = 443;
                 }
-                LOGGER.trace(""DefaultPort: "" + defaultPort);
-                sslProtocol = new Protocol(""https"", (ProtocolSocketFactory) sslFactory, defaultPort);
-                Protocol.registerProtocol(""https"", sslProtocol);
+                Scheme sslScheme1 = new Scheme(""https"", httpSSLPort, socketFactory);
+                schemes.add(sslScheme1);
+                Scheme sslScheme2 = new Scheme(""https"", tomcatSSLPort, socketFactory);
+                schemes.add(sslScheme2);
 
-                getContext().put(AbstractHTTPConnector.SSL_CUSTOM_PROTOCOL, sslProtocol);
+                getContext().put(AbstractHTTPConnector.SSL_CUSTOM_SCHEME, schemes);
             }
     }
-
-    */
 }
 
 //end of class
diff --git a/core/src/main/java/de/betterform/connector/http/ssl/KeyStoreSSLProtocolSocketFactory.java b/core/src/main/java/de/betterform/connector/http/ssl/KeyStoreSSLContext.java
similarity index 71%
rename from core/src/main/java/de/betterform/connector/http/ssl/KeyStoreSSLProtocolSocketFactory.java
rename to core/src/main/java/de/betterform/connector/http/ssl/KeyStoreSSLContext.java
index 04c89a0e1..916444557 100644
--- a/core/src/main/java/de/betterform/connector/http/ssl/KeyStoreSSLProtocolSocketFactory.java
+++ b/core/src/main/java/de/betterform/connector/http/ssl/KeyStoreSSLContext.java
@@ -62,18 +62,20 @@
 import de.betterform.connector.http.AbstractHTTPConnector;
 import de.betterform.xml.config.Config;
 import de.betterform.xml.config.XFormsConfigException;
-
 import org.apache.commons.httpclient.contrib.ssl.AuthSSLInitializationError;
 import org.apache.commons.httpclient.contrib.ssl.AuthSSLX509TrustManager;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.net.ssl.*;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -83,23 +85,18 @@
 import java.security.cert.X509Certificate;
 import java.util.Enumeration;
 
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.scheme.SocketFactory;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.params.HttpConnectionParams;
-
 /**
  * @author <a href=""mailto:tobias.krebs@betterform.de"">tobi</a>
- * @version $Id: KeyStoreSSLProtocolSocketFactory 08.10.2010 tobi $
+ * @version $Id: KeyStoreSSLContext 08.10.2010 tobi $
  */
-public class KeyStoreSSLProtocolSocketFactory {
+public class KeyStoreSSLContext {
     private static String keyStorePath = null;
     private static String keyStorePasswd = null;
     private SSLContext sslcontext = null;
 
-    private static Log LOGGER = LogFactory.getLog(KeyStoreSSLProtocolSocketFactory.class);
+    private static Log LOGGER = LogFactory.getLog(KeyStoreSSLContext.class);
 
-    public KeyStoreSSLProtocolSocketFactory() {
+    public KeyStoreSSLContext() {
         try {
             this.keyStorePath = Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_KEYSTORE_PATH, null);
             this.keyStorePasswd = Config.getInstance().getProperty(AbstractHTTPConnector.HTTPCLIENT_SSL_KEYSTORE_PASSWD , null);
@@ -109,13 +106,13 @@ public KeyStoreSSLProtocolSocketFactory() {
     }
 
     private URL getKeyStoreURL() throws AuthSSLInitializationError {
-        if (KeyStoreSSLProtocolSocketFactory.keyStorePath != null) {
+        if (KeyStoreSSLContext.keyStorePath != null) {
             File keystore;
 
-            if (KeyStoreSSLProtocolSocketFactory.keyStorePath.startsWith( File.separator)) {
-                keystore = new File(KeyStoreSSLProtocolSocketFactory.keyStorePath);
+            if (KeyStoreSSLContext.keyStorePath.startsWith( File.separator)) {
+                keystore = new File(KeyStoreSSLContext.keyStorePath);
             } else {
-                keystore = new File(System.getProperty(""user.home"") + File.separator + KeyStoreSSLProtocolSocketFactory.keyStorePath);
+                keystore = new File(System.getProperty(""user.home"") + File.separator + KeyStoreSSLContext.keyStorePath);
             }
             try {
                 return keystore.toURI().toURL();
@@ -129,15 +126,15 @@ private URL getKeyStoreURL() throws AuthSSLInitializationError {
     }
 
     private String getKeyStorePasswd() throws AuthSSLInitializationError {
-        if (KeyStoreSSLProtocolSocketFactory.keyStorePasswd != null) {
+        if (KeyStoreSSLContext.keyStorePasswd != null) {
             //TODO: Support encryption of passwd!
-            return KeyStoreSSLProtocolSocketFactory.keyStorePasswd;
+            return KeyStoreSSLContext.keyStorePasswd;
         }
 
         throw new AuthSSLInitializationError(""You must configure ""+ AbstractHTTPConnector.HTTPCLIENT_SSL_KEYSTORE_PASSWD + "" in betterform-config.xml!"");
     }
 
-    public static KeyStore createKeyStore(final URL url, final String password)
+    private KeyStore createKeyStore(final URL url, final String password)
         throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException
     {
         if (url == null) {
@@ -145,7 +142,7 @@ public static KeyStore createKeyStore(final URL url, final String password)
         }
 
         LOGGER.debug(""Initializing key store"");
-        KeyStore keystore  = KeyStore.getInstance(""jks"");
+        KeyStore keystore  = KeyStore.getInstance(KeyStore.getDefaultType());
         InputStream is = null;
         try {
         	is = url.openStream();
@@ -217,97 +214,10 @@ private SSLContext createSSLContext() {
         }
     }
 
-    private SSLContext getSSLContext() {
+     public SSLContext getSSLContext() {
         if (this.sslcontext == null) {
             this.sslcontext = createSSLContext();
         }
         return this.sslcontext;
     }
-
-
-    /**
-     * Attempts to get a new socket connection to the given host within the given time limit.
-     * <p>
-     * To circumvent the limitations of older JREs that do not support connect timeout a
-     * controller thread is executed. The controller thread attempts to create a new socket
-     * within the given limit of time. If socket constructor does not return until the
-
-     * </p>
-     *
-     * @param host the host name/IP
-     * @param port the port on the host
-     * @param localAddress the local host name/IP to bind the socket to
-     * @param localPort the port on the local machine
-
-     *
-     * @return Socket a new socket
-     *
-     * @throws IOException if an I/O error occurs while creating the socket
-     * @throws java.net.UnknownHostException if the IP address of the host cannot be
-     * determined
-     */
-    public Socket createSocket(
-        final String host,
-        final int port,
-        final InetAddress localAddress,
-        final int localPort,
-        final HttpConnectionParams params
-    ) throws IOException, UnknownHostException, ConnectTimeoutException {
-        if (params == null) {
-            throw new IllegalArgumentException(""Parameters may not be null"");
-        }
-        int timeout = 0;//params.getConnectionTimeout(params);
-        SSLSocketFactory socketfactory = new SSLSocketFactory(getSSLContext());
-            Socket socket = socketfactory.createSocket();
-            SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
-            SocketAddress remoteaddr = new InetSocketAddress(host, port);
-            socket.bind(localaddr);
-            if (timeout == 0) {
-                socket.connect(remoteaddr, timeout);
-            } else {
-                socket.connect(remoteaddr);
-            }
-            return socket;
-    }
-
-    public Socket createSocket(
-        String host,
-        int port,
-        InetAddress clientHost,
-        int clientPort)
-        throws IOException, UnknownHostException
-   {
-       return getSSLContext().getSocketFactory().createSocket(
-            host,
-            port,
-            clientHost,
-            clientPort
-        );
-    }
-
-
-    public Socket createSocket(String host, int port)
-        throws IOException, UnknownHostException
-    {
-        return getSSLContext().getSocketFactory().createSocket(
-            host,
-            port
-        );
-    }
-
-
-    public Socket createSocket(
-        Socket socket,
-        String host,
-        int port,
-        boolean autoClose)
-        throws IOException, UnknownHostException
-    {
-        return getSSLContext().getSocketFactory().createSocket(
-            socket,
-            host,
-            port,
-            autoClose
-        );
-    }
 }
diff --git a/web/src/main/webapp/WEB-INF/betterform-config.xml b/web/src/main/webapp/WEB-INF/betterform-config.xml
index 06d788fb9..234b6cd2a 100644
--- a/web/src/main/webapp/WEB-INF/betterform-config.xml
+++ b/web/src/main/webapp/WEB-INF/betterform-config.xml
@@ -106,30 +106,32 @@
 
         <!--
              Full classpath of SSLProtocolSocketFactory which should be used by httpclient.
-             For now there is only one implementing Class in betterFORM, which allows verification of a server cert (KeyStoreSSLProtocolSocketFactory).
+             For now there is only one implementing Class in betterFORM, which allows verification of a server cert (KeyStoreSSLContext).
              SSLProtocolSocketFactory-Handling will be activated if the property is specified.
+             ! You have to uncomment this if you would like to use betterFORM with custom SSL-Certificates. !
         -->
 <!--
-        <property name=""httpclient.ssl.factory"" value=""de.betterform.connector.http.ssl.KeyStoreSSLProtocolSocketFactory"" description=""Full classpath of SSLProtocolSocketFactory which should be used by httpclient.""/>
+        <property name=""httpclient.ssl.context"" value=""de.betterform.connector.http.ssl.KeyStoreSSLContext"" description=""Full classpath of SSLProtocolSocketFactory which should be used by httpclient.""/>
 -->
         <!--
-            Specify defaultPort for SSLProtocolSocketFactory for httpclient.
-            If not specified 443 will be used.
+            Specify a customPort for SSLProtocolSocketFactory for httpclient.
+            Port 443,8443 are the default ports.
             See: http://hc.apache.org/httpclient-3.x/apidocs/org/apache/commons/httpclient/protocol/Protocol.html
         -->
-        <property name=""httpclient.ssl.factory.defaultPort"" value=""DEFAULT-SSL-PORT"" description=""Specify defaultPort for SSLProtocolSocketFactory for httpclient. 443 if not specified.""/>
-
+<!--
+        <property name=""httpclient.ssl.context.customPort"" value=""CUSTOM-SSL-PORT"" description=""Specify custom Port for SSLProtocolSocketFactory for httpclient. 443,8443 if not specified.""/>
+-->
         <!--
            Location of JAVA keystore used by httpclient to verify trusted ssl-certs.
-           If / is omitted in the value ""user.home"" will be used a relative path.
+           If / (root-dir) is omitted in the value ""user.home"" will be used as relative path.
            Otherwise an absolute path is expected.
-           Used by: KeyStoreSSLProtocolSocketFactory
+           Used by: KeyStoreSSLContext
         -->
         <property name=""httpclient.ssl.keystore.path"" value=""PATH-TO-KEYSTORE"" description=""Location of the keystore to be used by httpclient.""/>
 
         <!--
             Password to unlock JAVA keystore.
-            Used by: KeyStoreSSLProtocolSocketFactory
+            Used by: KeyStoreSSLContext
         -->
         <property name=""httpclient.ssl.keystore.passwd"" value=""KEYSTORE-PASSWD"" description=""Password to unlock keystore.""/>"
65a5e2cc46b2c04591aa59b7a85751479a7dbd0b,hadoop,YARN-1936. Added security support for the Timeline- Client. Contributed by Zhijie Shen. svn merge --ignore-ancestry -c 1597153- ../../trunk/--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597154 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 32c042622ceb3..02b922616b362 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -78,6 +78,9 @@ Release 2.5.0 - UNRELEASED
     YARN-2049. Added delegation-token support for the Timeline Server. (Zhijie
     Shen via vinodkv)
 
+    YARN-1936. Added security support for the Timeline Client. (Zhijie Shen via
+    vinodkv)
+
   OPTIMIZATIONS
 
   BUG FIXES 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/TimelineClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/TimelineClient.java
index a2ed3e70a51c9..de1d3e2ae53ff 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/TimelineClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/TimelineClient.java
@@ -23,11 +23,13 @@
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
+import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
 import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
 import org.apache.hadoop.yarn.client.api.impl.TimelineClientImpl;
 import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
 
 /**
  * A client library that can be used to post some information in terms of a
@@ -65,4 +67,22 @@ protected TimelineClient(String name) {
   public abstract TimelinePutResponse putEntities(
       TimelineEntity... entities) throws IOException, YarnException;
 
+  /**
+   * <p>
+   * Get a delegation token so as to be able to talk to the timeline server in a
+   * secure way.
+   * </p>
+   * 
+   * @param renewer
+   *          Address of the renewer who can renew these tokens when needed by
+   *          securely talking to the timeline server
+   * @return a delegation token ({@link Token}) that can be used to talk to the
+   *         timeline server
+   * @throws IOException
+   * @throws YarnException
+   */
+  @Public
+  public abstract Token<TimelineDelegationTokenIdentifier> getDelegationToken(
+      String renewer) throws IOException, YarnException;
+
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
index 64cc041aaea54..5ffe17a24a6fb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
@@ -18,24 +18,43 @@
 
 package org.apache.hadoop.yarn.client.api.impl;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URL;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.ws.rs.core.MediaType;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
+import org.apache.hadoop.security.authentication.client.AuthenticationException;
+import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
 import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
 import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
 import org.apache.hadoop.yarn.client.api.TimelineClient;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
+import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenSelector;
+import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
 import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider;
+import org.codehaus.jackson.map.ObjectMapper;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
@@ -44,6 +63,8 @@
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.client.urlconnection.HttpURLConnectionFactory;
+import com.sun.jersey.client.urlconnection.URLConnectionClientHandler;
 
 @Private
 @Unstable
@@ -52,16 +73,29 @@ public class TimelineClientImpl extends TimelineClient {
   private static final Log LOG = LogFactory.getLog(TimelineClientImpl.class);
   private static final String RESOURCE_URI_STR = ""/ws/v1/timeline/"";
   private static final Joiner JOINER = Joiner.on("""");
+  private static Options opts;
+  static {
+    opts = new Options();
+    opts.addOption(""put"", true, ""Put the TimelineEntities in a JSON file"");
+    opts.getOption(""put"").setArgName(""Path to the JSON file"");
+    opts.addOption(""help"", false, ""Print usage"");
+  }
 
   private Client client;
   private URI resURI;
   private boolean isEnabled;
+  private TimelineAuthenticatedURLConnectionFactory urlFactory;
 
   public TimelineClientImpl() {
     super(TimelineClientImpl.class.getName());
     ClientConfig cc = new DefaultClientConfig();
     cc.getClasses().add(YarnJacksonJaxbJsonProvider.class);
-    client = Client.create(cc);
+    if (UserGroupInformation.isSecurityEnabled()) {
+      urlFactory = new TimelineAuthenticatedURLConnectionFactory();
+      client = new Client(new URLConnectionClientHandler(urlFactory), cc);
+    } else {
+      client = Client.create(cc);
+    }
   }
 
   protected void serviceInit(Configuration conf) throws Exception {
@@ -83,6 +117,9 @@ protected void serviceInit(Configuration conf) throws Exception {
             YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS),
             RESOURCE_URI_STR));
       }
+      if (UserGroupInformation.isSecurityEnabled()) {
+        urlFactory.setService(TimelineUtils.buildTimelineTokenService(conf));
+      }
       LOG.info(""Timeline service address: "" + resURI);
     }
     super.serviceInit(conf);
@@ -124,6 +161,13 @@ public TimelinePutResponse putEntities(
     return resp.getEntity(TimelinePutResponse.class);
   }
 
+  @Override
+  public Token<TimelineDelegationTokenIdentifier> getDelegationToken(
+      String renewer) throws IOException, YarnException {
+    return TimelineAuthenticator.getDelegationToken(resURI.toURL(),
+        urlFactory.token, renewer);
+  }
+
   @Private
   @VisibleForTesting
   public ClientResponse doPostingEntities(TimelineEntities entities) {
@@ -133,4 +177,138 @@ public ClientResponse doPostingEntities(TimelineEntities entities) {
         .post(ClientResponse.class, entities);
   }
 
+  private static class TimelineAuthenticatedURLConnectionFactory
+      implements HttpURLConnectionFactory {
+
+    private AuthenticatedURL.Token token;
+    private TimelineAuthenticator authenticator;
+    private Token<TimelineDelegationTokenIdentifier> dToken;
+    private Text service;
+
+    public TimelineAuthenticatedURLConnectionFactory() {
+      token = new AuthenticatedURL.Token();
+      authenticator = new TimelineAuthenticator();
+    }
+
+    @Override
+    public HttpURLConnection getHttpURLConnection(URL url) throws IOException {
+      try {
+        if (dToken == null) {
+          //TODO: need to take care of the renew case
+          dToken = selectToken();
+          if (LOG.isDebugEnabled()) {
+            LOG.debug(""Timeline delegation token: "" + dToken.toString());
+          }
+        }
+        if (dToken != null) {
+          Map<String, String> params = new HashMap<String, String>();
+          TimelineAuthenticator.injectDelegationToken(params, dToken);
+          url = TimelineAuthenticator.appendParams(url, params);
+          if (LOG.isDebugEnabled()) {
+            LOG.debug(""URL with delegation token: "" + url);
+          }
+        }
+        return new AuthenticatedURL(authenticator).openConnection(url, token);
+      } catch (AuthenticationException e) {
+        LOG.error(""Authentication failed when openning connection ["" + url
+            + ""] with token ["" + token + ""]."", e);
+        throw new IOException(e);
+      }
+    }
+
+    private Token<TimelineDelegationTokenIdentifier> selectToken() {
+      UserGroupInformation ugi;
+      try {
+        ugi = UserGroupInformation.getCurrentUser();
+      } catch (IOException e) {
+        String msg = ""Error when getting the current user"";
+        LOG.error(msg, e);
+        throw new YarnRuntimeException(msg, e);
+      }
+      TimelineDelegationTokenSelector tokenSelector =
+          new TimelineDelegationTokenSelector();
+      return tokenSelector.selectToken(
+          service, ugi.getCredentials().getAllTokens());
+    }
+
+    public void setService(Text service) {
+      this.service = service;
+    }
+
+  }
+
+  public static void main(String[] argv) throws Exception {
+    CommandLine cliParser = new GnuParser().parse(opts, argv);
+    if (cliParser.hasOption(""put"")) {
+      String path = cliParser.getOptionValue(""put"");
+      if (path != null && path.length() > 0) {
+        putTimelineEntitiesInJSONFile(path);
+        return;
+      }
+    }
+    printUsage();
+  }
+
+  /**
+   * Put timeline data in a JSON file via command line.
+   * 
+   * @param path
+   *          path to the {@link TimelineEntities} JSON file
+   */
+  private static void putTimelineEntitiesInJSONFile(String path) {
+    File jsonFile = new File(path);
+    if (!jsonFile.exists()) {
+      System.out.println(""Error: File ["" + jsonFile.getAbsolutePath()
+          + ""] doesn't exist"");
+      return;
+    }
+    ObjectMapper mapper = new ObjectMapper();
+    YarnJacksonJaxbJsonProvider.configObjectMapper(mapper);
+    TimelineEntities entities = null;
+    try {
+      entities = mapper.readValue(jsonFile, TimelineEntities.class);
+    } catch (Exception e) {
+      System.err.println(""Error: "" + e.getMessage());
+      e.printStackTrace(System.err);
+      return;
+    }
+    Configuration conf = new YarnConfiguration();
+    TimelineClient client = TimelineClient.createTimelineClient();
+    client.init(conf);
+    client.start();
+    try {
+      if (UserGroupInformation.isSecurityEnabled()
+          && conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, false)) {
+        Token<TimelineDelegationTokenIdentifier> token =
+            client.getDelegationToken(
+                UserGroupInformation.getCurrentUser().getUserName());
+        UserGroupInformation.getCurrentUser().addToken(token);
+      }
+      TimelinePutResponse response = client.putEntities(
+          entities.getEntities().toArray(
+              new TimelineEntity[entities.getEntities().size()]));
+      if (response.getErrors().size() == 0) {
+        System.out.println(""Timeline data is successfully put"");
+      } else {
+        for (TimelinePutResponse.TimelinePutError error : response.getErrors()) {
+          System.out.println(""TimelineEntity ["" + error.getEntityType() + "":"" +
+              error.getEntityId() + ""] is not successfully put. Error code: "" +
+              error.getErrorCode());
+        }
+      }
+    } catch (Exception e) {
+      System.err.println(""Error: "" + e.getMessage());
+      e.printStackTrace(System.err);
+    } finally {
+      client.stop();
+    }
+  }
+
+  /**
+   * Helper function to print out usage
+   */
+  private static void printUsage() {
+    new HelpFormatter().printHelp(""TimelineClient"", opts);
+  }
+
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
index 8a0348b336842..f1a3b6eeceaf3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.yarn.client.api.impl;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -29,8 +30,13 @@
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.DataInputByteBuffer;
+import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.security.Credentials;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
 import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
@@ -64,6 +70,7 @@
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
 import org.apache.hadoop.yarn.api.records.ContainerReport;
 import org.apache.hadoop.yarn.api.records.NodeReport;
 import org.apache.hadoop.yarn.api.records.NodeState;
@@ -74,6 +81,7 @@
 import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
 import org.apache.hadoop.yarn.client.ClientRMProxy;
 import org.apache.hadoop.yarn.client.api.AHSClient;
+import org.apache.hadoop.yarn.client.api.TimelineClient;
 import org.apache.hadoop.yarn.client.api.YarnClient;
 import org.apache.hadoop.yarn.client.api.YarnClientApplication;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -82,8 +90,10 @@
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.hadoop.yarn.util.Records;
+import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -97,8 +107,11 @@ public class YarnClientImpl extends YarnClient {
   protected long submitPollIntervalMillis;
   private long asyncApiPollIntervalMillis;
   private long asyncApiPollTimeoutMillis;
-  protected AHSClient historyClient;
+  private AHSClient historyClient;
   private boolean historyServiceEnabled;
+  protected TimelineClient timelineClient;
+  protected Text timelineService;
+  protected boolean timelineServiceEnabled;
 
   private static final String ROOT = ""root"";
 
@@ -126,10 +139,17 @@ protected void serviceInit(Configuration conf) throws Exception {
     if (conf.getBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED,
       YarnConfiguration.DEFAULT_APPLICATION_HISTORY_ENABLED)) {
       historyServiceEnabled = true;
-      historyClient = AHSClientImpl.createAHSClient();
-      historyClient.init(getConfig());
+      historyClient = AHSClient.createAHSClient();
+      historyClient.init(conf);
     }
 
+    if (conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED,
+        YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED)) {
+      timelineServiceEnabled = true;
+      timelineClient = TimelineClient.createTimelineClient();
+      timelineClient.init(conf);
+      timelineService = TimelineUtils.buildTimelineTokenService(conf);
+    }
     super.serviceInit(conf);
   }
 
@@ -141,6 +161,9 @@ protected void serviceStart() throws Exception {
       if (historyServiceEnabled) {
         historyClient.start();
       }
+      if (timelineServiceEnabled) {
+        timelineClient.start();
+      }
     } catch (IOException e) {
       throw new YarnRuntimeException(e);
     }
@@ -155,6 +178,9 @@ protected void serviceStop() throws Exception {
     if (historyServiceEnabled) {
       historyClient.stop();
     }
+    if (timelineServiceEnabled) {
+      timelineClient.stop();
+    }
     super.serviceStop();
   }
 
@@ -189,6 +215,12 @@ public YarnClientApplication createApplication()
         Records.newRecord(SubmitApplicationRequest.class);
     request.setApplicationSubmissionContext(appContext);
 
+    // Automatically add the timeline DT into the CLC
+    // Only when the security and the timeline service are both enabled
+    if (isSecurityEnabled() && timelineServiceEnabled) {
+      addTimelineDelegationToken(appContext.getAMContainerSpec());
+    }
+
     //TODO: YARN-1763:Handle RM failovers during the submitApplication call.
     rmClient.submitApplication(request);
 
@@ -238,6 +270,48 @@ public YarnClientApplication createApplication()
     return applicationId;
   }
 
+  private void addTimelineDelegationToken(
+      ContainerLaunchContext clc) throws YarnException, IOException {
+    org.apache.hadoop.security.token.Token<TimelineDelegationTokenIdentifier> timelineDelegationToken =
+        timelineClient.getDelegationToken(
+            UserGroupInformation.getCurrentUser().getUserName());
+    if (timelineDelegationToken == null) {
+      return;
+    }
+    Credentials credentials = new Credentials();
+    DataInputByteBuffer dibb = new DataInputByteBuffer();
+    ByteBuffer tokens = clc.getTokens();
+    if (tokens != null) {
+      dibb.reset(tokens);
+      credentials.readTokenStorageStream(dibb);
+      tokens.rewind();
+    }
+    // If the timeline delegation token is already in the CLC, no need to add
+    // one more
+    for (org.apache.hadoop.security.token.Token<? extends TokenIdentifier> token : credentials
+        .getAllTokens()) {
+      TokenIdentifier tokenIdentifier = token.decodeIdentifier();
+      if (tokenIdentifier instanceof TimelineDelegationTokenIdentifier) {
+        return;
+      }
+    }
+    credentials.addToken(timelineService, timelineDelegationToken);
+    if (LOG.isDebugEnabled()) {
+      LOG.debug(""Add timline delegation token into credentials: ""
+          + timelineDelegationToken);
+    }
+    DataOutputBuffer dob = new DataOutputBuffer();
+    credentials.writeTokenStorageToStream(dob);
+    tokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+    clc.setTokens(tokens);
+  }
+
+  @Private
+  @VisibleForTesting
+  protected boolean isSecurityEnabled() {
+    return UserGroupInformation.isSecurityEnabled();
+  }
+
   @Override
   public void killApplication(ApplicationId applicationId)
       throws YarnException, IOException {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
index cfee6f78d0c86..6407f7a1089e8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
@@ -25,19 +25,26 @@
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Assert;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.DataInputByteBuffer;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.security.Credentials;
+import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
+import org.apache.hadoop.security.token.Token;
+import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
 import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
@@ -69,19 +76,23 @@
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+import org.apache.hadoop.yarn.client.api.TimelineClient;
 import org.apache.hadoop.yarn.client.api.YarnClient;
 import org.apache.hadoop.yarn.client.api.YarnClientApplication;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.ApplicationIdNotProvidedException;
 import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
 import org.apache.hadoop.yarn.server.MiniYARNCluster;
 import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
 import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.util.Records;
+import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestYarnClient {
@@ -725,4 +736,80 @@ private void testAsyncAPIPollTimeoutHelper(Long valueForTimeout,
       IOUtils.closeQuietly(client);
     }
   }
+
+  @Test
+  public void testAutomaticTimelineDelegationTokenLoading()
+      throws Exception {
+    Configuration conf = new YarnConfiguration();
+    conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+    SecurityUtil.setAuthenticationMethod(AuthenticationMethod.KERBEROS, conf);
+    final Token<TimelineDelegationTokenIdentifier> dToken =
+        new Token<TimelineDelegationTokenIdentifier>();
+    // crate a mock client
+    YarnClientImpl client = new YarnClientImpl() {
+      @Override
+      protected void serviceInit(Configuration conf) throws Exception {
+        if (getConfig().getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED,
+            YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED)) {
+          timelineServiceEnabled = true;
+          timelineClient = mock(TimelineClient.class);
+          when(timelineClient.getDelegationToken(any(String.class)))
+              .thenReturn(dToken);
+          timelineClient.init(getConfig());
+          timelineService = TimelineUtils.buildTimelineTokenService(getConfig());
+        }
+        this.setConfig(conf);
+      }
+
+      @Override
+      protected void serviceStart() throws Exception {
+        rmClient = mock(ApplicationClientProtocol.class);
+      }
+
+      @Override
+      protected void serviceStop() throws Exception {
+      }
+
+      @Override
+      public ApplicationReport getApplicationReport(ApplicationId appId) {
+        ApplicationReport report = mock(ApplicationReport.class);
+        when(report.getYarnApplicationState())
+            .thenReturn(YarnApplicationState.SUBMITTED);
+        return report;
+      }
+
+      @Override
+      public boolean isSecurityEnabled() {
+        return true;
+      }
+    };
+    client.init(conf);
+    client.start();
+    ApplicationSubmissionContext context =
+        mock(ApplicationSubmissionContext.class);
+    ApplicationId applicationId = ApplicationId.newInstance(0, 1);
+    when(context.getApplicationId()).thenReturn(applicationId);
+    DataOutputBuffer dob = new DataOutputBuffer();
+    Credentials credentials = new Credentials();
+    credentials.writeTokenStorageToStream(dob);
+    ByteBuffer tokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+    ContainerLaunchContext clc = ContainerLaunchContext.newInstance(
+        null, null, null, null, tokens, null);
+    when(context.getAMContainerSpec()).thenReturn(clc);
+    client.submitApplication(context);
+    // Check whether token is added or not
+    credentials = new Credentials();
+    DataInputByteBuffer dibb = new DataInputByteBuffer();
+    tokens = clc.getTokens();
+    if (tokens != null) {
+      dibb.reset(tokens);
+      credentials.readTokenStorageStream(dibb);
+      tokens.rewind();
+    }
+    Collection<Token<? extends TokenIdentifier>> dTokens =
+        credentials.getAllTokens();
+    Assert.assertEquals(1, dTokens.size());
+    Assert.assertEquals(dToken, dTokens.iterator().next());
+    client.stop();
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/timeline/TimelineUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/timeline/TimelineUtils.java
index a62ed4869da47..02b5eb4eabdd9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/timeline/TimelineUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/timeline/TimelineUtils.java
@@ -19,9 +19,14 @@
 package org.apache.hadoop.yarn.util.timeline;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.security.SecurityUtil;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -78,4 +83,26 @@ public static String dumpTimelineRecordtoJSON(Object o, boolean pretty)
     }
   }
 
+  public static InetSocketAddress getTimelineTokenServiceAddress(
+      Configuration conf) {
+    InetSocketAddress timelineServiceAddr = null;
+    if (YarnConfiguration.useHttps(conf)) {
+      timelineServiceAddr = conf.getSocketAddr(
+          YarnConfiguration.TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS,
+          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS,
+          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_PORT);
+    } else {
+      timelineServiceAddr = conf.getSocketAddr(
+          YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS,
+          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_PORT);
+    }
+    return timelineServiceAddr;
+  }
+
+  public static Text buildTimelineTokenService(Configuration conf) {
+    InetSocketAddress timelineServiceAddr =
+        getTimelineTokenServiceAddress(conf);
+    return SecurityUtil.buildTokenService(timelineServiceAddr);
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/timeline/security/TimelineDelegationTokenSecretManagerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/timeline/security/TimelineDelegationTokenSecretManagerService.java
index fee9eb41cd80a..2808dac60dae6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/timeline/security/TimelineDelegationTokenSecretManagerService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/timeline/security/TimelineDelegationTokenSecretManagerService.java
@@ -34,6 +34,7 @@
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
+import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
 
 /**
  * The service wrapper of {@link TimelineDelegationTokenSecretManager}
@@ -65,17 +66,7 @@ protected void serviceInit(Configuration conf) throws Exception {
         3600000);
     secretManager.startThreads();
 
-    if (YarnConfiguration.useHttps(getConfig())) {
-      serviceAddr = getConfig().getSocketAddr(
-          YarnConfiguration.TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS,
-          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS,
-          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_PORT);
-    } else {
-      serviceAddr = getConfig().getSocketAddr(
-          YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
-          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS,
-          YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_PORT);
-    }
+    serviceAddr = TimelineUtils.getTimelineTokenServiceAddress(getConfig());
     super.init(conf);
   }"
6ebe0c30ec99df77b9d9260e8dda5d0d9a975877,kotlin,fix KT-9299 In a project with circular- dependencies between modules,c,https://github.com/JetBrains/kotlin,"diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt
index 2000ecc8421ce..7b9f68cef34b7 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager
 import org.jetbrains.kotlin.load.kotlin.getSourceElement
 import org.jetbrains.kotlin.load.kotlin.isContainedByCompiledPartOfOurModule
 import org.jetbrains.kotlin.modules.Module
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
 import org.jetbrains.kotlin.util.ModuleVisibilityHelper
@@ -44,8 +45,18 @@ class ModuleVisibilityHelperImpl : ModuleVisibilityHelper {
 
         val moduleVisibilityManager = ModuleVisibilityManager.SERVICE.getInstance(project)
 
+        fun findModule(kotlinFile: KtFile): Module? = moduleVisibilityManager.chunk.firstOrNull { it.getSourceFiles().containsRaw(kotlinFile.virtualFile.path) }
+
         val whatSource = getSourceElement(what)
-        if (whatSource is KotlinSourceElement) return true
+        if (whatSource is KotlinSourceElement) {
+            if (moduleVisibilityManager.chunk.size > 1 && fromSource is KotlinSourceElement) {
+                val fromSourceKotlinFile = fromSource.psi.getContainingJetFile()
+                val whatSourceKotlinFile = whatSource.psi.getContainingJetFile()
+                return findModule(whatSourceKotlinFile) === findModule(fromSourceKotlinFile)
+            }
+
+            return true
+        }
 
         moduleVisibilityManager.friendPaths.forEach {
             if (isContainedByCompiledPartOfOurModule(what, File(it))) return true
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
index 613aee751284c..338506b33d371 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.receivers.QualifierReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
+import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
 import org.jetbrains.kotlin.resolve.validation.SymbolUsageValidator
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.kotlin.utils.addToStdlib.check
@@ -122,11 +123,19 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa
         val importedReference = importDirective.importedReference ?: return null
         val path = importedReference.asQualifierPartList(trace)
         val lastPart = path.lastOrNull() ?: return null
+        val packageFragmentForCheck =
+                if (packageFragmentForVisibilityCheck is DeclarationDescriptorWithSource && packageFragmentForVisibilityCheck.source == SourceElement.NO_SOURCE) {
+                    PackageFragmentWithCustomSource(packageFragmentForVisibilityCheck, KotlinSourceElement(importDirective.getContainingJetFile()))
+                }
+
+                else {
+                    packageFragmentForVisibilityCheck
+                }
 
         if (!importDirective.isAllUnder) {
-            return processSingleImport(moduleDescriptor, trace, importDirective, path, lastPart, packageFragmentForVisibilityCheck)
+            return processSingleImport(moduleDescriptor, trace, importDirective, path, lastPart, packageFragmentForCheck)
         }
-        val packageOrClassDescriptor = resolveToPackageOrClass(path, moduleDescriptor, trace, packageFragmentForVisibilityCheck,
+        val packageOrClassDescriptor = resolveToPackageOrClass(path, moduleDescriptor, trace, packageFragmentForCheck,
                                                                scopeForFirstPart = null, inImport = true) ?: return null
         if (packageOrClassDescriptor is ClassDescriptor && packageOrClassDescriptor.kind.isSingleton) {
             trace.report(Errors.CANNOT_ALL_UNDER_IMPORT_FROM_SINGLETON.on(lastPart.expression, packageOrClassDescriptor)) // todo report on star
@@ -398,8 +407,17 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa
             symbolUsageValidator.validateTypeUsage(descriptor, trace, referenceExpression)
         }
 
-        if (descriptor is DeclarationDescriptorWithVisibility && !isVisible(descriptor, shouldBeVisibleFrom, inImport)) {
-            trace.report(Errors.INVISIBLE_REFERENCE.on(referenceExpression, descriptor, descriptor.visibility, descriptor))
+        if (descriptor is DeclarationDescriptorWithVisibility) {
+            val fromToCheck =
+                if (shouldBeVisibleFrom is PackageFragmentDescriptor && shouldBeVisibleFrom.source == SourceElement.NO_SOURCE) {
+                    PackageFragmentWithCustomSource(shouldBeVisibleFrom, KotlinSourceElement(referenceExpression.getContainingJetFile()))
+                }
+                else {
+                    shouldBeVisibleFrom
+                }
+            if (!isVisible(descriptor, fromToCheck, inImport)) {
+                trace.report(Errors.INVISIBLE_REFERENCE.on(referenceExpression, descriptor, descriptor.visibility, descriptor))
+            }
         }
 
         if (isQualifier) {
@@ -429,3 +447,11 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa
         return Visibilities.isVisible(ReceiverValue.IRRELEVANT_RECEIVER, descriptor, shouldBeVisibleFrom)
     }
 }
+
+/*
+    This purpose of this class is to pass information about source file for current package fragment in order for check visibilities between modules
+    (see ModuleVisibilityHelperImpl.isInFriendModule).
+ */
+private class PackageFragmentWithCustomSource(private val original: PackageFragmentDescriptor, private val source: SourceElement) : PackageFragmentDescriptor by original {
+    override fun getSource(): SourceElement = source
+}
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 00730fed6a476..896dbdd010d82 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -79,6 +79,18 @@ public void testSimpleDependency() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata(""simpleDependencyErrorOnAccessToInternal1"")
+        public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata(""jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"");
+            doTest(fileName);
+        }
+
+        @TestMetadata(""simpleDependencyErrorOnAccessToInternal2"")
+        public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata(""jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"");
+            doTest(fileName);
+        }
+
         @TestMetadata(""simpleDependencyUnchanged"")
         public void testSimpleDependencyUnchanged() throws Exception {
             String fileName = JetTestUtils.navigationMetadata(""jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"");
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index f5fe840ffaaa4..b4264cd694ac8 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -494,20 +494,14 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         initProject()
         val result = makeAll()
         result.assertFailed()
-
-        val actualErrors = result.getMessages(BuildMessage.Kind.ERROR)
-                .map { it as CompilerMessage }
-                .map { ""${it.messageText} at line ${it.line}, column ${it.column}"" }.sorted().joinToString(""\n"")
-        val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + ""general/"" + getTestName(false))
-        val expectedFile = File(projectRoot, ""errors.txt"")
-        JetTestUtils.assertEqualsToFile(expectedFile, actualErrors)
+        result.checkErrors()
     }
 
-    // TODO See KT-9299 In a project with circular dependencies between modules, IDE reports error on use of internal class from another module, but the corresponding code still compiles and runs.
     public fun testCircularDependenciesInternalFromAnotherModule() {
         initProject()
         val result = makeAll()
-        result.assertSuccessful()
+        result.assertFailed()
+        result.checkErrors()
     }
 
     public fun testCircularDependencyWithReferenceToOldVersionLib() {
@@ -679,6 +673,15 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         assertFalse(File(storageRoot, ""targets/java-production/module2/kotlin"").exists())
     }
 
+    private fun BuildResult.checkErrors() {
+        val actualErrors = getMessages(BuildMessage.Kind.ERROR)
+                .map { it as CompilerMessage }
+                .map { ""${it.messageText} at line ${it.line}, column ${it.column}"" }.sorted().joinToString(""\n"")
+        val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + ""general/"" + getTestName(false))
+        val expectedFile = File(projectRoot, ""errors.txt"")
+        JetTestUtils.assertEqualsToFile(expectedFile, actualErrors)
+    }
+
     private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) {
         val scopeBuilder = CompileScopeTestBuilder.make().all()
         val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger))
diff --git a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
new file mode 100644
index 0000000000000..331aaf1316d76
--- /dev/null
+++ b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
@@ -0,0 +1,7 @@
+'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14
+Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13
+Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36
+Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15
+Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2
+Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7
+Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
diff --git a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt
index 30fcc94d78088..9a7bdb153a3d6 100644
--- a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt
+++ b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt
@@ -2,9 +2,18 @@ package test
 
 internal open class InternalClass1
 
+@Target(AnnotationTarget.FILE)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalFileAnnotation()
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalClassAnnotation()
+
 abstract class ClassA1(internal val member: Int)
 
 abstract class ClassB1 {
     internal abstract val member: Int
 }
 
+class ClassD: InternalClass2()
\ No newline at end of file
diff --git a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt
index 1f1647ddad4dc..ece01121bd2cc 100644
--- a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt
+++ b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt
@@ -1,11 +1,13 @@
-// ERROR: 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it
-// ERROR: Cannot access 'InternalClass1': it is 'internal' in 'test'
-// ERROR: Cannot access 'member': it is 'invisible_fake' in 'ClassAA1'
+@file:InternalFileAnnotation
+
 package test
 
+import test.InternalClass1
+
 // InternalClass1, ClassA1, ClassB1 are in module1
 class ClassInheritedFromInternal1: InternalClass1()
 
+@InternalClassAnnotation
 class ClassAA1 : ClassA1(10)
 
 class ClassBB1 : ClassB1() {
diff --git a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
index 13cd0c3cbf138..2fae260968a70 100644
--- a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
@@ -1,4 +1,6 @@
-'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 11, column 14
-Cannot access 'InternalClass1': it is 'internal' in 'test' at line 3, column 13
-Cannot access 'InternalClass1': it is 'internal' in 'test' at line 6, column 36
-Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 24, column 25
\ No newline at end of file
+'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14
+Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13
+Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36
+Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2
+Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7
+Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
diff --git a/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt
index 30fcc94d78088..e2fc0309302f5 100644
--- a/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt
+++ b/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt
@@ -1,4 +1,13 @@
 package test
+@Target(AnnotationTarget.FILE)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalTestAnnotation()
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalClassAnnotation()
+
+private class PrivateClass1
 
 internal open class InternalClass1
 
diff --git a/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt
index 64f4bb6cf1f45..155a4c3a341a9 100644
--- a/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt
+++ b/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt
@@ -1,3 +1,5 @@
+@file:InternalTestAnnotation
+
 package test
 
 import test.InternalClass1
@@ -5,6 +7,7 @@ import test.InternalClass1
 // InternalClass1, ClassA1, ClassB1 are in module1
 class ClassInheritedFromInternal1: InternalClass1()
 
+@InternalClassAnnotation
 class ClassAA1 : ClassA1(10)
 
 class ClassBB1 : ClassB1() {
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
new file mode 100644
index 0000000000000..df01db10bfd62
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
@@ -0,0 +1,26 @@
+Cleaning output files:
+out/production/module1/META-INF/module1.kotlin_module
+out/production/module1/a/A.class
+out/production/module1/a/ClassAnnotation.class
+out/production/module1/a/FileAnnotation.class
+out/production/module1/a/Module1_aKt.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+End of files
+Cleaning output files:
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/b/B.class
+out/production/module2/b/Module2_bKt.class
+End of files
+Compiling files:
+module2/src/module2_b.kt
+End of files
+COMPILATION FAILED
+Cannot access 'FileAnnotation': it is 'internal' in 'a'
+Cannot access 'A': it is 'internal' in 'a'
+Cannot access 'FileAnnotation': it is 'internal' in 'a'
+Cannot access 'ClassAnnotation': it is 'internal' in 'a'
+Cannot access 'ClassAnnotation': it is 'internal' in 'a'
+Cannot access 'A': it is 'internal' in 'a'
+Cannot access 'a': it is 'internal' in 'a'
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
new file mode 100644
index 0000000000000..827bf04cc589b
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
@@ -0,0 +1,2 @@
+module1->
+module2->module1
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
new file mode 100644
index 0000000000000..621ede2ee51bf
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
@@ -0,0 +1,14 @@
+package a
+
+@Target(AnnotationTarget.FILE)
+@Retention(AnnotationRetention.SOURCE)
+annotation class FileAnnotation()
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class ClassAnnotation()
+
+class A
+
+fun a() {
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
new file mode 100644
index 0000000000000..e514959008cac
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
@@ -0,0 +1,15 @@
+package a
+
+@Target(AnnotationTarget.FILE)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class FileAnnotation()
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class ClassAnnotation()
+
+internal class A
+
+internal fun a(): String {
+    return "":)""
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
new file mode 100644
index 0000000000000..9573f5d051783
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
@@ -0,0 +1,13 @@
+@file:FileAnnotation
+package b
+
+import a.A
+import a.FileAnnotation
+import a.ClassAnnotation
+
+@ClassAnnotation
+class B
+
+fun b(param: a.A) {
+    a.a()
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
new file mode 100644
index 0000000000000..c4fab8fb00b47
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
@@ -0,0 +1,5 @@
+package c
+
+fun c() {
+    // This file doesn't use anything from module1, so it won't be recompiled after change
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log
new file mode 100644
index 0000000000000..1a5350845e0b1
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log
@@ -0,0 +1,26 @@
+Cleaning output files:
+out/production/module1/META-INF/module1.kotlin_module
+out/production/module1/a/A.class
+out/production/module1/a/InternalA.class
+out/production/module1/a/InternalClassAnnotation.class
+out/production/module1/a/InternalFileAnnotation.class
+out/production/module1/a/Module1_aKt.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+End of files
+Cleaning output files:
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/b/B.class
+out/production/module2/b/Module2_bKt.class
+End of files
+Compiling files:
+module2/src/module2_b.kt
+End of files
+COMPILATION FAILED
+Cannot access 'InternalFileAnnotation': it is 'internal' in 'a'
+Cannot access 'InternalFileAnnotation': it is 'internal' in 'a'
+Cannot access 'InternalClassAnnotation': it is 'internal' in 'a'
+Cannot access 'InternalClassAnnotation': it is 'internal' in 'a'
+Unresolved reference: InternalA
+Unresolved reference: internalA
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
new file mode 100644
index 0000000000000..827bf04cc589b
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
@@ -0,0 +1,2 @@
+module1->
+module2->module1
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
new file mode 100644
index 0000000000000..e7392045a0bc3
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
@@ -0,0 +1,19 @@
+package a
+
+@Target(AnnotationTarget.FILE)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalFileAnnotation()
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalClassAnnotation()
+
+class A
+
+internal class InternalA
+
+fun a() {
+}
+
+internal fun internalA() {
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
new file mode 100644
index 0000000000000..bc69686475069
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
@@ -0,0 +1,19 @@
+package a
+
+@Target(AnnotationTarget.FILE)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalFileAnnotation()
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+internal annotation class InternalClassAnnotation()
+
+class A
+
+internal class AA
+
+fun a() {
+}
+
+internal fun aa() {
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
new file mode 100644
index 0000000000000..436721358e970
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
@@ -0,0 +1,7 @@
+package b
+
+class B
+
+fun b(param: a.A) {
+    a.a()
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
new file mode 100644
index 0000000000000..961d6541b9c5a
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
@@ -0,0 +1,12 @@
+@file:InternalFileAnnotation
+package b
+
+import a.InternalFileAnnotation
+import a.InternalClassAnnotation
+
+@InternalClassAnnotation
+class B
+
+fun b(param: a.InternalA) {
+    a.internalA()
+}
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
new file mode 100644
index 0000000000000..c4fab8fb00b47
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
@@ -0,0 +1,5 @@
+package c
+
+fun c() {
+    // This file doesn't use anything from module1, so it won't be recompiled after change
+}
\ No newline at end of file"
aa30bba068584f0a343d986de20c7d8a62037b2e,intellij-community,method return fix should not touch super method- formal parameters--,c,https://github.com/JetBrains/intellij-community,"diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java
index a29204cd117f6..9ac74c5efa5ae 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java
@@ -21,16 +21,20 @@
 import com.intellij.ide.util.SuperMethodWarningUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.undo.UndoUtil;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiType;
+import com.intellij.psi.*;
+import com.intellij.psi.search.LocalSearchScope;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor;
+import com.intellij.refactoring.typeMigration.TypeMigrationLabeler;
+import com.intellij.refactoring.typeMigration.TypeMigrationProcessor;
+import com.intellij.refactoring.typeMigration.TypeMigrationRules;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class MethodReturnFix extends IntentionAndQuickFixAction {
   private final PsiMethod myMethod;
@@ -74,6 +78,8 @@ public void applyFix(final Project project, final PsiFile file, final Editor edi
       if (superMethod != null) {
         final PsiType superReturnType = superMethod.getReturnType();
         if (superReturnType != null && !Comparing.equal(myReturnType, superReturnType)) {
+          final PsiClass psiClass = PsiUtil.resolveClassInType(superReturnType);
+          if (psiClass instanceof PsiTypeParameter && changeClassTypeArgument(project, (PsiTypeParameter)psiClass)) return;
           method = SuperMethodWarningUtil.checkSuperMethod(myMethod, RefactoringBundle.message(""to.refactor""));
           if (method == null) return;
         }
@@ -86,15 +92,67 @@ public void applyFix(final Project project, final PsiFile file, final Editor edi
         method.getName(),
         myReturnType,
         RemoveUnusedParameterFix.getNewParametersInfo(method, null));
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
-      processor.run();
+    processor.run();
+    if (method.getContainingFile() != file) {
+      UndoUtil.markPsiFileForUndo(file);
     }
-    else {
+  }
+
+  private boolean changeClassTypeArgument(Project project, PsiTypeParameter typeParameter) {
+    final PsiTypeParameterListOwner owner = typeParameter.getOwner();
+    if (owner instanceof PsiClass) {
+      final PsiClass derivedClass = myMethod.getContainingClass();
+      if (derivedClass == null) return true;
+      PsiType returnType = myReturnType;
+      if (returnType instanceof PsiPrimitiveType) {
+        returnType = ((PsiPrimitiveType)returnType).getBoxedType(derivedClass);
+      }
+      final PsiSubstitutor superClassSubstitutor =
+        TypeConversionUtil.getSuperClassSubstitutor((PsiClass)owner, derivedClass, PsiSubstitutor.EMPTY);
+      final PsiSubstitutor substitutor = superClassSubstitutor.put(typeParameter, returnType);
+      final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(derivedClass));
+      rules.setMigrationRootType(JavaPsiFacade.getElementFactory(project).createType(((PsiClass)owner), substitutor));
+      rules.setBoundScope(new LocalSearchScope(derivedClass));
+
+      final PsiReferenceParameterList referenceParameterList = findTypeArgumentsList(owner, derivedClass);
+      if (referenceParameterList == null) return true;
+      final TypeMigrationProcessor processor = new TypeMigrationProcessor(project, referenceParameterList, rules);
+      processor.setPreviewUsages(!ApplicationManager.getApplication().isUnitTestMode());
       processor.run();
+      return true;
     }
-    if (method.getContainingFile() != file) {
-      UndoUtil.markPsiFileForUndo(file);
+    return false;
+  }
+
+  @Nullable
+  private static PsiReferenceParameterList findTypeArgumentsList(final PsiTypeParameterListOwner owner, final PsiClass derivedClass) {
+    PsiReferenceParameterList referenceParameterList = null;
+    if (derivedClass instanceof PsiAnonymousClass) {
+      referenceParameterList = ((PsiAnonymousClass)derivedClass).getBaseClassReference().getParameterList();
+    } else {
+      final PsiReferenceList implementsList = derivedClass.getImplementsList();
+      if (implementsList != null) {
+        referenceParameterList = extractReferenceParameterList(owner, implementsList);
+      }
+      if (referenceParameterList == null) {
+        final PsiReferenceList extendsList = derivedClass.getExtendsList();
+        if (extendsList != null) {
+          referenceParameterList = extractReferenceParameterList(owner, extendsList);
+        }
+      }
+    }
+    return referenceParameterList;
+  }
+
+  @Nullable
+  private static PsiReferenceParameterList extractReferenceParameterList(final PsiTypeParameterListOwner owner,
+                                                                         final PsiReferenceList extendsList) {
+    for (PsiJavaCodeReferenceElement referenceElement : extendsList.getReferenceElements()) {
+      if (referenceElement.resolve() == owner) {
+        return referenceElement.getParameterList();
+      }
     }
+    return null;
   }
 
 }
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java
index 999a9d6f3bb1c..9f78f9d47e37e 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java
@@ -8,12 +8,11 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
-import com.intellij.psi.search.searches.OverridingMethodsSearch;
 import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.InheritanceUtil;
+import com.intellij.psi.util.MethodSignatureUtil;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.typeMigration.usageInfo.TypeMigrationUsageInfo;
-import com.intellij.util.Query;
 
 import java.util.*;
 
@@ -135,15 +134,15 @@ private static Map<PsiClass, PsiTypeParameter[]> getTypeParametersHierarchy(fina
    */
   private void prepareMethodsChangeSignature(final PsiClass currentClass, final PsiElement memberToChangeSignature, final PsiType memberType) {
     if (memberToChangeSignature instanceof PsiMethod) {
-      final Query<PsiMethod> methodQuery = OverridingMethodsSearch.search(((PsiMethod)memberToChangeSignature), currentClass.getUseScope(), true);
-      for (PsiMethod method : methodQuery) {
-         myLabeler.addRoot(new TypeMigrationUsageInfo(method), memberType, method, false);
+      final PsiMethod method = MethodSignatureUtil.findMethodBySuperMethod(currentClass, (PsiMethod)memberToChangeSignature, true);
+      if (method.getContainingClass() == currentClass) {
+        myLabeler.addRoot(new TypeMigrationUsageInfo(method), memberType, method, false);
       }
     } else if (memberToChangeSignature instanceof PsiParameter && ((PsiParameter)memberToChangeSignature).getDeclarationScope() instanceof PsiMethod) {
       final PsiMethod superMethod = (PsiMethod)((PsiParameter)memberToChangeSignature).getDeclarationScope();
       final int parameterIndex = superMethod.getParameterList().getParameterIndex((PsiParameter)memberToChangeSignature);
-      final Query<PsiMethod> methodQuery = OverridingMethodsSearch.search(superMethod, currentClass.getUseScope(), true);
-      for (PsiMethod method : methodQuery) {
+      final PsiMethod method = MethodSignatureUtil.findMethodBySuperMethod(currentClass, superMethod, true);
+      if (method.getContainingClass() == currentClass) {
         final PsiParameter parameter = method.getParameterList().getParameters()[parameterIndex];
         myLabeler.addRoot(new TypeMigrationUsageInfo(parameter), memberType, parameter, false);
       }
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
index c1a88667de4b5..b1f85817e46b5 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
@@ -540,7 +540,7 @@ void setConversionMapping(final PsiExpression expression, final Object obj) {
   }
 
   public PsiReference[] markRootUsages(final PsiElement element, final PsiType migrationType) {
-    return markRootUsages(element, migrationType, ReferencesSearch.search(element, element.getUseScope(), false).toArray(new PsiReference[0]));
+    return markRootUsages(element, migrationType, ReferencesSearch.search(element, myRules.getSearchScope(), false).toArray(new PsiReference[0]));
   }
 
   PsiReference[] markRootUsages(final PsiElement element, final PsiType migrationType, final PsiReference[] refs) {"
c89fd1affbdc22f46722b5396fe680e5b8ac10ae,Search_api,"Issue #2114593 by drunken monkey: Added list of floats to test module.
",a,https://github.com/lucidworks/drupal_search_api,"diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cd91ac61..0fbbaa17 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 Search API 1.x, dev (xx/xx/xxxx):
 ---------------------------------
+- #2114593 by drunken monkey: Added list of floats to test module.
 - #2109247 by mmikitka, drunken monkey: Exposed the status and module
   properties to Entity API.
 - #2091499 by sammys, drunken monkey: Added Views contextual filter handler for
diff --git a/tests/search_api_test.install b/tests/search_api_test.install
index 8dea6ebc..2db73bb2 100644
--- a/tests/search_api_test.install
+++ b/tests/search_api_test.install
@@ -39,7 +39,13 @@ function search_api_test_schema() {
         'description' => 'A comma separated list of keywords.',
         'type' => 'varchar',
         'length' => 200,
-       'not null' => FALSE,
+        'not null' => FALSE,
+      ),
+      'prices' => array(
+        'description' => 'A comma separated list of prices.',
+        'type' => 'varchar',
+        'length' => 200,
+        'not null' => FALSE,
       ),
     ),
     'primary key' => array('id'),
diff --git a/tests/search_api_test.module b/tests/search_api_test.module
index 67e33920..8a4ff828 100644
--- a/tests/search_api_test.module
+++ b/tests/search_api_test.module
@@ -46,6 +46,9 @@ function search_api_test_insert_item(array $form, array &$form_state) {
     'keywords' => array(
       '#type' => 'textfield',
     ),
+    'prices' => array(
+      '#type' => 'textfield',
+    ),
     'submit' => array(
       '#type' => 'submit',
       '#value' => t('Save'),
@@ -74,7 +77,7 @@ function search_api_test_load($id) {
  * Menu callback for displaying search_api_test entities.
  */
 function search_api_test_view($entity) {
-  return array('text' => nl2br(check_plain(print_r($entity, TRUE))));
+  return nl2br(check_plain(print_r($entity, TRUE)));
 }
 
 /**
@@ -169,6 +172,12 @@ function search_api_test_entity_property_info() {
       'description' => 'An optional collection of keywords describing the item.',
       'getter callback' => 'search_api_test_list_callback',
     ),
+    'prices' => array(
+      'label' => 'Prices',
+      'type' => 'list<decimal>',
+      'description' => 'An optional list of prices.',
+      'getter callback' => 'search_api_test_list_callback',
+    ),
   );
 
   return $info;
@@ -193,13 +202,17 @@ function search_api_test_parent($entity) {
 /**
  * List callback.
  */
-function search_api_test_list_callback($data) {
-  //return is_array($entity->keywords) ? $entity->keywords : explode(',', $entity->keywords);
+function search_api_test_list_callback($data, array $options, $name) {
   if (is_array($data)) {
-    $res = is_array($data['keywords']) ? $data['keywords'] : explode(',', $data['keywords']);
+    $res = is_array($data[$name]) ? $data[$name] : explode(',', $data[$name]);
   }
   else {
-    $res = is_array($data->keywords) ? $data->keywords : explode(',', $data->keywords);
+    $res = is_array($data->$name) ? $data->$name : explode(',', $data->$name);
+  }
+  if ($name == 'prices') {
+    foreach ($res as &$x) {
+      $x = (float) $x;
+    }
   }
   return array_filter($res);
 }"
5719e4098bc7fc5401d567284d1187d43304f03e,hbase,HBASE-11865 Result implements CellScannable;- rather it should BE a CellScanner--,p,https://github.com/apache/hbase,"diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
index 74faab21b9e4..c6adabec86b6 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
@@ -58,20 +58,23 @@
  *
  * To get the latest value for a specific family and qualifier use {@link #getValue(byte[], byte[])}.
  *
- * A Result is backed by an array of {@link KeyValue} objects, each representing
+ * A Result is backed by an array of {@link Cell} objects, each representing
  * an HBase cell defined by the row, family, qualifier, timestamp, and value.<p>
  *
- * The underlying {@link KeyValue} objects can be accessed through the method {@link #listCells()}.
- * Each KeyValue can then be accessed through
- * {@link KeyValue#getRow()}, {@link KeyValue#getFamily()}, {@link KeyValue#getQualifier()},
- * {@link KeyValue#getTimestamp()}, and {@link KeyValue#getValue()}.<p>
+ * The underlying {@link Cell} objects can be accessed through the method {@link #listCells()}.
+ * This will create a List from the internal Cell []. Better is to exploit the fact that
+ * a new Result instance is a primed {@link CellScanner}; just call {@link #advance()} and
+ * {@link #current()} to iterate over Cells as you would any {@link CellScanner}.
+ * Call {@link #cellScanner()} to reset should you need to iterate the same Result over again
+ * ({@link CellScanner}s are one-shot).
  *
- * If you need to overwrite a Result with another Result instance -- as in the old 'mapred' RecordReader next
- * invocations -- then create an empty Result with the null constructor and in then use {@link #copyFrom(Result)}
+ * If you need to overwrite a Result with another Result instance -- as in the old 'mapred'
+ * RecordReader next invocations -- then create an empty Result with the null constructor and
+ * in then use {@link #copyFrom(Result)}
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
-public class Result implements CellScannable {
+public class Result implements CellScannable, CellScanner {
   private Cell[] cells;
   private Boolean exists; // if the query was just to check existence.
   private boolean stale = false;
@@ -86,6 +89,13 @@ public class Result implements CellScannable {
   private static final int PAD_WIDTH = 128;
   public static final Result EMPTY_RESULT = new Result();
 
+  private final static int INITIAL_CELLSCANNER_INDEX = -1;
+
+  /**
+   * Index for where we are when Result is acting as a {@link CellScanner}.
+   */
+  private int cellScannerIndex = INITIAL_CELLSCANNER_INDEX;
+
   /**
    * Creates an empty Result w/ no KeyValue payload; returns null if you call {@link #rawCells()}.
    * Use this to represent no results if <code>null</code> won't do or in old 'mapred' as oppposed to 'mapreduce' package
@@ -827,7 +837,21 @@ public void copyFrom(Result other) {
 
   @Override
   public CellScanner cellScanner() {
-    return CellUtil.createCellScanner(this.cells);
+    // Reset
+    this.cellScannerIndex = INITIAL_CELLSCANNER_INDEX;
+    return this;
+  }
+
+  @Override
+  public Cell current() {
+    if (cells == null) return null;
+    return (cellScannerIndex < 0)? null: this.cells[cellScannerIndex];
+  }
+
+  @Override
+  public boolean advance() {
+    if (cells == null) return false;
+    return ++cellScannerIndex < this.cells.length;
   }
 
   public Boolean getExists() {
@@ -846,5 +870,4 @@ public void setExists(Boolean exists) {
   public boolean isStale() {
     return stale;
   }
-
-}
+}
\ No newline at end of file
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
index 74563f0f17ba..a0e1a45718c1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
@@ -21,6 +21,7 @@
 
 import static org.apache.hadoop.hbase.HBaseTestCase.assertByteEquals;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;
@@ -30,6 +31,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.SmallTests;
@@ -60,6 +62,31 @@ static KeyValue[] genKVs(final byte[] row, final byte[] family,
   static final byte [] family = Bytes.toBytes(""family"");
   static final byte [] value = Bytes.toBytes(""value"");
 
+  /**
+   * Run some tests to ensure Result acts like a proper CellScanner.
+   * @throws IOException
+   */
+  public void testResultAsCellScanner() throws IOException {
+    Cell [] cells = genKVs(row, family, value, 1, 10);
+    Arrays.sort(cells, KeyValue.COMPARATOR);
+    Result r = Result.create(cells);
+    assertSame(r, cells);
+    // Assert I run over same result multiple times.
+    assertSame(r.cellScanner(), cells);
+    assertSame(r.cellScanner(), cells);
+    // Assert we are not creating new object when doing cellscanner
+    assertTrue(r == r.cellScanner());
+  }
+
+  private void assertSame(final CellScanner cellScanner, final Cell [] cells) throws IOException {
+    int count = 0;
+    while (cellScanner.advance()) {
+      assertTrue(cells[count].equals(cellScanner.current()));
+      count++;
+    }
+    assertEquals(cells.length, count);
+  }
+
   public void testBasicGetColumn() throws Exception {
     KeyValue [] kvs = genKVs(row, family, value, 1, 100);"
887139648d2e693bb50f286810231150bf1fba9f,drools,BZ-986000 - DRL-to-RuleModel marshalling- improvements--,p,https://github.com/kiegroup/drools,"diff --git a/drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceImpl.java b/drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceImpl.java
index 069fea6cbb3..bfb2af28075 100644
--- a/drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceImpl.java
+++ b/drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceImpl.java
@@ -740,8 +740,10 @@ public void generateSeparator( FieldConstraint constr,
             if ( !gctx.isHasOutput() ) {
                 return;
             }
-            if ( gctx.getDepth() == 0 ) {
-                buf.append( "", "" );
+            if ( gctx.getDepth() == 0  ) {
+                if (buf.length() > 2 && !(buf.charAt(buf.length() - 2) == ',')) {
+                    buf.append("", "");
+                }
             } else {
                 CompositeFieldConstraint cconstr = (CompositeFieldConstraint) gctx.getParent().getFieldConstraint();
                 buf.append( cconstr.getCompositeJunctionType() + "" "" );
@@ -800,18 +802,18 @@ private void generateSingleFieldConstraint( final SingleFieldConstraint constr,
                 assertConstraintValue( constr );
 
                 if ( isConstraintComplete( constr ) ) {
-                    SingleFieldConstraint parent = (SingleFieldConstraint) constr.getParent();
-                    StringBuilder parentBuf = new StringBuilder();
-                    while ( parent != null ) {
-                        String fieldName = parent.getFieldName();
-                        parentBuf.insert( 0,
-                                          fieldName + ""."" );
-                        parent = (SingleFieldConstraint) parent.getParent();
-                    }
-                    buf.append( parentBuf );
                     if ( constr instanceof SingleFieldConstraintEBLeftSide ) {
                         buf.append( ( (SingleFieldConstraintEBLeftSide) constr ).getExpressionLeftSide().getText() );
                     } else {
+                        SingleFieldConstraint parent = (SingleFieldConstraint) constr.getParent();
+                        StringBuilder parentBuf = new StringBuilder();
+                        while ( parent != null ) {
+                            String fieldName = parent.getFieldName();
+                            parentBuf.insert( 0,
+                                    fieldName + ""."" );
+                            parent = (SingleFieldConstraint) parent.getParent();
+                        }
+                        buf.append( parentBuf );
                         String fieldName = constr.getFieldName();
                         buf.append( fieldName );
                     }
diff --git a/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java b/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java
index a2b7bfaa608..71e2ede3d3f 100644
--- a/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java
+++ b/drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java
@@ -275,7 +275,6 @@ public void testSumAsGivenValue() {
     }
 
     @Test
-    @Ignore
     public void testNotNull() {
         String expected = """" +
                 ""rule \""my rule\"" \n"" +
@@ -284,6 +283,37 @@ public void testNotNull() {
                 ""    Customer( contact != null , contact.tel1 > 15 )\n"" +
                 ""  then\n"" +
                 ""end\n"";
+
+        PackageDataModelOracle dmo = mock(PackageDataModelOracle.class);
+        when(
+                dmo.getProjectModelFields()
+        ).thenReturn(
+                new HashMap<String, ModelField[]>() {{
+                    put(""Customer"",
+                            new ModelField[]{
+                                    new ModelField(
+                                            ""contact"",
+                                            ""Contact"",
+                                            ModelField.FIELD_CLASS_TYPE.TYPE_DECLARATION_CLASS,
+                                            ModelField.FIELD_ORIGIN.DECLARED,
+                                            FieldAccessorsAndMutators.BOTH,
+                                            ""Contact""
+                                    )
+                            });
+                    put(""Contact"",
+                            new ModelField[]{
+                                    new ModelField(
+                                            ""tel1"",
+                                            ""Integer"",
+                                            ModelField.FIELD_CLASS_TYPE.TYPE_DECLARATION_CLASS,
+                                            ModelField.FIELD_ORIGIN.DECLARED,
+                                            FieldAccessorsAndMutators.BOTH,
+                                            ""Integer""
+                                    )
+                            });
+                }}
+        );
+
         final RuleModel m = new RuleModel();
 
         FactPattern factPattern = new FactPattern();
@@ -304,7 +334,7 @@ public void testNotNull() {
 
         m.name = ""my rule"";
 
-        checkMarshallUnmarshall(expected, m);
+        checkMarshallUnmarshall(expected, m, dmo);
     }
 
     @Test"
c3a15cce343f994c2d5d9fccca4d8e3b226422c5,Valadoc,"gtk-importer: Allow ""struct [id]*] inside docbook type tags
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index e044bd4635..dfea4b1a86 100644
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -455,6 +455,15 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 
 		InlineTaglet? taglet = null;
 
+		if (current.type == TokenType.WORD && current.content == ""struct"") {
+			next ();
+
+			if (next ().type == TokenType.SPACE) {
+				next ();
+			}
+		}
+
+
 		if (current.type == TokenType.GTKDOC_FUNCTION || current.type == TokenType.GTKDOC_CONST || current.type == TokenType.GTKDOC_TYPE || current.type == TokenType.WORD || current.type == TokenType.GTKDOC_PROPERTY || current.type == TokenType.GTKDOC_SIGNAL) {
 			taglet = this.create_type_link (current.content) as InlineTaglet;
 			assert (taglet != null);"
384542ccb54c28d73d9f368f2375ef60d99127ac,restlet-framework-java,        - Fixed error in Conditions.getStatus()- sometimes returning           304 for methods other than HEAD and GET.- Contributed by           Stephan Koops.--,c,https://github.com/restlet/restlet-framework-java,"diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
index e78b997580..783366ca6f 100644
--- a/build/tmpl/text/changes.txt
+++ b/build/tmpl/text/changes.txt
@@ -33,6 +33,9 @@ Changes log
           the parent resource has no 'id' attribute. Also supports
           root resources with no leading slash. Patches contributed 
           by Vincent Ricard.
+        - Fixed error in Conditions.getStatus() sometimes returning
+          304 for methods other than HEAD and GET. Contributed by
+          Stephan Koops.
     - Misc
         - Updated db4o to version 7.4.58.
         - Updated FreeMarker to version 2.3.14.
diff --git a/modules/org.restlet/src/org/restlet/data/Conditions.java b/modules/org.restlet/src/org/restlet/data/Conditions.java
index 0c717a46ff..d862e06a5e 100644
--- a/modules/org.restlet/src/org/restlet/data/Conditions.java
+++ b/modules/org.restlet/src/org/restlet/data/Conditions.java
@@ -233,7 +233,11 @@ public Status getStatus(Method method, Representation representation) {
                                 .getModificationDate()));
 
                 if (!isModifiedSince) {
-                    result = Status.REDIRECTION_NOT_MODIFIED;
+                    if (Method.GET.equals(method) || Method.HEAD.equals(method)) {
+                        result = Status.REDIRECTION_NOT_MODIFIED;
+                    } else {
+                        result = Status.CLIENT_ERROR_PRECONDITION_FAILED;
+                    }
                 }
             }
         }
diff --git a/modules/org.restlet/src/org/restlet/data/Request.java b/modules/org.restlet/src/org/restlet/data/Request.java
index cc2e0ed6ad..9c81cbd5d5 100644
--- a/modules/org.restlet/src/org/restlet/data/Request.java
+++ b/modules/org.restlet/src/org/restlet/data/Request.java
@@ -509,9 +509,11 @@ public void setOriginalRef(Reference originalRef) {
     /**
      * Sets the ranges to return from the target resource's representation.
      * 
+     * @param ranges
+     *            The ranges.
      */
-    public void setRanges(List<Range> range) {
-        this.ranges = range;
+    public void setRanges(List<Range> ranges) {
+        this.ranges = ranges;
     }
 
     /**"
4405698ee99fe26d0ac9317a2df96096f2731a7b,hbase,HBASE-7703 Eventually all online snapshots fail- due to Timeout at same regionserver.--Online snapshot attempts would fail due to timeout because a rowlock could not be obtained.  Prior to this a-cancellation occurred which likely grabbed the lock without cleaning it properly. The fix here is to use nice cancel-instead of interrupting cancel on failures.----git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290@1445866 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hbase,"diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java
index 3e5238e7b281..1282585d52eb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java
@@ -347,7 +347,11 @@ void cancelTasks() throws InterruptedException {
       Collection<Future<Void>> tasks = futures;
       LOG.debug(""cancelling "" + tasks.size() + "" tasks for snapshot "" + name);
       for (Future<Void> f: tasks) {
-        f.cancel(true);
+        // TODO Ideally we'd interrupt hbase threads when we cancel.  However it seems that there
+        // are places in the HBase code where row/region locks are taken and not released in a
+        // finally block.  Thus we cancel without interrupting.  Cancellations will be slower to
+        // complete but we won't suffer from unreleased locks due to poor code discipline.
+        f.cancel(false);
       }
 
       // evict remaining tasks and futures from taskPool."
8b9ffeb5f2883e3d5187ad2f4a3a35540ff70326,drools,JBRULES-527: fixing compilation problems--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@6992 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java b/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
index 3242224b102..90471a806f0 100644
--- a/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
+++ b/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
@@ -1,10 +1,14 @@
 package org.drools.reteoo;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.drools.util.TupleHashTable;
 
 public class BetaMemory {
     private TupleHashTable  tupleMemory;
     private ObjectHashTable objectMemory;
+    private Map         createdHandles;
 
     public BetaMemory(final TupleHashTable tupleMemory,
                       final ObjectHashTable objectMemory) {
@@ -19,4 +23,11 @@ public ObjectHashTable getObjectMemory() {
     public TupleHashTable getTupleMemory() {
         return this.tupleMemory;
     }
+    
+    public Map getCreatedHandles() {
+        if(createdHandles == null) {
+            createdHandles = new HashMap();
+        }
+        return createdHandles;
+    }
 }
diff --git a/drools-core/src/main/java/org/drools/reteoo/BetaNode.java b/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
index 20525acf049..fd03f8f6dc0 100644
--- a/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
+++ b/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
@@ -227,42 +227,6 @@ public boolean equals(final Object object) {
      */
     public Object createMemory(final RuleBaseConfiguration config) {
         return this.constraints.createBetaMemory();
-        //        // iterate over all the constraints untill we find one that is indexeable. When we find it we remove it from the list and create the 
-        //        // BetaMemory for it. If we don't find one, we create a normal beta memory. We don't need the constraint as we can assume that 
-        //        // anything  returned by the memory already passes that test.
-        //        LinkedList constraints = this.constraints.getConstraints();
-        //        BetaMemory memory = null;
-        //
-        //        if ( constraints != null ) {
-        //            for ( LinkedListEntry entry = (LinkedListEntry) constraints.getFirst(); entry != null; entry = (LinkedListEntry) entry.getNext() ) {
-        //                BetaNodeFieldConstraint constraint = (BetaNodeFieldConstraint) entry.getObject();
-        //                if ( constraint.getClass() == VariableConstraint.class ) {
-        //                    VariableConstraint variableConstraint = (VariableConstraint) constraint;
-        //                    FieldExtractor extractor = variableConstraint.getFieldExtractor();
-        //                    Evaluator evaluator = variableConstraint.getEvaluator();
-        //                    if ( evaluator.getOperator() == Operator.EQUAL ) {
-        //                        // make suret the indexed constraint is first
-        //                        if ( constraints.getFirst() != entry ) {
-        //                            constraints.remove( entry );
-        //                            constraints.insertAfter( null,
-        //                                                     entry );
-        //                        }
-        //                        memory = new BetaMemory( new TupleHashTable(),
-        //                                                 new FieldIndexHashTable( extractor,
-        //                                                                          variableConstraint.getRequiredDeclarations()[0] ) );
-        //                        break;
-        //
-        //                    }
-        //                }
-        //            }
-        //        }
-        //
-        //        if ( memory == null ) {
-        //            memory = new BetaMemory( new TupleHashTable(),
-        //                                     new FactHashTable() );
-        //        }
-        //
-        //        return memory;
     }
 
     /**
diff --git a/drools-core/src/main/java/org/drools/reteoo/CollectNode.java b/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
index bfc0ff76abb..088e43a74fa 100755
--- a/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
+++ b/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
@@ -125,8 +125,9 @@ public void assertTuple(final ReteTuple leftTuple,
 
         final Collection result = this.collect.instantiateResultObject();
         final Iterator it = memory.getObjectMemory().iterator( leftTuple );
-        this.constraints.updateFromTuple( workingMemory, leftTuple );
-        
+        this.constraints.updateFromTuple( workingMemory,
+                                          leftTuple );
+
         for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
             final InternalFactHandle handle = entry.getFactHandle();
             if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
@@ -144,13 +145,15 @@ public void assertTuple(final ReteTuple leftTuple,
             }
         }
         if ( isAllowed ) {
-            final InternalFactHandle handle = workingMemory.getFactHandleFactory().newFactHandle( result );
-
             if ( this.resultsBinder.isAllowedCachedLeft( result ) ) {
-                this.sink.propagateAssertTuple( leftTuple,
-                                                handle,
-                                                context,
-                                                workingMemory );
+                final InternalFactHandle handle = workingMemory.getFactHandleFactory().newFactHandle( result );
+                memory.getCreatedHandles().put( leftTuple,
+                                                handle );
+
+                sink.propagateAssertTuple( leftTuple,
+                                           handle,
+                                           context,
+                                           workingMemory );
             }
         }
     }
@@ -161,31 +164,22 @@ public void assertTuple(final ReteTuple leftTuple,
     public void retractTuple(final ReteTuple leftTuple,
                              final PropagationContext context,
                              final InternalWorkingMemory workingMemory) {
-        // FIXME
-//        final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
-//        memory.getTupleMemory().remove( leftTuple );
-//        
-//        final Map matches = leftTuple.getTupleMatches();
-//
-//        if ( !matches.isEmpty() ) {
-//            for ( final Iterator it = matches.values().iterator(); it.hasNext(); ) {
-//                final CompositeTupleMatch compositeTupleMatch = (CompositeTupleMatch) it.next();
-//                compositeTupleMatch.getObjectMatches().remove( compositeTupleMatch );
-//                it.remove();
-//            }
-//        }
-//
-//        // if tuple was propagated
-//        if ( (leftTuple.getChildEntries() != null) && (leftTuple.getChildEntries().size() > 0) ) {
-//            // Need to store the collection result object for later disposal
-//            final InternalFactHandle lastHandle = ((ReteTuple) ((LinkedListEntry) leftTuple.getChildEntries().getFirst()).getObject()).getLastHandle();
-//
-//            leftTuple.retractChildEntries( context,
-//                                           workingMemory );
-//
-//            // Destroying the acumulate result object 
-//            workingMemory.getFactHandleFactory().destroyFactHandle( lastHandle );
-//        }
+
+        final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+        memory.getTupleMemory().remove( leftTuple );
+        final InternalFactHandle handle = (InternalFactHandle) memory.getCreatedHandles().remove( leftTuple );
+
+        // if tuple was propagated
+        if ( handle != null ) {
+
+            this.sink.propagateRetractTuple( leftTuple,
+                                             handle,
+                                             context,
+                                             workingMemory );
+
+            // Destroying the acumulate result object 
+            workingMemory.getFactHandleFactory().destroyFactHandle( handle );
+        }
     }
 
     /**
@@ -205,11 +199,16 @@ public void assertObject(final InternalFactHandle handle,
         memory.getObjectMemory().add( handle );
 
         final Iterator it = memory.getTupleMemory().iterator();
-        this.constraints.updateFromFactHandle( workingMemory, handle );
+        this.constraints.updateFromFactHandle( workingMemory,
+                                               handle );
         for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
             if ( this.constraints.isAllowedCachedRight( tuple ) ) {
-                this.retractTuple( tuple, context, workingMemory );
-                this.assertTuple( tuple, context, workingMemory );
+                this.retractTuple( tuple,
+                                   context,
+                                   workingMemory );
+                this.assertTuple( tuple,
+                                  context,
+                                  workingMemory );
             }
         }
     }
@@ -223,9 +222,25 @@ public void assertObject(final InternalFactHandle handle,
     public void retractObject(final InternalFactHandle handle,
                               final PropagationContext context,
                               final InternalWorkingMemory workingMemory) {
+
         final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+        if ( !memory.getObjectMemory().remove( handle ) ) {
+            return;
+        }
 
-        // FIXME
+        final Iterator it = memory.getTupleMemory().iterator();
+        this.constraints.updateFromFactHandle( workingMemory,
+                                               handle );
+        for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
+            if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+                this.retractTuple( tuple,
+                                   context,
+                                   workingMemory );
+                this.assertTuple( tuple,
+                                  context,
+                                  workingMemory );
+            }
+        }
     }
 
     public String toString() {
@@ -237,19 +252,12 @@ public void updateSink(TupleSink sink,
                            InternalWorkingMemory workingMemory) {
         final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
 
-        final Iterator tupleIter = memory.getTupleMemory().iterator();
-        for ( ReteTuple tuple = (ReteTuple) tupleIter.next(); tuple != null; tuple = (ReteTuple) tupleIter.next() ) {
-            final Iterator objectIter = memory.getObjectMemory().iterator( tuple );
-            this.constraints.updateFromTuple( workingMemory, tuple );
-            for ( FactEntry entry = (FactEntry) objectIter.next(); entry != null; entry = (FactEntry) objectIter.next() ) {
-                final InternalFactHandle handle = entry.getFactHandle();
-                if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
-                    sink.assertTuple( new ReteTuple( tuple,
-                                                     handle ),
-                                      context,
-                                      workingMemory );
-                }
-            }
+        for ( java.util.Iterator it = memory.getCreatedHandles().entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry entry = (Map.Entry) it.next();
+            sink.assertTuple( new ReteTuple( (ReteTuple)entry.getKey(),
+                                             (InternalFactHandle) entry.getValue()),
+                              context,
+                              workingMemory );
         }
     }"
e15bf1a95abeec1a39f212d65887d88a19f9f68e,drools,-fixed MVEL parser context naming issue.--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@23995 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java b/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
index 8206e2099a2..4ddff78583d 100644
--- a/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
+++ b/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
@@ -134,9 +134,7 @@ public class MVELDialect
 
     private boolean                                        strictMode;
     private int                                            languageLevel;
-    public static final Object                             COMPILER_LOCK                  = new Object();
-    
-    private static AtomicInteger                           nameCounter = new AtomicInteger();
+    public static final Object                             COMPILER_LOCK                  = new Object();    
 
     public MVELDialect(PackageBuilder builder,
                        PackageRegistry pkgRegistry,
@@ -666,13 +664,17 @@ public ParserContext getParserContext(final Dialect.AnalysisResult analysis,
         // @todo proper source file name
         String name;
         if ( context != null && context.getPkg() != null & context.getPkg().getName() != null ) {
-            name = context.getPkg().getName();
+            if ( context instanceof RuleBuildContext ) {
+                name = context.getPkg().getName() + ""."" + ((RuleBuildContext)context).getRuleDescr().getClassName();
+            } else {
+                name = context.getPkg().getName() + "".Unknown"";
+            }
         } else {
-            name = """";
+            name = ""Unknown"";
         }
         final ParserContext parserContext = new ParserContext( this.imports,
                                                                null,
-                                                               name + ""_"" + nameCounter.getAndIncrement() );
+                                                               name );
         // getRuleDescr().getClassName() );
 
         for ( Iterator it = this.packageImports.values().iterator(); it.hasNext(); ) {"
52ebe9ed4e45755f54da430b92d194774b161aa8,crosswire$jsword,"JS-264 Modify Indexing for low memory devices
",p,https://github.com/crosswire/jsword,"diff --git a/src/main/java/org/crosswire/jsword/index/IndexManager.java b/src/main/java/org/crosswire/jsword/index/IndexManager.java
index ee2fe9f32..dd09155d9 100644
--- a/src/main/java/org/crosswire/jsword/index/IndexManager.java
+++ b/src/main/java/org/crosswire/jsword/index/IndexManager.java
@@ -34,18 +34,24 @@
  */
 public interface IndexManager {
     /**
-     * Detects if index data has been stored for this Bible already
+     * Detects if index data has been stored and is valid for this Bible.
+     * 
+     * @return true if the book has a usable index
      */
     boolean isIndexed(Book book);
 
     /**
      * Create a new Searcher.
+     * 
+     * @return an index that can be searched.
      */
     Index getIndex(Book book) throws BookException;
 
     /**
      * Read from the given source version to generate ourselves. On completion
      * of this method the index should be usable.
+     * 
+     * @param book The book that should be indexed
      */
     void scheduleIndexCreation(Book book);
 
@@ -63,6 +69,8 @@ public interface IndexManager {
     /**
      * Tidy up after yourself and remove all the files that make up any indexes
      * you created.
+     * 
+     * @param book the book who's index should be deleted.
      */
     void deleteIndex(Book book) throws BookException;
 
@@ -70,4 +78,19 @@ public interface IndexManager {
      * Close all indexes associated with this Index Manager
      */
     void closeAllIndexes();
+
+    /**
+     * Obtain the current IndexPolicy. Defaults to IndexPolicyAdapter.
+     * 
+     * @return the current IndexPolicy
+     */
+    IndexPolicy getIndexPolicy();
+
+    /**
+     * Set the desired IndexPolicy. Setting to null will cause the
+     * IndexPolicyAdapter to be used.
+     * 
+     * @param policy the IndexPolicy to use when creating indexes.
+     */
+    void setIndexPolicy(IndexPolicy policy);
 }
diff --git a/src/main/java/org/crosswire/jsword/index/IndexPolicy.java b/src/main/java/org/crosswire/jsword/index/IndexPolicy.java
new file mode 100644
index 000000000..332bf013b
--- /dev/null
+++ b/src/main/java/org/crosswire/jsword/index/IndexPolicy.java
@@ -0,0 +1,91 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 or later
+ * as published by the Free Software Foundation. This program is distributed
+ * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ *       http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ *      Free Software Foundation, Inc.
+ *      59 Temple Place - Suite 330
+ *      Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2005-2013
+ *     The copyright to this program is held by it's authors.
+ *
+ */
+package org.crosswire.jsword.index;
+
+/**
+ * An IndexPolicy allows for controlling the overall behavior
+ * of Index creation. This class will change from time to time
+ * so it is important to derive from IndexPolicyAdapter to
+ * provide application resiliency.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ *      The copyright to this program is held by it's authors.
+ * @author DM Smith
+ */
+public interface IndexPolicy {
+    /**
+     * Indicates whether Strong's Numbers should be included in the index.
+     * Adapter default: true;
+     * 
+     * @return true if Strong's Numbers should be indexed
+     */
+    boolean isStrongsIndexed();
+
+    /**
+     * Indicates whether Strong's Numbers should be included in the index.
+     * Adapter default: true;
+     * 
+     * @return true if Strong's Numbers should be indexed
+     */
+    boolean isMorphIndexed();
+
+    /**
+     * Indicates whether Strong's Numbers should be included in the index.
+     * Adapter default: true;
+     * 
+     * @return true if Notes should be indexed
+     */
+    boolean isNoteIndexed();
+
+    /**
+     * Indicates whether Titles and Introductions should be included in the index.
+     * Adapter default: true;
+     * 
+     * @return true if Titles and Introductions should be indexed
+     */
+    boolean isTitleIndexed();
+
+    /**
+     * Indicates whether Cross References should be included in the index.
+     * Adapter default: true;
+     * 
+     * @return true if Cross References should be indexed
+     */
+    boolean isXrefIndexed();
+
+    /**
+     * The maximum size of the RAM Buffer in megabytes that
+     * the underlying indexer may use during index creation.
+     * Adapter default: 16.
+     * 
+     * @return the size of the RAM Buffer.
+     */
+    int getRAMBufferSize();
+
+    /**
+     * Indicates whether one Book can be indexed at a time.
+     * When false, there is no upper bound on the number of
+     * Books at any one time. Adapter default: false.
+     * 
+     * @return whether there can only be one Book indexed at a time.
+     */
+    boolean isSerial();
+}
diff --git a/src/main/java/org/crosswire/jsword/index/IndexPolicyAdapter.java b/src/main/java/org/crosswire/jsword/index/IndexPolicyAdapter.java
new file mode 100644
index 000000000..49fb62508
--- /dev/null
+++ b/src/main/java/org/crosswire/jsword/index/IndexPolicyAdapter.java
@@ -0,0 +1,86 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ *       http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ *      Free Software Foundation, Inc.
+ *      59 Temple Place - Suite 330
+ *      Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2013
+ *     The copyright to this program is held by it's authors.
+ *
+ */
+package org.crosswire.jsword.index;
+
+/**
+ * The IndexPolicyAdapter provides for application resilience against
+ * change to IndexPolicy. It defines a reasonable set of defaults for
+ * a desktop application, but may not be appropriate for memory limited
+ * devices, such as phones, tablets, pdas. The defaults are documented
+ * in {@link IndexPolicy}.
+ * 
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ *      The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class IndexPolicyAdapter implements IndexPolicy {
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#isStrongsIndexed()
+     */
+    public boolean isStrongsIndexed() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#isMorphIndexed()
+     */
+    public boolean isMorphIndexed() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#isNoteIndexed()
+     */
+    public boolean isNoteIndexed() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#isTitleIndexed()
+     */
+    public boolean isTitleIndexed() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#isXrefIndexed()
+     */
+    public boolean isXrefIndexed() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#getRAMBufferSize()
+     */
+    public int getRAMBufferSize() {
+        return 16;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexPolicy#isSerial()
+     */
+    public boolean isSerial() {
+        return false;
+    }
+
+}
diff --git a/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java b/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
index fa4d5311e..c2503759b 100644
--- a/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
+++ b/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
@@ -40,10 +40,10 @@
 import org.apache.lucene.search.TopScoreDocCollector;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.util.Version;
 import org.crosswire.common.progress.JobManager;
 import org.crosswire.common.progress.Progress;
+import org.crosswire.common.util.FileUtil;
 import org.crosswire.common.util.NetUtil;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.jsword.JSMsg;
@@ -54,6 +54,7 @@
 import org.crosswire.jsword.book.OSISUtil;
 import org.crosswire.jsword.index.AbstractIndex;
 import org.crosswire.jsword.index.IndexManager;
+import org.crosswire.jsword.index.IndexPolicy;
 import org.crosswire.jsword.index.IndexStatus;
 import org.crosswire.jsword.index.lucene.analysis.LuceneAnalyzer;
 import org.crosswire.jsword.index.search.SearchModifier;
@@ -116,6 +117,12 @@ public class LuceneIndex extends AbstractIndex implements Closeable {
      */
     public static final String FIELD_MORPHOLOGY = ""morph"";
 
+    /**
+     * An estimate of the percent of time spent indexing.
+     * The remaining time, if any, is spent doing cleanup.
+     */
+    private static final int WORK_ESTIMATE = 98;
+
     /**
      * Read an existing index and use it.
      * 
@@ -140,8 +147,7 @@ public LuceneIndex(Book book, URI storage) throws BookException {
      * @throws BookException
      *             If we fail to read the index files
      */
-    public LuceneIndex(Book book, URI storage, boolean create) throws BookException {
-        assert create;
+    public LuceneIndex(Book book, URI storage, IndexPolicy policy) throws BookException {
 
         this.book = book;
         File finalPath = null;
@@ -160,47 +166,41 @@ public LuceneIndex(Book book, URI storage, boolean create) throws BookException
 
         IndexStatus finalStatus = IndexStatus.UNDONE;
 
-        Analyzer analyzer = new LuceneAnalyzer(book);
-
         List<Key> errors = new ArrayList<Key>();
+        // Build to another location and rename in the end.
         File tempPath = new File(path + '.' + IndexStatus.CREATING.toString());
 
-        try {
-            //Lock on metadata to allow creation of multiple indexes, so long as they are on different books
-            synchronized (book.getBookMetaData()) {
-
-                book.setIndexStatus(IndexStatus.CREATING);
-
-                // An index is created by opening an IndexWriter with the create
-                // argument set to true.
-                // IndexWriter writer = new
-                // IndexWriter(tempPath.getCanonicalPath(), analyzer, true);
+        // Ensure that the temp path is gone
+        // It is not good for it to have been leftover from before.
+        if (tempPath.exists()) {
+            FileUtil.delete(tempPath);
+        }
 
-                // Create the index in core.
-                final RAMDirectory ramDir = new RAMDirectory();
-                IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED);
+        try {
+            // When misconfigured, this can throw errors.
+            Analyzer analyzer = new LuceneAnalyzer(book);
 
-                generateSearchIndexImpl(job, errors, writer, book.getGlobalKeyList(), 0);
+            // Lock on metadata to allow creation of multiple indexes, so long as they are on different books.
+            // Otherwise lock on a single object to make this serial
+            Object mutex = policy.isSerial() ? CREATING : book.getBookMetaData();
+            synchronized (mutex) {
 
-                // TRANSLATOR: Progress label for optimizing a search index. This may take a bit of time, so we have a label for it.
-                job.setSectionName(JSMsg.gettext(""Optimizing""));
-                job.setWork(95);
+                book.setIndexStatus(IndexStatus.CREATING);
 
-                // Consolidate the index into the minimum number of files.
-                // writer.optimize(); /* Optimize is done by addIndexes */
-                writer.close();
+                IndexWriter writer = null;
+                try {
+                    // Write the core index to disk.
+                    final Directory destination = FSDirectory.open(new File(tempPath.getCanonicalPath()));
+                    writer = new IndexWriter(destination, analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED);
+                    writer.setRAMBufferSizeMB(policy.getRAMBufferSize());
 
-                // Write the core index to disk.
-                final Directory destination = FSDirectory.open(new File(tempPath.getCanonicalPath()));
-                IndexWriter fsWriter = new IndexWriter(destination, analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED);
-                fsWriter.addIndexesNoOptimize(new Directory[] {
-                    ramDir
-                });
-                fsWriter.optimize();
-                fsWriter.close();
+                    generateSearchIndexImpl(job, errors, writer, book.getGlobalKeyList(), 0, policy);
 
-                // Free up the space used by the ram directory
-                ramDir.close();
+                } finally {
+                    if (writer != null) {
+                        writer.close();
+                    }
+                }
 
                 job.setCancelable(false);
                 if (!job.isFinished()) {
@@ -224,9 +224,8 @@ public LuceneIndex(Book book, URI storage, boolean create) throws BookException
                     // This message gives a listing of them to the user.
                     Reporter.informUser(this, JSMsg.gettext(""The following verses have errors and could not be indexed\n{0}"", buf));
                 }
-
+                initDirectoryAndSearcher();
             }
-            initDirectoryAndSearcher();
         } catch (IOException ex) {
             job.cancel();
             // TRANSLATOR: Common error condition: Some error happened while creating a search index.
@@ -234,11 +233,15 @@ public LuceneIndex(Book book, URI storage, boolean create) throws BookException
         } finally {
             book.setIndexStatus(finalStatus);
             job.done();
+            // Ensure that the temp path is gone - errors can leave it there and cause further problems.
+            if (tempPath.exists()) {
+                FileUtil.delete(tempPath);
+            }
         }
     }
 
     /**
-     * Inits the directory and searcher.
+     * Initializes the directory and searcher.
      */
     private void initDirectoryAndSearcher() {
         try {
@@ -249,10 +252,8 @@ private void initDirectoryAndSearcher() {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.crosswire.jsword.index.search.Index#findWord(java.lang.String)
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.Index#find(java.lang.String)
      */
     public Key find(String search) throws BookException {
         String v11nName = book.getBookMetaData().getProperty(""Versification"").toString();
@@ -262,6 +263,7 @@ public Key find(String search) throws BookException {
         Key results = null;
 
         if (search != null) {
+            Throwable theCause = null;
             try {
                 Analyzer analyzer = new LuceneAnalyzer(book);
 
@@ -309,22 +311,18 @@ public Key find(String search) throws BookException {
                     }
                 }
             } catch (IOException e) {
-                // The VerseCollector may throw IOExceptions that merely wrap a
-                // NoSuchVerseException
+                // The VerseCollector may throw IOExceptions that merely wrap a NoSuchVerseException
                 Throwable cause = e.getCause();
-                if (cause instanceof NoSuchVerseException) {
-                    // TRANSLATOR: Error condition: An unexpected error happened that caused search to fail.
-                    throw new BookException(JSMsg.gettext(""Search failed.""), cause);
-                }
-
-                // TRANSLATOR: Error condition: An unexpected error happened that caused search to fail.
-                throw new BookException(JSMsg.gettext(""Search failed.""), e);
+                theCause = cause instanceof NoSuchVerseException ? cause : e;
             } catch (NoSuchVerseException e) {
-                // TRANSLATOR: Error condition: An unexpected error happened that caused search to fail.
-                throw new BookException(JSMsg.gettext(""Search failed.""), e);
+                theCause = e;
             } catch (ParseException e) {
+                theCause = e;
+            }
+
+            if (theCause != null) {
                 // TRANSLATOR: Error condition: An unexpected error happened that caused search to fail.
-                throw new BookException(JSMsg.gettext(""Search failed.""), e);
+                throw new BookException(JSMsg.gettext(""Search failed.""), theCause);
             }
         }
 
@@ -338,15 +336,16 @@ public Key find(String search) throws BookException {
         return results;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.crosswire.jsword.index.search.Index#getKey(java.lang.String)
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.Index#getKey(java.lang.String)
      */
     public Key getKey(String name) throws NoSuchKeyException {
         return book.getKey(name);
     }
 
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.Index#close()
+     */
     public final void close() {
         try {
             searcher.close();
@@ -366,15 +365,16 @@ public final void close() {
 
     /**
      * Dig down into a Key indexing as we go.
+     * @param policy 
      */
-    private void generateSearchIndexImpl(Progress job, List<Key> errors, IndexWriter writer, Key key, int count) throws BookException, IOException {
+    private void generateSearchIndexImpl(Progress job, List<Key> errors, IndexWriter writer, Key key, int count, IndexPolicy policy) throws BookException, IOException {
         String v11nName = book.getBookMetaData().getProperty(""Versification"").toString();
         Versification v11n = Versifications.instance().getVersification(v11nName);
-        boolean hasStrongs = book.getBookMetaData().hasFeature(FeatureType.STRONGS_NUMBERS);
-        boolean hasXRefs = book.getBookMetaData().hasFeature(FeatureType.SCRIPTURE_REFERENCES);
-        boolean hasNotes = book.getBookMetaData().hasFeature(FeatureType.FOOTNOTES);
-        boolean hasHeadings = book.getBookMetaData().hasFeature(FeatureType.HEADINGS);
-        boolean hasMorphology = book.getBookMetaData().hasFeature(FeatureType.MORPHOLOGY);
+        boolean includeStrongs = book.getBookMetaData().hasFeature(FeatureType.STRONGS_NUMBERS) && policy.isStrongsIndexed();
+        boolean includeXrefs = book.getBookMetaData().hasFeature(FeatureType.SCRIPTURE_REFERENCES) && policy.isXrefIndexed();
+        boolean includeNotes = book.getBookMetaData().hasFeature(FeatureType.FOOTNOTES) && policy.isNoteIndexed();
+        boolean includeHeadings = book.getBookMetaData().hasFeature(FeatureType.HEADINGS) && policy.isTitleIndexed();
+        boolean includeMorphology = book.getBookMetaData().hasFeature(FeatureType.MORPHOLOGY) && policy.isMorphIndexed();
 
         String oldRootName = """";
         int percent = 0;
@@ -394,79 +394,95 @@ private void generateSearchIndexImpl(Progress job, List<Key> errors, IndexWriter
 
         int size = key.getCardinality();
         int subCount = count;
+        log.debug(""Number of keys = {}"", Integer.toString(size));
         for (Key subkey : key) {
+            // Bibles and verse based commentaries don't have keys with children.
+            // However, tree keyed Books do. So we only index the leaf keys.
+            // FIXME(DMS): Should not use recursion!!!!
             if (subkey.canHaveChildren()) {
-                generateSearchIndexImpl(job, errors, writer, subkey, subCount);
-            } else {
-                data = new BookData(book, subkey);
-                osis = null;
+                generateSearchIndexImpl(job, errors, writer, subkey, subCount, policy);
+                continue;
+            }
 
-                try {
-                    osis = data.getOsisFragment();
-                } catch (BookException e) {
-                    errors.add(subkey);
-                    continue;
-                }
+            data = new BookData(book, subkey);
+            osis = null;
 
-                // Remove all fields from the document
-                doc.getFields().clear();
+            try {
+                osis = data.getOsisFragment();
+            } catch (BookException e) {
+                errors.add(subkey);
+                continue;
+            }
 
-                // Do the actual indexing
-                // Always add the key
-                keyField.setValue(subkey.getOsisRef());
-                doc.add(keyField);
+            // Remove all fields from the document
+            doc.getFields().clear();
 
-                addField(doc, bodyField, OSISUtil.getCanonicalText(osis));
+            // Do the actual indexing
+            // Always add the key
+            keyField.setValue(subkey.getOsisRef());
+            doc.add(keyField);
 
-                if (hasStrongs) {
-                    addField(doc, strongField, OSISUtil.getStrongsNumbers(osis));
-                }
+            addField(doc, bodyField, OSISUtil.getCanonicalText(osis));
 
-                if (hasXRefs) {
-                    addField(doc, xrefField, OSISUtil.getReferences(v11n, osis));
-                }
+            if (includeStrongs) {
+                addField(doc, strongField, OSISUtil.getStrongsNumbers(osis));
+            }
 
-                if (hasNotes) {
-                    addField(doc, noteField, OSISUtil.getNotes(osis));
-                }
+            if (includeXrefs) {
+                addField(doc, xrefField, OSISUtil.getReferences(v11n, osis));
+            }
 
-                if (hasHeadings) {
-                    addField(doc, headingField, OSISUtil.getHeadings(osis));
-                }
+            if (includeNotes) {
+                addField(doc, noteField, OSISUtil.getNotes(osis));
+            }
 
-                if (hasMorphology) {
-                    addField(doc, morphologyField, OSISUtil.getMorphologiesWithStrong(osis));
-                }
+            if (includeHeadings) {
+                addField(doc, headingField, OSISUtil.getHeadings(osis));
+            }
 
-                // Add the document if we added more than just the key.
-                if (doc.getFields().size() > 1) {
-                    writer.addDocument(doc);
-                }
+            if (includeMorphology) {
+                addField(doc, morphologyField, OSISUtil.getMorphologiesWithStrong(osis));
+            }
 
-                // report progress
-                rootName = subkey.getRootName();
-                if (!rootName.equals(oldRootName)) {
-                    oldRootName = rootName;
-                    job.setSectionName(rootName);
-                }
+            // Add the document if we added more than just the key.
+            if (doc.getFields().size() > 1) {
+                writer.addDocument(doc);
+            }
 
-                subCount++;
-                int oldPercent = percent;
-                percent = 95 * subCount / size;
+            // report progress
+            rootName = subkey.getRootName();
+            if (!rootName.equals(oldRootName)) {
+                oldRootName = rootName;
+                // Note, this does not cause progress to be updated
+                // It will show up the next time progress is updated.
+                job.setSectionName(rootName);
+            }
 
-                if (oldPercent != percent) {
-                    job.setWork(percent);
-                }
+            subCount++;
+            int oldPercent = percent;
+            percent = WORK_ESTIMATE * subCount / size;
 
-                // This could take a long time ...
-                Thread.yield();
-                if (Thread.currentThread().isInterrupted()) {
-                    break;
-                }
+            // Only send out a max of 95 progress updates
+            if (oldPercent != percent) {
+                job.setWork(percent);
+            }
+
+            // This could take a long time ...
+            Thread.yield();
+            if (Thread.currentThread().isInterrupted()) {
+                break;
             }
         }
     }
 
+    /**
+     * Add the text to the Field and put the Field in the document,
+     * ignoring null and empty text.
+     * 
+     * @param doc The Document to which the Field should be added
+     * @param field The Field to add
+     * @param text The text for the field
+     */
     private void addField(Document doc, Field field, String text) {
         if (text != null && text.length() > 0) {
             field.setValue(text);
@@ -485,17 +501,10 @@ public Searcher getSearcher() {
         return searcher;
     }
 
-
-
-    /**
-     * The log stream
-     */
-    private static final Logger log = LoggerFactory.getLogger(LuceneIndex.class);
-
     /**
      * The Book that we are indexing
      */
-    protected Book book;
+    private Book book;
 
     /**
      * The location of this index
@@ -505,10 +514,21 @@ public Searcher getSearcher() {
     /**
      * The Lucene directory for the path.
      */
-    protected Directory directory;
+    private Directory directory;
 
     /**
      * The Lucene search engine
      */
-    protected Searcher searcher;
+    private Searcher searcher;
+
+    /**
+     * A synchronization lock point to prevent us from doing 2 index runs at a
+     * time.
+     */
+    private static final Object CREATING = new Object();
+
+    /**
+     * The log stream
+     */
+    private static final Logger log = LoggerFactory.getLogger(LuceneIndex.class);
 }
diff --git a/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndexManager.java b/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndexManager.java
index 3131f8473..a5141d678 100644
--- a/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndexManager.java
+++ b/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndexManager.java
@@ -37,6 +37,8 @@
 import org.crosswire.jsword.book.BookMetaData;
 import org.crosswire.jsword.index.Index;
 import org.crosswire.jsword.index.IndexManager;
+import org.crosswire.jsword.index.IndexPolicy;
+import org.crosswire.jsword.index.IndexPolicyAdapter;
 import org.crosswire.jsword.index.IndexStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,10 +51,15 @@
  * @author Joe Walker [joe at eireneh dot com]
  */
 public class LuceneIndexManager implements IndexManager {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.crosswire.jsword.index.search.AbstractIndex#isIndexed()
+    /**
+     * Create a LuceneIndexManager with a default IndexPolicy.
+     */
+    public LuceneIndexManager() {
+        policy = new IndexPolicyAdapter();
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#isIndexed(org.crosswire.jsword.book.Book)
      */
     public boolean isIndexed(Book book) {
         try {
@@ -64,12 +71,8 @@ public boolean isIndexed(Book book) {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.crosswire.jsword.index.search.IndexManager#getIndex(org.crosswire
-     * .jsword.book.Book)
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#getIndex(org.crosswire.jsword.book.Book)
      */
     public Index getIndex(Book book) throws BookException {
         try {
@@ -87,8 +90,7 @@ public Index getIndex(Book book) throws BookException {
         }
     }
 
-    /*
-     *     @Override(non-Javadoc)
+    /* (non-Javadoc)
      * @see org.crosswire.jsword.index.IndexManager#closeAllIndexes()
      */
     public void closeAllIndexes() {
@@ -97,12 +99,8 @@ public void closeAllIndexes() {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.crosswire.jsword.index.search.AbstractIndex#generateSearchIndex(org
-     * .crosswire.common.progress.Job)
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#scheduleIndexCreation(org.crosswire.jsword.book.Book)
      */
     public void scheduleIndexCreation(final Book book) {
         book.setIndexStatus(IndexStatus.SCHEDULED);
@@ -111,7 +109,7 @@ public void scheduleIndexCreation(final Book book) {
 
         try {
             URI storage = getStorageArea(book);
-            Index index = new LuceneIndex(book, storage, true);
+            Index index = new LuceneIndex(book, storage, this.policy);
             // We were successful if the directory exists.
             if (NetUtil.getAsFile(storage).exists()) {
                 finalStatus = IndexStatus.DONE;
@@ -126,12 +124,8 @@ public void scheduleIndexCreation(final Book book) {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.crosswire.jsword.index.search.IndexManager#installDownloadedIndex
-     * (org.crosswire.jsword.book.Book, java.net.URI)
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#installDownloadedIndex(org.crosswire.jsword.book.Book, java.net.URI)
      */
     public void installDownloadedIndex(Book book, URI tempDest) throws BookException {
         try {
@@ -144,12 +138,8 @@ public void installDownloadedIndex(Book book, URI tempDest) throws BookException
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.crosswire.jsword.index.search.IndexManager#deleteIndex(org.crosswire
-     * .jsword.book.Book)
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#deleteIndex(org.crosswire.jsword.book.Book)
      */
     public void deleteIndex(Book book) throws BookException {
         // Lucene can build in the directory that currently exists,
@@ -188,6 +178,25 @@ public void deleteIndex(Book book) throws BookException {
         FileUtil.delete(tempPath);
     }
 
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#getIndexPolicy()
+     */
+    public IndexPolicy getIndexPolicy() {
+        return policy;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.index.IndexManager#setIndexPolicy(org.crosswire.jsword.index.IndexPolicy)
+     */
+    public void setIndexPolicy(IndexPolicy policy) {
+        if (policy != null) {
+            this.policy = policy;
+        } else {
+            this.policy = new IndexPolicyAdapter();
+        }
+
+    }
+
     /**
      * Determine where an index should be stored
      * 
@@ -211,6 +220,8 @@ protected URI getStorageArea(Book book) throws IOException {
         return NetUtil.lengthenURI(driver, bookName);
     }
 
+    private IndexPolicy policy;
+
     /**
      * The created indexes
      */"
f372f7c109b550c6b20b8196713aa313ad6c249f,elasticsearch,Cut over StringScriptDataComparator to use- BytesRef instead of Strings--Closes -2920-,c,https://github.com/elastic/elasticsearch,"diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/StringScriptDataComparator.java b/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/StringScriptDataComparator.java
index 393c5ab5a9581..8ed32896e9aad 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/StringScriptDataComparator.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/StringScriptDataComparator.java
@@ -23,6 +23,7 @@
 import org.apache.lucene.search.FieldComparator;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.SortField;
+import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.script.SearchScript;
 
@@ -31,7 +32,7 @@
 /**
  *
  */
-public class StringScriptDataComparator extends FieldComparator<String> {
+public class StringScriptDataComparator extends FieldComparator<BytesRef> {
 
     public static IndexFieldData.XFieldComparatorSource comparatorSource(SearchScript script) {
         return new InnerSource(script);
@@ -58,18 +59,23 @@ public SortField.Type reducedType() {
 
     private final SearchScript script;
 
-    private String[] values;
+    private BytesRef[] values;
 
-    private String bottom;
+    private BytesRef bottom;
+    
+    private BytesRef spare = new BytesRef();
+    
+    private int spareDoc = -1;
 
     public StringScriptDataComparator(int numHits, SearchScript script) {
         this.script = script;
-        values = new String[numHits];
+        values = new BytesRef[numHits];
     }
 
     @Override
-    public FieldComparator<String> setNextReader(AtomicReaderContext context) throws IOException {
+    public FieldComparator<BytesRef> setNextReader(AtomicReaderContext context) throws IOException {
         script.setNextReader(context);
+        spareDoc = -1;
         return this;
     }
 
@@ -80,8 +86,8 @@ public void setScorer(Scorer scorer) {
 
     @Override
     public int compare(int slot1, int slot2) {
-        final String val1 = values[slot1];
-        final String val2 = values[slot2];
+        final BytesRef val1 = values[slot1];
+        final BytesRef val2 = values[slot2];
         if (val1 == null) {
             if (val2 == null) {
                 return 0;
@@ -96,30 +102,38 @@ public int compare(int slot1, int slot2) {
 
     @Override
     public int compareBottom(int doc) {
-        script.setNextDocId(doc);
-        final String val2 = script.run().toString();
+      
         if (bottom == null) {
-            if (val2 == null) {
-                return 0;
-            }
             return -1;
-        } else if (val2 == null) {
-            return 1;
         }
-        return bottom.compareTo(val2);
+        return bottom.compareTo(spare);
     }
 
     @Override
-    public int compareDocToValue(int doc, String val2) throws IOException {
+    public int compareDocToValue(int doc, BytesRef val2) throws IOException {
         script.setNextDocId(doc);
-        String val1 = script.run().toString();
-        return val1.compareTo(val2);
+        setSpare(doc);
+        return spare.compareTo(val2);
+    }
+    
+    private void setSpare(int doc) {
+        if (spareDoc == doc) {
+            return;
+        }
+        
+        script.setNextDocId(doc);
+        spare.copyChars(script.run().toString());
+        spareDoc = doc;
     }
 
     @Override
     public void copy(int slot, int doc) {
-        script.setNextDocId(doc);
-        values[slot] = script.run().toString();
+        setSpare(doc);
+        if (values[slot] == null) {
+           values[slot] = BytesRef.deepCopyOf(spare);
+        } else {
+            values[slot].copyBytes(spare);
+        }
     }
 
     @Override
@@ -128,7 +142,7 @@ public void setBottom(final int bottom) {
     }
 
     @Override
-    public String value(int slot) {
+    public BytesRef value(int slot) {
         return values[slot];
     }
 }
diff --git a/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java
index a5211a5ba7483..9c6ea5fad251b 100644
--- a/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java
@@ -431,6 +431,40 @@ private void testSimpleSorts(int numberOfShards) throws Exception {
         assertThat(searchResponse.toString(), not(containsString(""error"")));
     }
     
+    @Test 
+    public void testSortScript() throws IOException {
+        try {
+            client.admin().indices().prepareDelete(""test"").execute().actionGet();
+        } catch (Exception e) {
+            // ignore
+        }
+        
+        String mapping = jsonBuilder().startObject().startObject(""profile"").field(""dynamic"", ""strict"")
+                .startObject(""properties"")
+                .startObject(""id"").field(""type"", ""integer"").field(""index"", ""not_analyzed"").field(""store"", true).endObject()
+                .startObject(""groups_code"").startObject(""properties"").field(""type"", ""integer"").field(""index"", ""not_analyzed"").endObject().endObject()
+                .startObject(""date"").field(""type"", ""date"").field(""index"", ""not_analyzed"").field(""format"", ""date_time_no_millis"").endObject()
+                .endObject().endObject().endObject().string();
+        client.admin().indices().prepareCreate(""test"")
+                .setSettings(ImmutableSettings.settingsBuilder().put(""index.number_of_shards"", 2).put(""index.number_of_replicas"", 0)).addMapping(""test"", mapping);
+        
+        client.prepareIndex(""test"", ""test"", ""1"").setSource(jsonBuilder().startObject()
+                .startArray(""groups_code"").startObject().field(""id"", 47642).field(""date"", ""2010-08-12T07:54:55Z"").endObject().endArray()
+                .endObject()).execute().actionGet();
+        client.prepareIndex(""test"", ""test"", ""2"").setSource(jsonBuilder().startObject()
+                .startArray(""groups_code"").startObject().field(""id"", 47642).field(""date"", ""2010-05-04T12:10:54Z"").endObject().endArray()
+                .endObject()).execute().actionGet();
+        client.admin().indices().prepareRefresh(""test"").execute().actionGet();
+
+        SearchResponse searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addSort(SortBuilders.scriptSort(""\u0027\u0027"", ""string"")).setSize(10)
+                .execute().actionGet();
+
+        assertThat(""Failures "" + Arrays.toString(searchResponse.getShardFailures()), searchResponse.getShardFailures().length, equalTo(0));
+        
+    }
+    
     @Test
     public void testSortMinValueScript() throws IOException {
         try {"
04c30d52addc9204dcf0c535de49bb2d912259c3,tapiji,"Cleans up build information for the tool suite's core plug-ins
(cherry picked from commit 7aecbae043424f907a2445c85e9f98b1ecaa8792)

Conflicts:

	org.eclipse.babel.tapiji.tools.core/build.properties
",p,https://github.com/tapiji/tapiji,"diff --git a/org.eclipse.babel.tapiji.tools.core/build.properties b/org.eclipse.babel.tapiji.tools.core/build.properties
index d9a05cb6..14cdf892 100644
--- a/org.eclipse.babel.tapiji.tools.core/build.properties
+++ b/org.eclipse.babel.tapiji.tools.core/build.properties
@@ -1,21 +1,11 @@
-source.. = src/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                schema/,\
                about.html,\
                epl-v10.html,\
-               bin/,\
-               resourcebundle.jar
+               bin/
 src.includes = schema/,\
                about.html,\
                epl-v10.html
-jars.compile.order = .,\
-                     resourcebundle.jar
-output.resourcebundle.jar = bin/
-source.resourcebundle.jar = bin/,\
-                            src/,\
-                            schema/,\
-                            META-INF/,\
-                            icons/,\
-                            .settings/
+"
5f2db5a15b6dce33253c7d6ba766db4ac2292957,Valadoc,"libvaladoc: gir-reader: accept #[id]->[id|func]
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/ctyperesolver.vala b/src/libvaladoc/ctyperesolver.vala
index 0467d48c78..74051360f3 100755
--- a/src/libvaladoc/ctyperesolver.vala
+++ b/src/libvaladoc/ctyperesolver.vala
@@ -282,6 +282,7 @@ public class Valadoc.CTypeResolver : Visitor {
 		} else {
 			string parent_cname = get_parent_type_cname (item);
 			if (parent_cname != null) {
+				register_symbol (parent_cname+""->""+item.get_cname (), item);
 				register_symbol (parent_cname+"".""+item.get_cname (), item);
 			}
 		}
diff --git a/src/libvaladoc/documentation/gtkdoccommentscanner.vala b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
index 978bce8706..afc6f79522 100644
--- a/src/libvaladoc/documentation/gtkdoccommentscanner.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
@@ -331,6 +331,26 @@ public class Valadoc.Gtkdoc.Scanner {
 			} else {
 				id_len += id_len2 + separator_len;
 			}
+		} else if (this.pos.has_prefix (""->"")) {
+			unowned string sep_start = this.pos;
+			int sep_column_start = this.column;			
+
+			next_char ();
+			next_char ();	
+
+			Token? func_token = function_prefix ();
+			if (func_token == null) {
+				int id_len2;
+
+				if ((id_len2 = id_prefix ()) > 0) {
+					id_len += 2 + id_len2;
+				} else {
+					this.column = sep_column_start;
+					this.pos = sep_start;
+				}
+			} else {
+				id_len += 2 + func_token.content.length;
+			}
 		}
 
 		return new Token (type, start.substring (1, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);"
b246e68435e8d86a2a12fb8fe6c5aa9d9896ff92,hbase,HBASE-5259 Normalize the RegionLocation in- TableInputFormat by the reverse DNS lookup (Liyin Tang)--git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1238774 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/hbase,"diff --git a/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
index 7ebd62f18eea..b275e4e0cfe9 100644
--- a/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
+++ b/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
@@ -20,11 +20,17 @@
 package org.apache.hadoop.hbase.mapreduce;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
+import javax.naming.NamingException;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HServerAddress;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
@@ -36,6 +42,7 @@
 import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.RecordReader;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.net.DNS;
 
 /**
  * A base for {@link TableInputFormat}s. Receives a {@link HTable}, an
@@ -78,6 +85,13 @@ public abstract class TableInputFormatBase
   private TableRecordReader tableRecordReader = null;
 
 
+  /** The reverse DNS lookup cache mapping: IPAddress => HostName */
+  private HashMap<InetAddress, String> reverseDNSCacheMap =
+    new HashMap<InetAddress, String>();
+  
+  /** The NameServer address */
+  private String nameServer = null;
+  
   /**
    * Builds a TableRecordReader. If no TableRecordReader was provided, uses
    * the default.
@@ -128,6 +142,10 @@ public List<InputSplit> getSplits(JobContext context) throws IOException {
 	if (table == null) {
 	    throw new IOException(""No table was provided."");
 	}
+    // Get the name server address and the default value is null.
+    this.nameServer =
+      context.getConfiguration().get(""hbase.nameserver.address"", null);
+    
     Pair<byte[][], byte[][]> keys = table.getStartEndKeys();
     if (keys == null || keys.getFirst() == null ||
         keys.getFirst().length == 0) {
@@ -138,13 +156,24 @@ public List<InputSplit> getSplits(JobContext context) throws IOException {
       if ( !includeRegionInSplit(keys.getFirst()[i], keys.getSecond()[i])) {
         continue;
       }
-      String regionLocation = table.getRegionLocation(keys.getFirst()[i]).
-        getHostname();
-      byte[] startRow = scan.getStartRow();
-      byte[] stopRow = scan.getStopRow();
-      // determine if the given start an stop key fall into the region
+      HServerAddress regionServerAddress = 
+        table.getRegionLocation(keys.getFirst()[i]).getServerAddress();
+      InetAddress regionAddress =
+        regionServerAddress.getInetSocketAddress().getAddress();
+      String regionLocation;
+      try {
+        regionLocation = reverseDNS(regionAddress);
+      } catch (NamingException e) {
+        LOG.error(""Cannot resolve the host name for "" + regionAddress +
+            "" because of "" + e);
+        regionLocation = regionServerAddress.getHostname();
+      }
+
+			byte[] startRow = scan.getStartRow();
+			byte[] stopRow = scan.getStopRow();
+			// determine if the given start an stop key fall into the region
       if ((startRow.length == 0 || keys.getSecond()[i].length == 0 ||
-           Bytes.compareTo(startRow, keys.getSecond()[i]) < 0) &&
+					 Bytes.compareTo(startRow, keys.getSecond()[i]) < 0) &&
           (stopRow.length == 0 ||
            Bytes.compareTo(stopRow, keys.getFirst()[i]) > 0)) {
         byte[] splitStart = startRow.length == 0 ||
@@ -164,6 +193,15 @@ public List<InputSplit> getSplits(JobContext context) throws IOException {
     }
     return splits;
   }
+  
+  private String reverseDNS(InetAddress ipAddress) throws NamingException {
+    String hostName = this.reverseDNSCacheMap.get(ipAddress);
+    if (hostName == null) {
+      hostName = DNS.reverseDns(ipAddress, this.nameServer);
+      this.reverseDNSCacheMap.put(ipAddress, hostName);
+    }
+    return hostName;
+  }
 
   /**
    *"
a141ff2a7973b379f6b4d1aa9178f0750d6502fd,hbase,HBASE-4460  Support running an embedded- ThriftServer within a RegionServer (jgray)--git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1186586 13f79535-47bb-0310-9956-ffa450edef68-,a,https://github.com/apache/hbase,"diff --git a/CHANGES.txt b/CHANGES.txt
index 3c242760ca14..4fa58f8e4d4b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 HBase Change Log
 Release 0.93.0 - Unreleased
+  NEW FEATURE
+   HBASE-4460  Support running an embedded ThriftServer within a RegionServer (jgray)
+
   IMPROVEMENT
    HBASE-4132  Extend the WALActionsListener API to accomodate log archival
                (dhruba borthakur)
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index a7c352f27252..8e9ba6ba556f 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -300,6 +300,9 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
   // Cache configuration and block cache reference
   private final CacheConfig cacheConfig;
 
+  // reference to the Thrift Server.
+  volatile private HRegionThriftServer thriftServer;
+
   /**
    * The server name the Master sees us as.  Its made from the hostname the
    * master passes us, port, and server startcode. Gets set after registration
@@ -617,6 +620,13 @@ private void initializeThreads() throws IOException {
         HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY,
         HConstants.DEFAULT_HBASE_REGIONSERVER_LEASE_PERIOD),
         this.threadWakeFrequency);
+
+    // Create the thread for the ThriftServer.
+    if (conf.getBoolean(""hbase.regionserver.export.thrift"", false)) {
+      thriftServer = new HRegionThriftServer(this, conf);
+      thriftServer.start();
+      LOG.info(""Started Thrift API from Region Server."");
+    }
   }
 
   /**
@@ -685,6 +695,7 @@ public void run() {
       }
     }
     // Run shutdown.
+    if (this.thriftServer != null) this.thriftServer.shutdown();
     this.leases.closeAfterLeasesExpire();
     this.rpcServer.stop();
     if (this.splitLogWorker != null) {
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java
new file mode 100644
index 000000000000..09cd90e9600e
--- /dev/null
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java
@@ -0,0 +1,229 @@
+/**
+ * Copyright 2011 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HRegionLocation;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.NotServingRegionException;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.thrift.ThriftServer;
+import org.apache.hadoop.hbase.thrift.ThriftUtilities;
+import org.apache.hadoop.hbase.thrift.generated.Hbase;
+import org.apache.hadoop.hbase.thrift.generated.IOError;
+import org.apache.hadoop.hbase.thrift.generated.TRowResult;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TCompactProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TNonblockingServer;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TNonblockingServerSocket;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TTransportFactory;
+
+/**
+ * HRegionThriftServer - this class starts up a Thrift server in the same
+ * JVM where the RegionServer is running. It inherits most of the
+ * functionality from the standard ThriftServer. This is good because
+ * we can maintain compatibility with applications that use the
+ * standard Thrift interface. For performance reasons, we can override
+ * methods to directly invoke calls into the HRegionServer and avoid the hop.
+ * <p>
+ * This can be enabled with <i>hbase.regionserver.export.thrift</i> set to true.
+ */
+public class HRegionThriftServer extends Thread {
+
+  public static final Log LOG = LogFactory.getLog(HRegionThriftServer.class);
+  public static final int DEFAULT_LISTEN_PORT = 9090;
+
+  private HRegionServer rs;
+  private Configuration conf;
+
+  private int port;
+  private boolean nonblocking;
+  private String bindIpAddress;
+  private String transport;
+  private String protocol;
+  volatile private TServer tserver;
+
+  /**
+   * Create an instance of the glue object that connects the
+   * RegionServer with the standard ThriftServer implementation
+   */
+  HRegionThriftServer(HRegionServer regionServer, Configuration conf) {
+    this.rs = regionServer;
+    this.conf = conf;
+  }
+
+  /**
+   * Inherit the Handler from the standard ThriftServer. This allows us
+   * to use the default implementation for most calls. We override certain calls
+   * for performance reasons
+   */
+  private class HBaseHandlerRegion extends ThriftServer.HBaseHandler {
+
+    HBaseHandlerRegion(final Configuration conf) throws IOException {
+      super(conf);
+      initialize(conf);
+    }
+
+    // TODO: Override more methods to short-circuit for performance
+
+    /**
+     * Get a record. Short-circuit to get better performance.
+     */
+    @Override
+    public List<TRowResult> getRowWithColumnsTs(ByteBuffer tableName,
+                                                ByteBuffer rowb,
+                                                List<ByteBuffer> columns,
+                                                long timestamp)
+      throws IOError {
+      try {
+        byte [] row = rowb.array();
+        HTable table = getTable(tableName.array());
+        HRegionLocation location = table.getRegionLocation(row);
+        byte[] regionName = location.getRegionInfo().getEncodedNameAsBytes();
+
+        if (columns == null) {
+          Get get = new Get(row);
+          get.setTimeRange(Long.MIN_VALUE, timestamp);
+          Result result = rs.get(regionName, get);
+          return ThriftUtilities.rowResultFromHBase(result);
+        }
+        ByteBuffer[] columnArr = columns.toArray(
+                                   new ByteBuffer[columns.size()]);
+        Get get = new Get(row);
+        for(ByteBuffer column : columnArr) {
+          byte [][] famAndQf = KeyValue.parseColumn(column.array());
+          if (famAndQf.length == 1) {
+            get.addFamily(famAndQf[0]);
+          } else {
+            get.addColumn(famAndQf[0], famAndQf[1]);
+          }
+        }
+        get.setTimeRange(Long.MIN_VALUE, timestamp);
+        Result result = rs.get(regionName, get);
+        return ThriftUtilities.rowResultFromHBase(result);
+      } catch (NotServingRegionException e) {
+        LOG.info(""ThriftServer redirecting getRowWithColumnsTs"");
+        return super.getRowWithColumnsTs(tableName, rowb, columns, timestamp);
+      } catch (IOException e) {
+        throw new IOError(e.getMessage());
+      }
+    }
+  }
+
+  /**
+   * Read and initialize config parameters
+   */
+  private void initialize(Configuration conf) {
+    this.port = conf.getInt(""hbase.regionserver.thrift.port"",
+                            DEFAULT_LISTEN_PORT);
+    this.bindIpAddress = conf.get(""hbase.regionserver.thrift.ipaddress"");
+    this.protocol = conf.get(""hbase.regionserver.thrift.protocol"");
+    this.transport = conf.get(""hbase.regionserver.thrift.transport"");
+    this.nonblocking = conf.getBoolean(""hbase.regionserver.thrift.nonblocking"",
+                                       false);
+  }
+
+  /**
+   * Stop ThriftServer
+   */
+  void shutdown() {
+    if (tserver != null) {
+      tserver.stop();
+      tserver = null;
+    }
+  }
+
+  @Override
+  public void run() {
+    try {
+      HBaseHandlerRegion handler = new HBaseHandlerRegion(this.conf);
+      Hbase.Processor processor = new Hbase.Processor(handler);
+
+      TProtocolFactory protocolFactory;
+      if (this.protocol != null && this.protocol.equals(""compact"")) {
+        protocolFactory = new TCompactProtocol.Factory();
+      } else {
+        protocolFactory = new TBinaryProtocol.Factory();
+      }
+
+      if (this.nonblocking) {
+        TNonblockingServerTransport serverTransport =
+          new TNonblockingServerSocket(this.port);
+        TFramedTransport.Factory transportFactory =
+          new TFramedTransport.Factory();
+
+        TNonblockingServer.Args serverArgs =
+          new TNonblockingServer.Args(serverTransport);
+        serverArgs.processor(processor);
+        serverArgs.transportFactory(transportFactory);
+        serverArgs.protocolFactory(protocolFactory);
+        LOG.info(""starting HRegionServer Nonblocking Thrift server on "" +
+            this.port);
+        LOG.info(""HRegionServer Nonblocking Thrift server does not "" +
+            ""support address binding."");
+        tserver = new TNonblockingServer(serverArgs);
+      } else {
+        InetAddress listenAddress = null;
+        if (this.bindIpAddress != null) {
+          listenAddress = InetAddress.getByName(this.bindIpAddress);
+        } else {
+          listenAddress = InetAddress.getLocalHost();
+        }
+        TServerTransport serverTransport = new TServerSocket(
+           new InetSocketAddress(listenAddress, port));
+
+        TTransportFactory transportFactory;
+        if (this.transport != null && this.transport.equals(""framed"")) {
+          transportFactory = new TFramedTransport.Factory();
+        } else {
+          transportFactory = new TTransportFactory();
+        }
+
+        TThreadPoolServer.Args serverArgs = new TThreadPoolServer.Args(serverTransport);
+        serverArgs.processor(processor);
+        serverArgs.protocolFactory(protocolFactory);
+        serverArgs.transportFactory(transportFactory);
+        LOG.info(""starting HRegionServer ThreadPool Thrift server on "" +
+                 listenAddress + "":"" + this.port);
+        tserver = new TThreadPoolServer(serverArgs);
+      }
+      tserver.serve();
+    } catch (Exception e) {
+      LOG.warn(""Unable to start HRegionServerThrift interface."", e);
+    }
+  }
+}
diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
index b4b49d579522..9d312f241943 100644
--- a/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -195,12 +195,12 @@ protected synchronized ResultScanner removeScanner(int id) {
      * Constructs an HBaseHandler object.
      * @throws IOException
      */
-    HBaseHandler()
+    protected HBaseHandler()
     throws IOException {
       this(HBaseConfiguration.create());
     }
 
-    HBaseHandler(final Configuration c)
+    protected HBaseHandler(final Configuration c)
     throws IOException {
       this.conf = c;
       admin = new HBaseAdmin(conf);"
7fd2d861fe8ce8e51f32d79b5192b144eb2f68ea,Delta Spike,"DELTASPIKE-397 handle hashCode, etc on MessageBundles
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
index 340278728..1b5ef5951 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
@@ -54,6 +54,30 @@ public class MessageBundleInvocationHandler implements InvocationHandler, Serial
     @Override
     public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable
     {
+        if (method.getDeclaringClass().equals(Object.class))
+        {
+            // this sometimes gets invoked directly by the container
+            // there is no perfect solution for those methods,
+            // so we try to use the best info we have atm.
+
+            if (""hashCode"".equals(method.getName()))
+            {
+                return proxy.getClass().hashCode();
+            }
+
+            if (""toString"".equals(method.getName()))
+            {
+                return proxy.getClass().toString();
+            }
+
+            if (""equals"".equals(method.getName()))
+            {
+                return proxy.getClass().equals(args[0].getClass());
+            }
+
+            return null;
+        }
+
         final MessageTemplate messageTemplate = method.getAnnotation(MessageTemplate.class);
 
         String messageTemplateValue;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
index bd40ddc52..cda57c85f 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
@@ -35,6 +35,8 @@
 import javax.inject.Inject;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link org.apache.deltaspike.core.api.message.MessageTemplate}
@@ -99,4 +101,13 @@ public void testMessageCategory()
     }
 
 
+    @Test
+    public void testObjectMethods()
+    {
+        messages.hashCode();
+        assertNotNull(messages.toString());
+        assertTrue(messages.equals(messages));
+        assertNotNull(messages.getClass());
+    }
+
 }"
950786a8cc1a83dde6e590f59958f9ada8699288,spring-framework,Add Jackson2ObjectMapperBeanFactory--Issue: SPR-9739-,a,https://github.com/spring-projects/spring-framework,"diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
new file mode 100644
index 000000000000..19582f4171d2
--- /dev/null
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.http.converter.json;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.springframework.beans.FatalBeanException;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+/**
+ * A FactoryBean for creating a Jackson {@link ObjectMapper} with setters to
+ * enable or disable Jackson features from within XML configuration.
+ *
+ * <p>Example usage with
+ * {@link org.springframework.http.converter.json.MappingJackson2HttpMessageConverter}:
+ *
+ * <pre>
+ * &lt;bean class=""org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"">
+ *   &lt;property name=""objectMapper"">
+ *     &lt;bean class=""org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean""
+ *       p:autoDetectFields=""false""
+ *       p:autoDetectGettersSetters=""false""
+ *       p:annotationIntrospector-ref=""jaxbAnnotationIntrospector"" />
+ *   &lt;/property>
+ * &lt;/bean>
+ * </pre>
+ *
+ * <p>Example usage with {@link org.springframework.web.servlet.view.json.MappingJackson2JsonView}:
+ *
+ * <pre>
+ * &lt;bean class=""org.springframework.web.servlet.view.json.MappingJackson2JsonView"">
+ *   &lt;property name=""objectMapper"">
+ *     &lt;bean class=""org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean""
+ *       p:failOnEmptyBeans=""false""
+ *       p:indentOutput=""true"">
+ *       &lt;property name=""serializers"">
+ *         &lt;array>
+ *           &lt;bean class=""org.mycompany.MyCustomSerializer"" />
+ *         &lt;/array>
+ *       &lt;/property>
+ *     &lt;/bean>
+ *   &lt;/property>
+ * &lt;/bean>
+ * </pre>
+ *
+ * <p>In case there are no specific setters provided (for some rarely used
+ * options), you can still use the more general methods
+ * {@link #setFeaturesToEnable(Object[])} and {@link #setFeaturesToDisable(Object[])}.
+ *
+ * <pre>
+ * &lt;bean class=""org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"">
+ *   &lt;property name=""featuresToEnable"">
+ *     &lt;array>
+ *       &lt;util:constant static-field=""com.fasterxml.jackson.databind.SerializationFeature$WRAP_ROOT_VALUE""/>
+ *       &lt;util:constant static-field=""com.fasterxml.jackson.databind.SerializationFeature$CLOSE_CLOSEABLE""/>
+ *     &lt;/array>
+ *   &lt;/property>
+ *   &lt;property name=""featuresToDisable"">
+ *     &lt;array>
+ *       &lt;util:constant static-field=""com.fasterxml.jackson.databind.MapperFeature$USE_ANNOTATIONS""/>
+ *     &lt;/array>
+ *   &lt;/property>
+ * &lt;/bean>
+ * </pre>
+ *
+ * <p>Note: This BeanFctory is singleton, so if you need more than one you'll need
+ * to configure multiple instances.
+ *
+ * @author <a href=""mailto:dmitry.katsubo@gmail.com"">Dmitry Katsubo</a>
+ * @author Rossen Stoyanchev
+ *
+ * @since 3.2
+ */
+public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper>, InitializingBean {
+
+	private ObjectMapper objectMapper;
+
+	private Map<Object, Boolean> features = new HashMap<Object, Boolean>();
+
+	private DateFormat dateFormat;
+
+	private AnnotationIntrospector annotationIntrospector;
+
+	private final Map<Class<?>, JsonSerializer<?>> serializers = new LinkedHashMap<Class<?>, JsonSerializer<?>>();
+
+	private final Map<Class<?>, JsonDeserializer<?>> deserializers = new LinkedHashMap<Class<?>, JsonDeserializer<?>>();
+
+
+	/**
+	 * Set the ObjectMapper instance to use. If not set, the ObjectMapper will
+	 * be created using its default constructor.
+	 */
+	public void setObjectMapper(ObjectMapper objectMapper) {
+		this.objectMapper = objectMapper;
+	}
+
+	/**
+	 * Define the format for date/time with the given {@link DateFormat}.
+	 * @see #setSimpleDateFormat(String)
+	 */
+	public void setDateFormat(DateFormat dateFormat) {
+		this.dateFormat = dateFormat;
+	}
+
+	/**
+	 * Define the date/time format with a {@link SimpleDateFormat}.
+	 * @see #setDateFormat(DateFormat)
+	 */
+	public void setSimpleDateFormat(String format) {
+		this.dateFormat = new SimpleDateFormat(format);
+	}
+
+	/**
+	 * Set the {@link AnnotationIntrospector} for both serialization and
+	 * deserialization.
+	 */
+	public void setAnnotationIntrospector(AnnotationIntrospector annotationIntrospector) {
+		this.annotationIntrospector = annotationIntrospector;
+	}
+
+	/**
+	 * Configure custom serializers. Each serializer is registered for the type
+	 * returned by {@link JsonSerializer#handledType()}, which must not be
+	 * {@code null}.
+	 * @see #setSerializersByType(Map)
+	 */
+	public void setSerializers(JsonSerializer<?>... serializers) {
+		if (serializers != null) {
+			for (JsonSerializer<?> serializer : serializers) {
+				Class<?> handledType = serializer.handledType();
+				Assert.isTrue(handledType != null && handledType != Object.class,
+						""Unknown handled type in "" + serializer.getClass().getName());
+				this.serializers.put(serializer.handledType(), serializer);
+			}
+		}
+	}
+
+	/**
+	 * Configure custom serializers for the given types.
+	 * @see #setSerializers(JsonSerializer...)
+	 */
+	public void setSerializersByType(Map<Class<?>, JsonSerializer<?>> serializers) {
+		if (serializers != null) {
+			this.serializers.putAll(serializers);
+		}
+	}
+
+	/**
+	 * Configure custom deserializers for the given types.
+	 */
+	public void setDeserializersByType(Map<Class<?>, JsonDeserializer<?>> deserializers) {
+		if (deserializers != null) {
+			this.deserializers.putAll(deserializers);
+		}
+	}
+
+	/**
+	 * Shortcut for {@link MapperFeature#AUTO_DETECT_FIELDS} option.
+	 */
+	public void setAutoDetectFields(boolean autoDetectFields) {
+		this.features.put(MapperFeature.AUTO_DETECT_FIELDS, autoDetectFields);
+	}
+
+	/**
+	 * Shortcut for {@link MapperFeature#AUTO_DETECT_SETTERS}/
+	 * {@link MapperFeature#AUTO_DETECT_GETTERS} option.
+	 */
+	public void setAutoDetectGettersSetters(boolean autoDetectGettersSetters) {
+		this.features.put(MapperFeature.AUTO_DETECT_SETTERS, autoDetectGettersSetters);
+		this.features.put(MapperFeature.AUTO_DETECT_GETTERS, autoDetectGettersSetters);
+	}
+
+	/**
+	 * Shortcut for {@link SerializationFeature#FAIL_ON_EMPTY_BEANS} option.
+	 */
+	public void setFailOnEmptyBeans(boolean failOnEmptyBeans) {
+		this.features.put(SerializationFeature.FAIL_ON_EMPTY_BEANS, failOnEmptyBeans);
+	}
+
+	/**
+	 * Shortcut for {@link SerializationFeature#INDENT_OUTPUT} option.
+	 */
+	public void setIndentOutput(boolean indentOutput) {
+		this.features.put(SerializationFeature.INDENT_OUTPUT, indentOutput);
+	}
+
+	/**
+	 * Specify features to enable.
+	 *
+	 * @see MapperFeature
+	 * @see SerializationFeature
+	 * @see DeserializationFeature
+	 * @see JsonParser.Feature
+	 * @see JsonGenerator.Feature
+	 */
+	public void setFeaturesToEnable(Object... featuresToEnable) {
+		if (featuresToEnable != null) {
+			for (Object feature : featuresToEnable) {
+				this.features.put(feature, Boolean.TRUE);
+			}
+		}
+	}
+
+	/**
+	 * Specify features to disable.
+	 *
+	 * @see MapperFeature
+	 * @see SerializationFeature
+	 * @see DeserializationFeature
+	 * @see JsonParser.Feature
+	 * @see JsonGenerator.Feature
+	 */
+	public void setFeaturesToDisable(Object... featuresToDisable) {
+		if (featuresToDisable != null) {
+			for (Object feature : featuresToDisable) {
+				this.features.put(feature, Boolean.FALSE);
+			}
+		}
+	}
+
+	public void afterPropertiesSet() throws FatalBeanException {
+		if (this.objectMapper == null) {
+			this.objectMapper = new ObjectMapper();
+		}
+
+		if (this.dateFormat != null) {
+			this.objectMapper.setDateFormat(this.dateFormat);
+		}
+
+		if (this.serializers != null || this.deserializers != null) {
+			SimpleModule module = new SimpleModule();
+			addSerializers(module);
+			addDeserializers(module);
+			this.objectMapper.registerModule(module);
+		}
+
+		if (this.annotationIntrospector != null) {
+			this.objectMapper.setAnnotationIntrospector(this.annotationIntrospector);
+		}
+
+		for (Object feature : this.features.keySet()) {
+			configureFeature(feature, this.features.get(feature));
+		}
+	}
+
+	@SuppressWarnings(""unchecked"")
+	private <T> void addSerializers(SimpleModule module) {
+		for (Class<?> type : this.serializers.keySet()) {
+			module.addSerializer((Class<? extends T>) type, (JsonSerializer<T>) this.serializers.get(type));
+		}
+	}
+
+	@SuppressWarnings(""unchecked"")
+	private <T> void addDeserializers(SimpleModule module) {
+		for (Class<?> type : this.deserializers.keySet()) {
+			module.addDeserializer((Class<T>) type, (JsonDeserializer<? extends T>) this.deserializers.get(type));
+		}
+	}
+
+	private void configureFeature(Object feature, boolean enabled) {
+		if (feature instanceof MapperFeature) {
+			this.objectMapper.configure((MapperFeature) feature, enabled);
+		}
+		else if (feature instanceof DeserializationFeature) {
+			this.objectMapper.configure((DeserializationFeature) feature, enabled);
+		}
+		else if (feature instanceof SerializationFeature) {
+			this.objectMapper.configure((SerializationFeature) feature, enabled);
+		}
+		else if (feature instanceof JsonParser.Feature) {
+			this.objectMapper.configure((JsonParser.Feature) feature, enabled);
+		}
+		else if (feature instanceof JsonGenerator.Feature) {
+			this.objectMapper.configure((JsonGenerator.Feature) feature, enabled);
+		}
+		else {
+			throw new FatalBeanException(""Unknown feature class "" + feature.getClass().getName());
+		}
+	}
+
+	/**
+	 * Return the singleton ObjectMapper.
+	 */
+	public ObjectMapper getObject() {
+		return this.objectMapper;
+	}
+
+	public Class<?> getObjectType() {
+		return ObjectMapper.class;
+	}
+
+	public boolean isSingleton() {
+		return true;
+	}
+
+}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
index 765e174255bd..db8a459a6a40 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
@@ -35,7 +35,7 @@
  * A FactoryBean for creating a Jackson {@link ObjectMapper} with setters to
  * enable or disable Jackson features from within XML configuration.
  *
- * <p>Example usage with MappingJacksonHttpMessageConverter:</p>
+ * <p>Example usage with MappingJacksonHttpMessageConverter:
  * <pre>
  * &lt;bean class=""org.springframework.http.converter.json.MappingJacksonHttpMessageConverter"">
  * 	&lt;property name=""objectMapper"">
@@ -47,7 +47,7 @@
  * &lt;/bean>
  * </pre>
  *
- * <p>Example usage with MappingJacksonJsonView:</p>
+ * <p>Example usage with MappingJacksonJsonView:
  * <pre>
  * &lt;bean class=""org.springframework.web.servlet.view.json.MappingJacksonJsonView"">
  * 	&lt;property name=""objectMapper"">
@@ -89,10 +89,10 @@ public class JacksonObjectMapperFactoryBean implements FactoryBean<ObjectMapper>
 
 	private Map<Object, Boolean> features = new HashMap<Object, Boolean>();
 
-	private AnnotationIntrospector annotationIntrospector;
-
 	private DateFormat dateFormat;
 
+	private AnnotationIntrospector annotationIntrospector;
+
 
 	/**
 	 * Set the ObjectMapper instance to use.
@@ -103,16 +103,15 @@ public void setObjectMapper(ObjectMapper objectMapper) {
 	}
 
 	/**
-	 * Define annotationIntrospector for
-	 * {@link SerializationConfig#setAnnotationIntrospector(AnnotationIntrospector)}.
+	 * Define the format for date/time with the given {@link DateFormat}.
+	 * @see #setSimpleDateFormat(String)
 	 */
-	public void setAnnotationIntrospector(AnnotationIntrospector annotationIntrospector) {
-		this.annotationIntrospector = annotationIntrospector;
+	public void setDateFormat(DateFormat dateFormat) {
+		this.dateFormat = dateFormat;
 	}
 
 	/**
-	 * Define the date/time format with the given string, which is in turn used
-	 * to create a {@link SimpleDateFormat}.
+	 * Define the date/time format with a {@link SimpleDateFormat}.
 	 * @see #setDateFormat(DateFormat)
 	 */
 	public void setSimpleDateFormat(String format) {
@@ -120,11 +119,12 @@ public void setSimpleDateFormat(String format) {
 	}
 
 	/**
-	 * Define the format for date/time with the given {@link DateFormat} instance.
-	 * @see #setSimpleDateFormat(String)
+	 * Set the {@link AnnotationIntrospector} for serialization and deserialization.
+	 * @see SerializationConfig#setAnnotationIntrospector(AnnotationIntrospector)
+	 * @see DeserializationConfig#setAnnotationIntrospector(AnnotationIntrospector)
 	 */
-	public void setDateFormat(DateFormat dateFormat) {
-		this.dateFormat = dateFormat;
+	public void setAnnotationIntrospector(AnnotationIntrospector annotationIntrospector) {
+		this.annotationIntrospector = annotationIntrospector;
 	}
 
 	/**
@@ -161,6 +161,7 @@ public void setIndentOutput(boolean indentOutput) {
 
 	/**
 	 * Specify features to enable.
+	 *
 	 * @see SerializationConfig.Feature
 	 * @see DeserializationConfig.Feature
 	 * @see JsonParser.Feature
@@ -176,6 +177,7 @@ public void setFeaturesToEnable(Object[] featuresToEnable) {
 
 	/**
 	 * Specify features to disable.
+	 *
 	 * @see SerializationConfig.Feature
 	 * @see DeserializationConfig.Feature
 	 * @see JsonParser.Feature
@@ -189,7 +191,6 @@ public void setFeaturesToDisable(Object[] featuresToDisable) {
 		}
 	}
 
-
 	public void afterPropertiesSet() {
 		if (this.objectMapper == null) {
 			this.objectMapper = new ObjectMapper();
@@ -203,11 +204,11 @@ public void afterPropertiesSet() {
 			this.objectMapper.getSerializationConfig().setDateFormat(this.dateFormat);
 		}
 		for (Map.Entry<Object, Boolean> entry : this.features.entrySet()) {
-			setFeatureEnabled(entry.getKey(), entry.getValue());
+			configureFeature(entry.getKey(), entry.getValue().booleanValue());
 		}
 	}
 
-	private void setFeatureEnabled(Object feature, boolean enabled) {
+	private void configureFeature(Object feature, boolean enabled) {
 		if (feature instanceof DeserializationConfig.Feature) {
 			this.objectMapper.configure((DeserializationConfig.Feature) feature, enabled);
 		}
@@ -225,7 +226,9 @@ else if (feature instanceof JsonGenerator.Feature) {
 		}
 	}
 
-
+	/**
+	 * Return the singleton ObjectMapper.
+	 */
 	public ObjectMapper getObject() {
 		return this.objectMapper;
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
new file mode 100644
index 000000000000..bc52e4c40227
--- /dev/null
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.http.converter.json;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.beans.FatalBeanException;
+import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig;
+import com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig;
+import com.fasterxml.jackson.databind.deser.std.DateDeserializers.DateDeserializer;
+import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector;
+import com.fasterxml.jackson.databind.ser.std.StdJdkSerializers.ClassSerializer;
+
+/**
+ * Test cases for {@link Jackson2ObjectMapperFactoryBean} class.
+ *
+ * @author <a href=""mailto:dmitry.katsubo@gmail.com"">Dmitry Katsubo</a>
+ */
+public class Jackson2ObjectMapperFactoryBeanTests {
+
+	private static final String DATE_FORMAT = ""yyyy-MM-dd"";
+
+	private Jackson2ObjectMapperFactoryBean factory;
+
+	@Before
+	public void setUp() {
+		factory = new Jackson2ObjectMapperFactoryBean();
+	}
+
+	@Test
+	public void testSetFeaturesToEnableEmpty() {
+		this.factory.setFeaturesToEnable(new Object[0]);
+		this.factory.setFeaturesToDisable(new Object[0]);
+	}
+
+	@Test(expected = FatalBeanException.class)
+	public void testUnknownFeature() {
+		this.factory.setFeaturesToEnable(new Object[] { Boolean.TRUE });
+		this.factory.afterPropertiesSet();
+	}
+
+	@Test
+	public void testBooleanSetters() {
+		this.factory.setAutoDetectFields(false);
+		this.factory.setAutoDetectGettersSetters(false);
+		this.factory.setFailOnEmptyBeans(false);
+		this.factory.setIndentOutput(true);
+		this.factory.afterPropertiesSet();
+
+		ObjectMapper objectMapper = this.factory.getObject();
+
+		assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
+		assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
+		assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
+		assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.AUTO_DETECT_SETTERS));
+		assertFalse(objectMapper.getSerializationConfig().isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS));
+		assertTrue(objectMapper.getSerializationConfig().isEnabled(SerializationFeature.INDENT_OUTPUT));
+	}
+
+	@Test
+	public void testDateTimeFormatSetter() {
+		SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
+
+		this.factory.setDateFormat(dateFormat);
+		this.factory.afterPropertiesSet();
+
+		assertEquals(dateFormat, this.factory.getObject().getSerializationConfig().getDateFormat());
+		assertEquals(dateFormat, this.factory.getObject().getDeserializationConfig().getDateFormat());
+	}
+
+	@Test
+	public void testSimpleDateFormatStringSetter() {
+		SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
+
+		this.factory.setSimpleDateFormat(DATE_FORMAT);
+		this.factory.afterPropertiesSet();
+
+		assertEquals(dateFormat, this.factory.getObject().getSerializationConfig().getDateFormat());
+		assertEquals(dateFormat, this.factory.getObject().getDeserializationConfig().getDateFormat());
+	}
+
+	@Test
+	public void testSimpleSetup() {
+		this.factory.afterPropertiesSet();
+
+		assertNotNull(this.factory.getObject());
+		assertTrue(this.factory.isSingleton());
+		assertEquals(ObjectMapper.class, this.factory.getObjectType());
+	}
+
+	/**
+	 * TODO: Remove use of {@link DirectFieldAccessor} with getters.
+	 * See <a href=""https://github.com/FasterXML/jackson-databind/issues/65"">issue#65</a>.
+	 */
+	private static final SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) {
+		Object factoryProp = new DirectFieldAccessor(objectMapper).getPropertyValue(""_serializerFactory"");
+		return (SerializerFactoryConfig) new DirectFieldAccessor(factoryProp).getPropertyValue(""_factoryConfig"");
+	}
+
+	private static final DeserializerFactoryConfig getDeserializerFactoryConfig(ObjectMapper objectMapper) {
+		Object contextProp = new DirectFieldAccessor(objectMapper).getPropertyValue(""_deserializationContext"");
+		Object factoryProp = new DirectFieldAccessor(contextProp).getPropertyValue(""_factory"");
+		return (DeserializerFactoryConfig) new DirectFieldAccessor(factoryProp).getPropertyValue(""_factoryConfig"");
+	}
+
+	@Test
+	public void testCompleteSetup() {
+		NopAnnotationIntrospector annotationIntrospector = NopAnnotationIntrospector.instance;
+		ObjectMapper objectMapper = new ObjectMapper();
+
+		assertTrue(this.factory.isSingleton());
+		assertEquals(ObjectMapper.class, this.factory.getObjectType());
+
+		Map<Class<?>, JsonDeserializer<?>> deserializers = new HashMap<Class<?>, JsonDeserializer<?>>();
+		deserializers.put(Date.class, new DateDeserializer());
+
+		this.factory.setObjectMapper(objectMapper);
+		this.factory.setSerializers(new ClassSerializer());
+		this.factory.setDeserializersByType(deserializers);
+		this.factory.setAnnotationIntrospector(annotationIntrospector);
+
+		this.factory.setFeaturesToEnable(
+				SerializationFeature.FAIL_ON_EMPTY_BEANS,
+				DeserializationFeature.UNWRAP_ROOT_VALUE,
+				JsonParser.Feature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER,
+				JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS);
+
+		this.factory.setFeaturesToDisable(
+				MapperFeature.AUTO_DETECT_GETTERS,
+				MapperFeature.AUTO_DETECT_FIELDS,
+				JsonParser.Feature.AUTO_CLOSE_SOURCE,
+				JsonGenerator.Feature.QUOTE_FIELD_NAMES);
+
+		assertFalse(getSerializerFactoryConfig(objectMapper).hasSerializers());
+		assertFalse(getDeserializerFactoryConfig(objectMapper).hasDeserializers());
+
+		this.factory.afterPropertiesSet();
+
+		assertTrue(objectMapper == this.factory.getObject());
+
+		assertTrue(getSerializerFactoryConfig(objectMapper).hasSerializers());
+		assertTrue(getDeserializerFactoryConfig(objectMapper).hasDeserializers());
+
+		assertTrue(annotationIntrospector == objectMapper.getSerializationConfig().getAnnotationIntrospector());
+		assertTrue(annotationIntrospector == objectMapper.getDeserializationConfig().getAnnotationIntrospector());
+
+		assertTrue(objectMapper.getSerializationConfig().isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS));
+		assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE));
+		assertTrue(objectMapper.getJsonFactory().isEnabled(JsonParser.Feature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER));
+		assertTrue(objectMapper.getJsonFactory().isEnabled(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS));
+
+		assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
+		assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
+		assertFalse(objectMapper.getJsonFactory().isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE));
+		assertFalse(objectMapper.getJsonFactory().isEnabled(JsonGenerator.Feature.QUOTE_FIELD_NAMES));
+	}
+}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBeanTests.java
index 3a22dfddf1ab..a66f4e2fbb8d 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBeanTests.java
@@ -32,8 +32,6 @@
 import org.codehaus.jackson.map.introspect.NopAnnotationIntrospector;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.http.converter.json.JacksonObjectMapperFactoryBean;
 
 /**
  * @author <a href=""mailto:dmitry.katsubo@gmail.com"">Dmitry Katsubo</a>
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
index 603b6613abec..3579c5d4644d 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -52,7 +52,7 @@ public void readGenerics() throws IOException {
 
 			@Override
 			protected JavaType getJavaType(Type type) {
-				if (type instanceof Class && List.class.isAssignableFrom((Class)type)) {
+				if (type instanceof Class && List.class.isAssignableFrom((Class<?>)type)) {
 					return new ObjectMapper().getTypeFactory().constructCollectionType(ArrayList.class, MyBean.class);
 				}
 				else {
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
index c3fe567a69cb..5f70a4d6d4b7 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
@@ -50,7 +50,7 @@ public void readGenerics() throws IOException {
 		MappingJacksonHttpMessageConverter converter = new MappingJacksonHttpMessageConverter() {
 			@Override
 			protected JavaType getJavaType(Type type) {
-				if (type instanceof Class && List.class.isAssignableFrom((Class)type)) {
+				if (type instanceof Class && List.class.isAssignableFrom((Class<?>)type)) {
 					return TypeFactory.collectionType(ArrayList.class, MyBean.class);
 				}
 				else {"
504b801ca0e7fd3944872d3214539feb2d614f06,hadoop,HDFS-73. DFSOutputStream does not close all the- sockets. Contributed by Uma Maheswara Rao G--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1157232 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hdfs/CHANGES.txt b/hdfs/CHANGES.txt
index 5148ea243d7e0..02c8864284dd2 100644
--- a/hdfs/CHANGES.txt
+++ b/hdfs/CHANGES.txt
@@ -964,6 +964,9 @@ Trunk (unreleased changes)
     HDFS-2240. Fix a deadlock in LeaseRenewer by enforcing lock acquisition
     ordering.  (szetszwo)
 
+    HDFS-73. DFSOutputStream does not close all the sockets.
+    (Uma Maheswara Rao G via eli)
+
   BREAKDOWN OF HDFS-1073 SUBTASKS
 
     HDFS-1521. Persist transaction ID on disk between NN restarts.
diff --git a/hdfs/src/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hdfs/src/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index d267bf8a8d4a3..03879338dd273 100644
--- a/hdfs/src/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++ b/hdfs/src/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -36,7 +36,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CreateFlag;
 import org.apache.hadoop.fs.FSOutputSummer;
 import org.apache.hadoop.fs.FileAlreadyExistsException;
@@ -63,7 +62,6 @@
 import org.apache.hadoop.hdfs.protocol.proto.DataTransferProtos.Status;
 import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;
 import org.apache.hadoop.hdfs.security.token.block.InvalidBlockTokenException;
-import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.namenode.NotReplicatedYetException;
 import org.apache.hadoop.hdfs.server.namenode.SafeModeException;
 import org.apache.hadoop.io.EnumSetWritable;
@@ -606,6 +604,7 @@ private void closeStream() {
         try {
           blockStream.close();
         } catch (IOException e) {
+          setLastException(e);
         } finally {
           blockStream = null;
         }
@@ -614,10 +613,20 @@ private void closeStream() {
         try {
           blockReplyStream.close();
         } catch (IOException e) {
+          setLastException(e);
         } finally {
           blockReplyStream = null;
         }
       }
+      if (null != s) {
+        try {
+          s.close();
+        } catch (IOException e) {
+          setLastException(e);
+        } finally {
+          s = null;
+        }
+      }
     }
 
     //
@@ -1003,16 +1012,20 @@ private boolean createBlockOutputStream(DatanodeInfo[] nodes, long newGS,
       persistBlocks.set(true);
 
       boolean result = false;
+      DataOutputStream out = null;
       try {
+        assert null == s : ""Previous socket unclosed"";
         s = createSocketForPipeline(nodes[0], nodes.length, dfsClient);
         long writeTimeout = dfsClient.getDatanodeWriteTimeout(nodes.length);
 
         //
         // Xmit header info to datanode
         //
-        DataOutputStream out = new DataOutputStream(new BufferedOutputStream(
+        out = new DataOutputStream(new BufferedOutputStream(
             NetUtils.getOutputStream(s, writeTimeout),
             FSConstants.SMALL_BUFFER_SIZE));
+        
+        assert null == blockReplyStream : ""Previous blockReplyStream unclosed"";
         blockReplyStream = new DataInputStream(NetUtils.getInputStream(s));
 
         // send the request
@@ -1038,7 +1051,7 @@ private boolean createBlockOutputStream(DatanodeInfo[] nodes, long newGS,
                 + firstBadLink);
           }
         }
-
+        assert null == blockStream : ""Previous blockStream unclosed"";
         blockStream = out;
         result =  true; // success
 
@@ -1059,12 +1072,15 @@ private boolean createBlockOutputStream(DatanodeInfo[] nodes, long newGS,
         }
         hasError = true;
         setLastException(ie);
-        blockReplyStream = null;
         result =  false;  // error
       } finally {
         if (!result) {
           IOUtils.closeSocket(s);
           s = null;
+          IOUtils.closeStream(out);
+          out = null;
+          IOUtils.closeStream(blockReplyStream);
+          blockReplyStream = null;
         }
       }
       return result;"
901ed29b21a14d55aa649c4d765ae4d1c8d0c53d,google$truth,"Fuzzy Truth: Start work on containsExactly functionality � this is the big fish in this pond. Specifically, this CL includes a partial implementation of IterableSubject.UsingCorrespondence.containsExactlyElementsIn. The other versions will hang off this. This CL handles some cases but the maximum cardinality bipartite matching algorithm is still unimplemented and so the method throws if it hits that bit. The method is package-visible, so that we can test it but don't expose it to users.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130940031
",p,https://github.com/google/truth,"diff --git a/core/src/main/java/com/google/common/truth/IterableSubject.java b/core/src/main/java/com/google/common/truth/IterableSubject.java
index 30f9176db..3810be410 100644
--- a/core/src/main/java/com/google/common/truth/IterableSubject.java
+++ b/core/src/main/java/com/google/common/truth/IterableSubject.java
@@ -22,6 +22,12 @@
 import static java.util.Arrays.asList;
 
 import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.LinkedHashMultiset;
@@ -36,12 +42,14 @@
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import javax.annotation.Nullable;
 
 /**
  * Propositions for {@link Iterable} subjects.
  *
  * @author Kurt Alfred Kluever
+ * @author Pete Gillin
  */
 // Can't be final since MultisetSubject extends it
 public class IterableSubject extends Subject<IterableSubject, Iterable<?>> {
@@ -599,13 +607,207 @@ private Ordered containsExactly(@Nullable E... expected) {
      *
      * <p>To also test that the contents appear in the given order, make a call to {@code inOrder()}
      * on the object returned by this method.
+     *
+     * <p>THIS METHOD IS UNDER CONSTRUCTION. It will work under some conditions, and throw
+     * {@link UnsupportedOperationException} under others. DO NOT USE!
      */
     @CanIgnoreReturnValue
-    @SuppressWarnings(""unused"") // TODO(b/29966314): Implement this and make it public.
-    private Ordered containsExactlyElementsIn(Iterable<E> expected) {
+    // TODO(b/29966314): Finish implementing this, remove the ""under construction"" in the javadoc,
+    // and make it public.
+    Ordered containsExactlyElementsIn(Iterable<? extends E> expected) {
+      // Check if the elements correspond in order. This allows the common case of a passing test
+      // using inOrder() to complete in linear time.
+      if (correspondInOrder(getCastSubject().iterator(), expected.iterator())) {
+        return IN_ORDER;
+      }
+      // We know they don't correspond in order, so we're going to have to do an any-order test.
+      // Find a many:many mapping between the indexes of the elements which correspond, and check
+      // it for completeness.
+      ImmutableList<A> actualList = ImmutableList.copyOf(getCastSubject());
+      ImmutableList<? extends E> expectedList = ImmutableList.copyOf(expected);
+      ImmutableSetMultimap<Integer, Integer> candidateMapping =
+          findCandidateMapping(actualList, expectedList);
+      failIfCandidateMappingHasMissingOrExtra(actualList, expectedList, candidateMapping);
+      // We know that every expected element maps to at least one actual element, and vice versa.
+      // Find a maximal 1:1 mapping, and check it for completeness.
+      ImmutableBiMap<Integer, Integer> maximalOneToOneMapping =
+          findMaximalOneToOneMapping(candidateMapping);
+      failIfOneToOneMappingHasMissingOrExtra(actualList, expectedList, maximalOneToOneMapping);
+      // The 1:1 mapping is complete, so the test succeeds (but we know from above that the mapping
+      // is not in order).
+      return new NotInOrder(
+          ""contains, in order, exactly one element that "" + correspondence + "" each element of"",
+          expected);
+    }
+
+    /**
+     * Returns whether the actual and expected iterators have the same number of elements and, when
+     * iterated pairwise, every pair of actual and expected values satisfies the correspondence.
+     */
+    private boolean correspondInOrder(
+        Iterator<? extends A> actual, Iterator<? extends E> expected) {
+      while (actual.hasNext() && expected.hasNext()) {
+        A actualElement = actual.next();
+        E expectedElement = expected.next();
+        if (!correspondence.compare(actualElement, expectedElement)) {
+          return false;
+        }
+      }
+      return !(actual.hasNext() || expected.hasNext());
+    }
+
+    /**
+     * Given a list of actual elements and a list of expected elements, finds a many:many mapping
+     * between actual and expected elements where a pair of elements maps if it satisfies the
+     * correspondence. Returns this mapping as a multimap where the keys are indexes into the actual
+     * list and the values are indexes into the expected list.
+     */
+    private ImmutableSetMultimap<Integer, Integer> findCandidateMapping(
+        List<? extends A> actual, List<? extends E> expected) {
+      ImmutableSetMultimap.Builder<Integer, Integer> mapping = ImmutableSetMultimap.builder();
+      for (int actualIndex = 0; actualIndex < actual.size(); actualIndex++) {
+        for (int expectedIndex = 0; expectedIndex < expected.size(); expectedIndex++) {
+          if (correspondence.compare(actual.get(actualIndex), expected.get(expectedIndex))) {
+            mapping.put(actualIndex, expectedIndex);
+          }
+        }
+      }
+      return mapping.build();
+    }
+
+    /**
+     * Given a list of actual elements, a list of expected elements, and a many:many mapping between
+     * actual and expected elements specified as a multimap of indexes into the actual list to
+     * indexes into the expected list, checks that every actual element maps to at least one
+     * expected element and vice versa, and fails if this is not the case.
+     */
+    void failIfCandidateMappingHasMissingOrExtra(
+        List<? extends A> actual,
+        List<? extends E> expected,
+        ImmutableMultimap<Integer, Integer> mapping) {
+      ImmutableList<? extends A> extra = findNotIndexed(actual, mapping.keySet());
+      ImmutableList<? extends E> missing = findNotIndexed(expected, mapping.inverse().keySet());
+      Optional<String> missingOrExtraMessage = describeMissingOrExtra(extra, missing);
+      if (missingOrExtraMessage.isPresent()) {
+          failWithRawMessage(
+              ""Not true that %s contains exactly one element that %s each element of <%s>. It %s"",
+              getDisplaySubject(),
+              correspondence,
+              expected,
+              missingOrExtraMessage.get());
+      }
+    }
+
+    /**
+     * Given a list of extra elements and a list of missing elements, returns an absent value if
+     * both are empty, and otherwise returns a verb phrase (suitable for appearing after the subject
+     * of the verb) describing them.
+     */
+    private Optional<String> describeMissingOrExtra(
+        List<? extends A> extra, List<? extends E> missing) {
+      if (!missing.isEmpty() && !extra.isEmpty()) {
+        return Optional.of(
+            StringUtil.format(
+                ""is missing an element that %s %s and has unexpected elements <%s>"",
+                correspondence, formatMissing(missing), extra));
+      } else if (!missing.isEmpty()) {
+        return Optional.of(
+            StringUtil.format(
+                ""is missing an element that %s %s"", correspondence, formatMissing(missing)));
+      } else if (!extra.isEmpty()) {
+        return Optional.of(StringUtil.format(""has unexpected elements <%s>"", extra));
+      } else {
+        return Optional.absent();
+      }
+    }
+
+    /**
+     * Returns all the elements of the given list other than those with the given indexes. Assumes
+     * that all the given indexes really are valid indexes into the list.
+     */
+    private <T> ImmutableList<T> findNotIndexed(List<T> list, Set<Integer> indexes) {
+      if (indexes.size() == list.size()) {
+        // If there are as many distinct valid indexes are there are elements in the list then every
+        // index must be in there once.
+        return ImmutableList.of();
+      }
+      ImmutableList.Builder<T> notIndexed = ImmutableList.builder();
+      for (int index = 0; index < list.size(); index++) {
+        if (!indexes.contains(index)) {
+          notIndexed.add(list.get(index));
+        }
+      }
+      return notIndexed.build();
+    }
+
+    /**
+     * Returns a description of the missing items suitable for inclusion in failure messages. If
+     * there is a single item, returns {@code ""<item>""}. Otherwise, returns
+     * {@code ""each of <[item, item, item]>""}.
+     */
+    private String formatMissing(List<?> missing) {
+      if (missing.size() == 1) {
+        return ""<"" + missing.get(0) + "">"";
+      } else {
+        return ""each of <"" + missing + "">"";
+      }
+    }
+
+    /**
+     * Given a many:many mapping between actual elements and expected elements, finds a 1:1
+     * mapping which is the subset of that many:many mapping which includes the largest possible
+     * number of elements. The input and output mappings are each described as a map or multimap
+     * where the keys are indexes into the actual list and the values are indexes into the expected
+     * list. If there are multiple possible output mappings tying for the largest possible, this
+     * returns an arbitrary one.
+     */
+    private ImmutableBiMap<Integer, Integer> findMaximalOneToOneMapping(
+        ImmutableMultimap<Integer, Integer> edges) {
+      /*
+       * Finding this 1:1 mapping is analogous to finding a maximum cardinality bipartite matching
+       * (https://en.wikipedia.org/wiki/Matching_(graph_theory)#In_unweighted_bipartite_graphs).
+       *  - The two sets of elements together correspond to the vertices of a graph.
+       *  - The many:many mapping corresponds to the edges of that graph.
+       *  - The graph is therefore bipartite, with the two sets of elements corresponding to the two
+       * parts.
+       *  - A 1:1 mapping corresponds to a matching on that bipartite graph (aka an independent edge
+       * set, i.e. a subset of the edges with no common vertices).
+       *  - And the 1:1 mapping which includes the largest possible number of elements corresponds
+       * to the maximum cardinality matching.
+       *
+       * So we'll apply a standard algorithm for doing maximum cardinality bipartite matching.
+       */
       throw new UnsupportedOperationException();
     }
 
+    /**
+     * Given a list of actual elements, a list of expected elements, and a 1:1 mapping between
+     * actual and expected elements specified as a bimap of indexes into the actual list to indexes
+     * into the expected list, checks that every actual element maps to an expected element and vice
+     * versa, and fails if this is not the case.
+     */
+    void failIfOneToOneMappingHasMissingOrExtra(
+        List<? extends A> actual,
+        List<? extends E> expected,
+        BiMap<Integer, Integer> mapping) {
+      ImmutableList<? extends A> extra = findNotIndexed(actual, mapping.keySet());
+      ImmutableList<? extends E> missing = findNotIndexed(expected, mapping.inverse().keySet());
+      Optional<String> missingOrExtraMessage = describeMissingOrExtra(extra, missing);
+      if (missingOrExtraMessage.isPresent()) {
+        failWithRawMessage(
+            ""Not true that %s contains exactly one element that %s each element of <%s>. ""
+                + ""It contains at least one element that matches each expected element, ""
+                + ""and every element it contains matches at least one expected element, ""
+                + ""but there was no 1:1 mapping between all the actual and expected elements. ""
+                + ""Using the most complete 1:1 mapping (or one such mapping, if there is a tie), ""
+                + ""it %s"",
+            getDisplaySubject(),
+            correspondence,
+            expected,
+            missingOrExtraMessage.get());
+      }
+    }
+
     /**
      * Attests that the subject contains elements that corresponds to all of the expected elements,
      * i.e. that there is a 1:1 mapping between any subset of the actual elements and the expected
diff --git a/core/src/test/java/com/google/common/truth/IterableSubjectTest.java b/core/src/test/java/com/google/common/truth/IterableSubjectTest.java
index 1416d4a47..c1cfca8a3 100644
--- a/core/src/test/java/com/google/common/truth/IterableSubjectTest.java
+++ b/core/src/test/java/com/google/common/truth/IterableSubjectTest.java
@@ -810,7 +810,7 @@ public void isStrictlyOrderedWithNonComparableElementsFailure() {
     try {
       assertThat(asList((Object) 1, ""2"", 3, ""4"")).isStrictlyOrdered();
       fail(""Should have thrown."");
-    } catch (ClassCastException e) {
+    } catch (ClassCastException expected) {
     }
   }
 
@@ -837,7 +837,7 @@ public void isOrderedWithNonComparableElementsFailure() {
     try {
       assertThat(asList((Object) 1, ""2"", 2, ""3"")).isOrdered();
       fail(""Should have thrown."");
-    } catch (ClassCastException e) {
+    } catch (ClassCastException expected) {
     }
   }
 
@@ -1001,4 +1001,134 @@ public void comparingElementsUsing_doesNotContains_failure() {
                   + ""parses to <456>. It contained the following such elements: <[+456]>"");
     }
   }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_inOrder_success() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 128);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+128"", ""+256"", ""0x80"");
+    assertThat(actual)
+        .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+        .containsExactlyElementsIn(expected)
+        .inOrder();
+  }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_failsMissingOneCandidate() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 128);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+128"", ""0x40"", ""0x80"");
+    // Actual list has candidate matches for 64, 128, and the other 128, but is missing 256.
+    try {
+      assertThat(actual)
+          .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+          .containsExactlyElementsIn(expected);
+      fail(""Expected failure"");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessage(
+              ""Not true that <[+64, +128, 0x40, 0x80]> contains exactly one element that ""
+                  + ""parses to each element of <[64, 128, 256, 128]>. ""
+                  + ""It is missing an element that parses to <256>"");
+    }
+  }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_failsMultipleMissingCandidates() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 128);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+64"", ""0x40"", ""0x40"");
+    // Actual list has candidate matches for 64 only, and is missing 128, 256, and the other 128.
+    try {
+      assertThat(actual)
+          .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+          .containsExactlyElementsIn(expected);
+      fail(""Expected failure"");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessage(
+              ""Not true that <[+64, +64, 0x40, 0x40]> contains exactly one element that ""
+                  + ""parses to each element of <[64, 128, 256, 128]>. ""
+                  + ""It is missing an element that parses to each of <[128, 256, 128]>"");
+    }
+  }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_failsOrderedMissingOneCandidate() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 512);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+128"", ""+256"");
+    // Actual list has in-order candidate matches for 64, 128, and 256, but is missing 512.
+    try {
+      assertThat(actual)
+          .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+          .containsExactlyElementsIn(expected);
+      fail(""Expected failure"");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessage(
+              ""Not true that <[+64, +128, +256]> contains exactly one element that ""
+                  + ""parses to each element of <[64, 128, 256, 512]>. ""
+                  + ""It is missing an element that parses to <512>"");
+    }
+  }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_failsExtraCandidates() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 128);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+128"", ""+256"", ""cheese"");
+    // Actual list has candidate matches for all the expected, but has extra cheese.
+    try {
+      assertThat(actual)
+          .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+          .containsExactlyElementsIn(expected);
+      fail(""Expected failure"");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessage(
+              ""Not true that <[+64, +128, +256, cheese]> contains exactly one element that ""
+                  + ""parses to each element of <[64, 128, 256, 128]>. ""
+                  + ""It has unexpected elements <[cheese]>"");
+    }
+  }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_failsOrderedExtraCandidates() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 128);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+128"", ""+256"", ""0x80"", ""cheese"");
+    // Actual list has in-order candidate matches for all the expected, but has extra cheese.
+    try {
+      assertThat(actual)
+          .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+          .containsExactlyElementsIn(expected);
+      fail(""Expected failure"");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessage(
+              ""Not true that <[+64, +128, +256, 0x80, cheese]> contains exactly one element that ""
+                  + ""parses to each element of <[64, 128, 256, 128]>. ""
+                  + ""It has unexpected elements <[cheese]>"");
+    }
+  }
+
+  @Test
+  public void comparingElementsUsing_containsExactlyElementsIn_failsMissingAndExtraCandidates() {
+    ImmutableList<Integer> expected = ImmutableList.of(64, 128, 256, 128);
+    ImmutableList<String> actual = ImmutableList.of(""+64"", ""+128"", ""jalapenos"", ""cheese"");
+    // Actual list has candidate matches for 64, 128, and the other 128, but is missing 256 and has
+    // extra jalapenos and cheese.
+    try {
+      assertThat(actual)
+          .comparingElementsUsing(STRING_PARSES_TO_INTEGER_CORRESPONDENCE)
+          .containsExactlyElementsIn(expected);
+      fail(""Expected failure"");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessage(
+              ""Not true that <[+64, +128, jalapenos, cheese]> contains exactly one element that ""
+                  + ""parses to each element of <[64, 128, 256, 128]>. ""
+                  + ""It is missing an element that parses to <256> ""
+                  + ""and has unexpected elements <[jalapenos, cheese]>"");
+    }
+  }
+
+  // TODO(b/29966314): Add tests for the out-of-order success case, and for the failure cases where
+  // the candidate mapping succeeds but the 1:1 mapping fails, and for the failure case where the
+  // any-order test would pass but we do an in-order assertion.
 }"
56a939c3f16d0c9a90fb4f9e332838a234c08415,Vala,"Error when lambda parameter has incompatible direction with the delegate

Fixes bug 740894
",a,https://github.com/GNOME/vala/,"diff --git a/vala/valalambdaexpression.vala b/vala/valalambdaexpression.vala
index 61482f42a6..6918710568 100644
--- a/vala/valalambdaexpression.vala
+++ b/vala/valalambdaexpression.vala
@@ -183,6 +183,12 @@ public class Vala.LambdaExpression : Expression {
 			}
 
 			Parameter lambda_param = lambda_param_it.get ();
+
+			if (lambda_param.direction != cb_param.direction) {
+				error = true;
+				Report.error (lambda_param.source_reference, ""direction of parameter `%s' is incompatible with the target delegate"".printf (lambda_param.name));
+			}
+
 			lambda_param.variable_type = cb_param.variable_type.get_actual_type (target_type, null, this);
 			method.add_parameter (lambda_param);
 		}"
ec463a32ba825d678a230c7ab5f3eb2e1e0c2e42,spring-framework,added DataSourceFactory strategy; promoted- EmbeddedDatabaseConfigurer strategy to public API; added ability to add any- number of SQL scripts for db population--,a,https://github.com/spring-projects/spring-framework,"diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java
new file mode 100644
index 000000000000..b0276e7be041
--- /dev/null
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ConnectionProperties.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.jdbc.datasource.embedded;
+
+/**
+ * Allows DataSource connection properties to be configured in a DataSource implementation independent manner.
+ * @author Keith Donald
+ * @see DataSourceFactory
+ */
+public interface ConnectionProperties {
+	
+	/**
+	 * Set the JDBC driver to use to connect to the database.
+	 * @param driverClass the jdbc driver class
+	 */
+	void setDriverClass(Class<?> driverClass);
+	
+	/**
+	 * Sets the JDBC connection URL of the database.
+	 * @param url the connection url
+	 */
+	void setUrl(String url);
+	
+	/**
+	 * Sets the username to use to connect to the database.
+	 * @param username the username
+	 */
+	void setUsername(String username);
+	
+	/**
+	 * Sets the password to use to connect to the database.
+	 * @param password the password
+	 */
+	void setPassword(String password);
+}
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java
new file mode 100644
index 000000000000..0313294a4f23
--- /dev/null
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DataSourceFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.jdbc.datasource.embedded;
+
+import javax.sql.DataSource;
+
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+
+/**
+ * A factory for a kind of DataSource, such as a {@link SimpleDriverDataSource} or connection pool such as Apache DBCP or c3p0.
+ * Call {@link #getConnectionProperties()} to configure normalized DataSource properties before calling {@link #getDataSource()} to actually get the configured DataSource instance.
+ * @author Keith Donald 
+ */
+public interface DataSourceFactory {
+	
+	/**
+	 * Allows properties of the DataSource to be configured.
+	 */
+	ConnectionProperties getConnectionProperties();
+	
+	/**
+	 * Returns the DataSource with the connection properties applied.
+	 */
+	DataSource getDataSource();
+	
+}
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DatabasePopulator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DatabasePopulator.java
index 1b2c6bfbc992..a8929c7f5c80 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DatabasePopulator.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DatabasePopulator.java
@@ -20,7 +20,7 @@
 
 /**
  * Strategy for populating a database with data.
- * 
+ * @author Keith Donald
  * @see ResourceDatabasePopulator
  */
 public interface DatabasePopulator {
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
index 057ef92ec7f6..075eca8d3eff 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
@@ -21,11 +21,12 @@
  * A handle to an EmbeddedDatabase instance.
  * Is a {@link DataSource}.
  * Adds a shutdown operation so the embedded database instance can be shutdown.
+ * @author Keith Donald
  */
 public interface EmbeddedDatabase extends DataSource {
 	
 	/**
 	 * Shutdown this embedded database.
 	 */
-	public void shutdown();
+	void shutdown();
 }
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
index cb51166c87e6..2afd35d31565 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
@@ -28,9 +28,6 @@
  * EmbeddedDatabase db = builder.schema(""schema.sql"").testData(""test-data.sql"").build();
  * db.shutdown();
  * </pre>
- * 
- * TODO - should we replace schema/testdata with more general 'script' method?
- * 
  * @author Keith Donald
  */
 public class EmbeddedDatabaseBuilder {
@@ -71,24 +68,12 @@ public EmbeddedDatabaseBuilder type(EmbeddedDatabaseType databaseType) {
 	}
 	
 	/**
-	 * Sets the location of the schema SQL to run to create the database structure.
-	 * Defaults to classpath:schema.sql if not called.
+	 * Adds a SQL script to execute to populate the database.
 	 * @param sqlResource the sql resource location
 	 * @return this, for fluent call chaining
 	 */
-	public EmbeddedDatabaseBuilder schema(String sqlResource) {
-		databasePopulator.setSchemaLocation(resourceLoader.getResource(sqlResource));
-		return this;
-	}
-
-	/**
-	 * Sets the location of the schema SQL to run to create the database structure.
-	 * Defaults to classpath:test-data.sql if not called
-	 * @param sqlResource the sql resource location
-	 * @return this, for fluent call chaining
-	 */
-	public EmbeddedDatabaseBuilder testData(String sqlResource) {
-		databasePopulator.setTestDataLocation(resourceLoader.getResource(sqlResource));
+	public EmbeddedDatabaseBuilder script(String sqlResource) {
+		databasePopulator.addScript(resourceLoader.getResource(sqlResource));
 		return this;
 	}
 
@@ -120,11 +105,11 @@ public Resource getResource(String location) {
 	
 	/**
 	 * Factory method that builds a default EmbeddedDatabase instance.
-	 * The default is HSQL with a schema created from classpath:schema.sql and test-data loaded from classpatH:test-data.sql.
+	 * The default is HSQL with a schema created from classpath:schema.sql and test-data loaded from classpath:test-data.sql.
 	 * @return an embedded database
 	 */
 	public static EmbeddedDatabase buildDefault() {
-		return new EmbeddedDatabaseBuilder().build();
+		return new EmbeddedDatabaseBuilder().script(""schema.sql"").script(""test-data.sql"").build();
 	}
 	
 	private EmbeddedDatabaseBuilder(ResourceLoader loader) {
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
index a96c753970e7..98e16b0b7219 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
@@ -17,29 +17,24 @@
 
 import javax.sql.DataSource;
 
-import org.springframework.jdbc.datasource.SimpleDriverDataSource;
-
 /**
  * Encapsulates the configuration required to create, connect to, and shutdown a specific type of embedded database such as HSQLdb or H2.
- * Create a subclass for each database type we wish to support.
- * 
- * TODO - introduce ConfigurableDataSource strategy for configuring connection properties?
- * 
- * @see EmbeddedDatabaseConfigurerFactory
+ * Create a implementation for each database type we wish to support.
+ * @author Keith Donald
  */
-abstract class EmbeddedDatabaseConfigurer {
+public interface EmbeddedDatabaseConfigurer {
 	
 	/**
 	 * Configure the properties required to create and connect to the embedded database instance.
 	 * @param dataSource the data source to configure
 	 * @param databaseName the name of the test database
 	 */
-	public abstract void configureConnectionProperties(SimpleDriverDataSource dataSource, String databaseName);
+	void configureConnectionProperties(ConnectionProperties properties, String databaseName);
 
 	/**
 	 * Shutdown the embedded database instance that backs dataSource.
 	 * @param dataSource the data source
 	 */
-	public abstract void shutdown(DataSource dataSource);
+	void shutdown(DataSource dataSource);
 	
 }
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
index 57d51a94d4b2..fa618d1895f2 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
@@ -15,9 +15,16 @@
  */
 package org.springframework.jdbc.datasource.embedded;
 
+import org.springframework.util.Assert;
+
+/**
+ * Package private factory for mapping well-known embedded database types to database configurer strategies.
+ * @author Keith Donald
+ */
 class EmbeddedDatabaseConfigurerFactory {
 
 	public static EmbeddedDatabaseConfigurer getConfigurer(EmbeddedDatabaseType type) throws IllegalStateException {
+		Assert.notNull(type, ""The EmbeddedDatabaseType is required"");
 		try {
 			if (type == EmbeddedDatabaseType.HSQL) {
 				return HsqlEmbeddedDatabaseConfigurer.getInstance();
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index b52700178b78..608928954fd9 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -25,7 +25,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -36,10 +35,13 @@
  * When the database is returned, callers are guaranteed that the database schema and test data will have already been loaded.
  * 
  * Can be configured.
- * Call {@link #setDatabaseName(String)} to change the name of the test database.
- * Call {@link #setDatabaseType(EmbeddedDatabaseType)} to set the test database type.
+ * Call {@link #setDatabaseName(String)} to change the name of the  database.
+ * Call {@link #setDatabaseType(EmbeddedDatabaseType)} to set the database type if you wish to use one of the supported types.
+ * Call {@link #setDatabaseConfigurer(EmbeddedDatabaseConfigurer)} to set a configuration strategy for your own embedded database type.
  * Call {@link #setDatabasePopulator(DatabasePopulator)} to change the algorithm used to populate the database.
- * Call {@link #getDatabase()} to the {@link EmbeddedDatabase} instance.
+ * Call {@link #setDataSourceFactory(DataSourceFactory)} to change the type of DataSource used to connect to the database.
+ * Call {@link #getDatabase()} to get the {@link EmbeddedDatabase} instance.
+ * @author Keith Donald
  */
 public class EmbeddedDatabaseFactory {
 
@@ -47,19 +49,22 @@ public class EmbeddedDatabaseFactory {
 
 	private String databaseName;
 
-	private EmbeddedDatabaseConfigurer dataSourceConfigurer;
+	private DataSourceFactory dataSourceFactory;
+	
+	private EmbeddedDatabaseConfigurer databaseConfigurer;
 
 	private DatabasePopulator databasePopulator;
 
 	private EmbeddedDatabase database;
 	
 	/**
-	 * Creates a new EmbeddedDatabaseFactory that uses the default {@link ResourceDatabasePopulator}.
+	 * Creates a default {@link EmbeddedDatabaseFactory}.
+	 * Calling {@link #getDatabase()} will create a embedded HSQL database of name 'testdb'.
 	 */
 	public EmbeddedDatabaseFactory() {
 		setDatabaseName(""testdb"");
 		setDatabaseType(EmbeddedDatabaseType.HSQL);
-		setDatabasePopulator(new ResourceDatabasePopulator());
+		setDataSourceFactory(new SimpleDriverDataSourceFactory());
 	}
 	
 	/**
@@ -73,25 +78,44 @@ public void setDatabaseName(String name) {
 	}
 	
 	/**
-	 * Sets the type of test database to use.
+	 * Sets the type of embedded database to use.
+	 * Call this when you wish to configure one of the pre-supported types.
 	 * Defaults to HSQL.
 	 * @param type the test database type
 	 */
 	public void setDatabaseType(EmbeddedDatabaseType type) {
-		Assert.notNull(type, ""The TestDatabaseType is required"");
-		dataSourceConfigurer = EmbeddedDatabaseConfigurerFactory.getConfigurer(type);
+		setDatabaseConfigurer(EmbeddedDatabaseConfigurerFactory.getConfigurer(type));
 	}
 
 	/**
-	 * Sets the helper that will be invoked to populate the test database with data.
-	 * Defaults a {@link ResourceDatabasePopulator}.
-	 * @param populator
+	 * Sets the strategy that will be used to configure the embedded database instance.
+	 * Call this when you wish to use an embedded database type not already supported.
+	 * @param configurer the embedded database configurer
+	 */
+	public void setDatabaseConfigurer(EmbeddedDatabaseConfigurer configurer) {
+		this.databaseConfigurer = configurer;
+	}
+	
+	/**
+	 * Sets the strategy that will be used to populate the embedded database.
+	 * Defaults to null.
+	 * @param populator the database populator 
 	 */
 	public void setDatabasePopulator(DatabasePopulator populator) {
 		Assert.notNull(populator, ""The TestDatabasePopulator is required"");
 		databasePopulator = populator;
 	}
-	
+
+	/**
+	 * Sets the factory to use to create the DataSource instance that connects to the embedded database.
+	 * Defaults to {@link SimpleDriverDataSourceFactory}.
+	 * @param dataSourceFactory the data source factory
+	 */
+	public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {
+		Assert.notNull(dataSourceFactory, ""The DataSourceFactory is required"");
+		this.dataSourceFactory = dataSourceFactory;
+	}
+
 	// other public methods
 
 	/**
@@ -106,9 +130,8 @@ public EmbeddedDatabase getDatabase() {
 	
 	// internal helper methods
 
-	// encapsulates the steps involved in initializing the data source: creating it, and populating it
 	private void initDatabase() {
-		// create the in-memory database source first
+		// create the embedded database source first
 		database = new EmbeddedDataSourceProxy(createDataSource());
 		if (logger.isInfoEnabled()) {
 			logger.info(""Created embedded database '"" + databaseName + ""'"");
@@ -120,9 +143,8 @@ private void initDatabase() {
 	}
 
 	private DataSource createDataSource() {
-		SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
-		dataSourceConfigurer.configureConnectionProperties(dataSource, databaseName);
-		return dataSource;
+		databaseConfigurer.configureConnectionProperties(dataSourceFactory.getConnectionProperties(), databaseName);
+		return dataSourceFactory.getDataSource();
 	}
 
 	private void populateDatabase() {
@@ -183,7 +205,7 @@ public void shutdown() {
 	
 	private void shutdownDatabase() {
 		if (database != null) {
-			dataSourceConfigurer.shutdown(database);
+			databaseConfigurer.shutdown(database);
 			database = null;
 		}
 	}
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
index 30085eb3ebf2..93c12798fa94 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
@@ -18,6 +18,7 @@
 /**
  * A supported embedded database type.
  * @author Keith Donald
+ * @see HsqlEmbeddedDatabaseConfigurer
  */
 public enum EmbeddedDatabaseType {
 	HSQL;
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
index b5ee37ef39a0..50be662dc758 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
@@ -18,10 +18,9 @@
 import javax.sql.DataSource;
 
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.util.ClassUtils;
 
-class HsqlEmbeddedDatabaseConfigurer extends EmbeddedDatabaseConfigurer {
+public class HsqlEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigurer {
 	
 	private static HsqlEmbeddedDatabaseConfigurer INSTANCE;
 	
@@ -33,11 +32,11 @@ public static synchronized HsqlEmbeddedDatabaseConfigurer getInstance() throws C
 		return INSTANCE;
 	}
 	
-	public void configureConnectionProperties(SimpleDriverDataSource dataSource, String databaseName) {
-		dataSource.setDriverClass(org.hsqldb.jdbcDriver.class);
-		dataSource.setUrl(""jdbc:hsqldb:mem:"" + databaseName);
-		dataSource.setUsername(""sa"");
-		dataSource.setPassword("""");		
+	public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
+		properties.setDriverClass(org.hsqldb.jdbcDriver.class);
+		properties.setUrl(""jdbc:hsqldb:mem:"" + databaseName);
+		properties.setUsername(""sa"");
+		properties.setPassword("""");		
 	}
 
 	public void shutdown(DataSource dataSource) {
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ResourceDatabasePopulator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ResourceDatabasePopulator.java
index aee842d81827..7ed5468b2c87 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ResourceDatabasePopulator.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ResourceDatabasePopulator.java
@@ -17,12 +17,12 @@
 
 import java.io.IOException;
 import java.io.LineNumberReader;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.dao.DataAccessException;
@@ -43,26 +43,16 @@ public class ResourceDatabasePopulator implements DatabasePopulator {
 
 	private static final Log logger = LogFactory.getLog(ResourceDatabasePopulator.class);
 
-	private Resource schemaLocation = new ClassPathResource(""schema.sql"");
-
-	private Resource testDataLocation = new ClassPathResource(""test-data.sql"");
-
 	private String sqlScriptEncoding;
-	
-	/**
-	 * Sets the location of .sql file containing the database schema to create.
-	 * @param schemaLocation the path to the db schema definition
-	 */
-	public void setSchemaLocation(Resource schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
 
+	private List<Resource> scripts = new ArrayList<Resource>();
+	
 	/**
-	 * Sets the location of the .sql file containing the test data to populate.
-	 * @param testDataLocation the path to the db test data file
+	 * Add a script to execute to populate the database.
+	 * @param script the path to a SQL script
 	 */
-	public void setTestDataLocation(Resource testDataLocation) {
-		this.testDataLocation = testDataLocation;
+	public void addScript(Resource script) {
+		scripts.add(script);
 	}
 	
 	/**
@@ -73,18 +63,9 @@ public void setSqlScriptEncoding(String sqlScriptEncoding) {
 	}
 
 	public void populate(JdbcTemplate template) {
-		createDatabaseSchema(template);
-		insertTestData(template);
-	}
-
-	// create the application's database schema (tables, indexes, etc.)
-	private void createDatabaseSchema(JdbcTemplate template) {
-		executeSqlScript(template, new EncodedResource(schemaLocation, sqlScriptEncoding), false);
-	}
-
-	// populate the tables with test data
-	private void insertTestData(JdbcTemplate template) {
-		executeSqlScript(template, new EncodedResource(testDataLocation, sqlScriptEncoding), false);
+		for (Resource script : scripts) {
+			executeSqlScript(template, new EncodedResource(script, sqlScriptEncoding), false);
+		}
 	}
 
 	// From SimpleJdbcTestUtils - TODO address duplication
@@ -94,16 +75,13 @@ private void insertTestData(JdbcTemplate template) {
 	 * <p>The script will normally be loaded by classpath. There should be one statement
 	 * per line. Any semicolons will be removed. <b>Do not use this method to execute
 	 * DDL if you expect rollback.</b>
-	 * @param simpleJdbcTemplate the SimpleJdbcTemplate with which to perform JDBC operations
+	 * @param template the SimpleJdbcTemplate with which to perform JDBC operations
 	 * @param resource the resource (potentially associated with a specific encoding)
 	 * to load the SQL script from.
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error.
-	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
 	 */
-	static void executeSqlScript(JdbcTemplate jdbcTemplate,
-			EncodedResource resource, boolean continueOnError) throws DataAccessException {
+	static void executeSqlScript(JdbcTemplate template, EncodedResource resource, boolean continueOnError) {
 		if (logger.isInfoEnabled()) {
 			logger.info(""Executing SQL script from "" + resource);
 		}
@@ -119,7 +97,7 @@ static void executeSqlScript(JdbcTemplate jdbcTemplate,
 			splitSqlScript(script, delimiter, statements);
 			for (String statement : statements) {
 				try {
-					int rowsAffected = jdbcTemplate.update(statement);
+					int rowsAffected = template.update(statement);
 					if (logger.isDebugEnabled()) {
 						logger.debug(rowsAffected + "" rows affected by SQL: "" + statement);
 					}
@@ -145,7 +123,7 @@ static void executeSqlScript(JdbcTemplate jdbcTemplate,
 		}
 	}
 	
-	// From JdbcTestUtils - TODO address duplication
+	// From JdbcTestUtils - TODO address duplication - these do not seem as useful as the one above
 
 	/**
 	 * Read a script from the LineNumberReader and build a String containing the lines.
@@ -153,7 +131,7 @@ static void executeSqlScript(JdbcTemplate jdbcTemplate,
 	 * @return <code>String</code> containing the script lines
 	 * @throws IOException
 	 */
-	static String readScript(LineNumberReader lineNumberReader) throws IOException {
+	private static String readScript(LineNumberReader lineNumberReader) throws IOException {
 		String currentStatement = lineNumberReader.readLine();
 		StringBuilder scriptBuilder = new StringBuilder();
 		while (currentStatement != null) {
@@ -173,7 +151,7 @@ static String readScript(LineNumberReader lineNumberReader) throws IOException {
 	 * @param script the SQL script
 	 * @param delim charecter delimiting each statement - typically a ';' character
 	 */
-	static boolean containsSqlScriptDelimiters(String script, char delim) {
+	private static boolean containsSqlScriptDelimiters(String script, char delim) {
 		boolean inLiteral = false;
 		char[] content = script.toCharArray();
 		for (int i = 0; i < script.length(); i++) {
@@ -194,7 +172,7 @@ static boolean containsSqlScriptDelimiters(String script, char delim) {
 	 * @param delim charecter delimiting each statement - typically a ';' character
 	 * @param statements the List that will contain the individual statements
 	 */
-	static void splitSqlScript(String script, char delim, List<String> statements) {
+	private static void splitSqlScript(String script, char delim, List<String> statements) {
 		StringBuilder sb = new StringBuilder();
 		boolean inLiteral = false;
 		char[] content = script.toCharArray();
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
new file mode 100644
index 000000000000..3b4ca73ebe06
--- /dev/null
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
@@ -0,0 +1,38 @@
+package org.springframework.jdbc.datasource.embedded;
+
+import javax.sql.DataSource;
+
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+
+public class SimpleDriverDataSourceFactory implements DataSourceFactory {
+
+	private SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
+	
+	public ConnectionProperties getConnectionProperties() {
+		return new ConnectionProperties() {
+
+			public void setDriverClass(Class<?> driverClass) {
+				dataSource.setDriverClass(driverClass);
+			}
+
+			public void setUrl(String url) {
+				dataSource.setUrl(url);
+			}
+
+			public void setUsername(String username) {
+				dataSource.setUsername(username);
+			}
+
+			public void setPassword(String password) {
+				dataSource.setPassword(password);
+			}
+
+		};
+	}
+
+	public DataSource getDataSource() {
+		return dataSource;
+	}
+
+	
+}
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
index e292e46d3c7f..94cea3cd5d53 100644
--- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
+++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
@@ -22,31 +22,20 @@ public void testBuildDefaults() {
 	@Test
 	public void testBuild() {
 		EmbeddedDatabaseBuilder builder = EmbeddedDatabaseBuilder.relativeTo(getClass());
-		EmbeddedDatabase db = builder.schema(""db-schema.sql"").testData(""db-test-data.sql"").build();
+		EmbeddedDatabase db = builder.script(""db-schema.sql"").script(""db-test-data.sql"").build();
 		JdbcTemplate template = new JdbcTemplate(db);
 		assertEquals(""Keith"", template.queryForObject(""select NAME from T_TEST"", String.class));
 		db.shutdown();
 	}
 
 	@Test
-	public void testBuildNoSuchSchema() {
+	public void testBuildNoSuchScript() {
 		try {
-			new EmbeddedDatabaseBuilder().schema(""bogus.sql"").build();
+			new EmbeddedDatabaseBuilder().script(""bogus.sql"").build();
 			fail(""Should have failed"");
 		} catch (DataAccessException e) {
 			
 		}
 	}
-	
-	@Test
-	public void testBuildNoSuchTestdata() {
-		try {
-			new EmbeddedDatabaseBuilder().testData(""bogus.sql"").build();
-			fail(""Should have failed"");
-		} catch (DataAccessException e) {
-			
-		}
-	}
-
 
-}
+}
\ No newline at end of file"
da5ff665396d5f0cbd70b9ea8a53387c0b40cbd1,orientdb,Fixed problem with linkeset modified right after- query in remote configuration--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeRID.java b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeRID.java
index c3c0d2514ff..2bc08a33eda 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeRID.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreeRID.java
@@ -101,6 +101,8 @@ public OMVRBTreePersistent<OIdentifiable, OIdentifiable> load() {
 
 	@Override
 	public OIdentifiable internalPut(final OIdentifiable e, final OIdentifiable v) {
+		((OMVRBTreeRIDProvider) dataProvider).lazyUnmarshall();
+
 		if (e.getIdentity().isNew()) {
 			final ORecord<?> record = e.getRecord();
 
@@ -114,7 +116,6 @@ else if (newEntries.containsKey(record))
 			return null;
 		}
 
-		((OMVRBTreeRIDProvider) dataProvider).lazyUnmarshall();
 		return super.internalPut(e, null);
 	}"
dc6edfc736bb630b805d0c3f7afc6ca4768e605c,Valadoc,"gir: basic reading support
",a,https://github.com/GNOME/vala/,"diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index 23dec682a3..7613f17bb0 100755
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -74,9 +74,9 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 		string path = GLib.Path.build_filename ( this.settings.path, pkg_name );
 
 		var rt = DirUtils.create (path, 0777);
-		rt = DirUtils.create (GLib.Path.build_filename ( path, ""img"" ), 0777);
+		rt = DirUtils.create (GLib.Path.build_filename (path, ""img""), 0777);
 
-		GLib.FileStream file = GLib.FileStream.open (GLib.Path.build_filename ( path, ""index.htm"" ), ""w"");
+		GLib.FileStream file = GLib.FileStream.open (GLib.Path.build_filename (path, ""index.htm""), ""w"");
 		writer = new Html.MarkupWriter (file);
 		_renderer.set_writer (writer);
 		write_file_header (this.css_path, this.js_path, pkg_name);
diff --git a/src/driver/0.10.x/treebuilder.vala b/src/driver/0.10.x/treebuilder.vala
index c3543a52ee..6bc66b4aa8 100644
--- a/src/driver/0.10.x/treebuilder.vala
+++ b/src/driver/0.10.x/treebuilder.vala
@@ -271,7 +271,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
diff --git a/src/driver/0.11.0/treebuilder.vala b/src/driver/0.11.0/treebuilder.vala
index 6ebc8713a4..ba51196ea2 100644
--- a/src/driver/0.11.0/treebuilder.vala
+++ b/src/driver/0.11.0/treebuilder.vala
@@ -273,7 +273,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
diff --git a/src/driver/0.11.x/treebuilder.vala b/src/driver/0.11.x/treebuilder.vala
index f297a1eda5..130a3ca718 100644
--- a/src/driver/0.11.x/treebuilder.vala
+++ b/src/driver/0.11.x/treebuilder.vala
@@ -224,7 +224,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
diff --git a/src/driver/0.12.x/treebuilder.vala b/src/driver/0.12.x/treebuilder.vala
index 455a0e67ec..ac91568ff1 100644
--- a/src/driver/0.12.x/treebuilder.vala
+++ b/src/driver/0.12.x/treebuilder.vala
@@ -273,7 +273,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
diff --git a/src/driver/0.13.x/treebuilder.vala b/src/driver/0.13.x/treebuilder.vala
index 9739d927c2..9cfac52589 100644
--- a/src/driver/0.13.x/treebuilder.vala
+++ b/src/driver/0.13.x/treebuilder.vala
@@ -392,7 +392,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
diff --git a/src/driver/0.14.x/Makefile.am b/src/driver/0.14.x/Makefile.am
index a2c24a1ded..b8bb5960dd 100755
--- a/src/driver/0.14.x/Makefile.am
+++ b/src/driver/0.14.x/Makefile.am
@@ -2,8 +2,6 @@ NULL =
 
 VERSIONED_VAPI_DIR=`pkg-config libvala-0.14 --variable vapidir`
 
-
-
 AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\""$(datadir)/valadoc/icons/\"" \
 	-I ../../libvaladoc/ \
diff --git a/src/driver/0.14.x/treebuilder.vala b/src/driver/0.14.x/treebuilder.vala
index 691faddd4d..daff9b2538 100644
--- a/src/driver/0.14.x/treebuilder.vala
+++ b/src/driver/0.14.x/treebuilder.vala
@@ -326,7 +326,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
diff --git a/src/driver/0.16.x/treebuilder.vala b/src/driver/0.16.x/treebuilder.vala
index 7d523953f0..512d7b18f9 100644
--- a/src/driver/0.16.x/treebuilder.vala
+++ b/src/driver/0.16.x/treebuilder.vala
@@ -82,7 +82,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 				foreach (Vala.Comment c in vns.get_comments()) {
 					if (c.source_reference.file == vns.source_reference.file) {
 						Vala.SourceReference pos = c.source_reference;
-						comment = new SourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+						if (c is Vala.GirComment) {
+							comment = new GirSourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+						} else {
+							comment = new SourceComment (c.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+						}
 						break;
 					}
 				}
@@ -290,7 +294,24 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		if (comment != null) {
 			Vala.SourceReference pos = comment.source_reference;
 			SourceFile file = files.get (pos.file);
-			return new SourceComment (comment.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+			if (comment is Vala.GirComment) {
+				var tmp = new GirSourceComment (comment.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+				if (((Vala.GirComment) comment).return_content != null) {
+					Vala.SourceReference return_pos = ((Vala.GirComment) comment).return_content.source_reference;
+					tmp.return_comment = new SourceComment (((Vala.GirComment) comment).return_content.content, file, return_pos.first_line, return_pos.first_column, return_pos.last_line, return_pos.last_column);
+				}
+
+				Vala.MapIterator<string, Vala.Comment> it = ((Vala.GirComment) comment).parameter_iterator ();
+				while (it.next ()) {
+					Vala.Comment vala_param = it.get_value ();
+					Vala.SourceReference param_pos = vala_param.source_reference;
+					var param_comment = new SourceComment (vala_param.content, file, param_pos.first_line, param_pos.first_column, param_pos.last_line, param_pos.last_column);
+					tmp.add_parameter_content (it.get_key (), param_comment);
+				}
+				return tmp;
+			} else {
+				return new SourceComment (comment.content, file, pos.first_line, pos.first_column, pos.last_line, pos.last_column);
+			}
 		}
 
 		return null;
@@ -326,7 +347,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	}
 
 	private SourceFile register_source_file (PackageMetaData meta_data, Vala.SourceFile source_file) {
-		SourceFile file = new SourceFile (source_file.get_relative_filename (), source_file.get_csource_filename ());
+		SourceFile file = new SourceFile (meta_data.package, source_file.get_relative_filename (), source_file.get_csource_filename ());
 		files.set (source_file, file);
 
 		meta_data.register_source_file (source_file);
@@ -340,7 +361,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		}
 
 		SourceFile? file = files.get (source_ref.file);
-
 		assert (file != null);
 		return file;
 	}
@@ -534,6 +554,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 	// Vala tree creation:
 	//
 
+	private string get_package_name (string path) {
+		string file_name = Path.get_basename (path);
+		return file_name.substring (0, file_name.last_index_of_char ('.'));
+	}
+
 	private bool add_package (Vala.CodeContext context, string pkg) {
 		// ignore multiple occurences of the same package
 		if (context.has_package (pkg)) {
@@ -636,8 +661,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 					context.add_source_file (source_file);
 				} else if (source.has_suffix ("".vapi"") || source.has_suffix ("".gir"")) {
-					string file_name = Path.get_basename (source);
-					file_name = file_name.substring (0, file_name.last_index_of_char ('.'));
+					string file_name = get_package_name (source);
 
 					var vfile = new Vala.SourceFile (context, Vala.SourceFileType.PACKAGE, rpath);
 					context.add_source_file (vfile);
@@ -1126,6 +1150,15 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 			return null;
 		}
 
+		// TODO: Register all packages here
+		// register packages included by gir-files
+		foreach (Vala.SourceFile vfile in context.get_source_files ()) {
+			if (vfile.file_type == Vala.SourceFileType.PACKAGE && vfile.get_nodes ().size > 0 && files.contains (vfile) == false) {
+				Package vdpkg = new Package (get_package_name (vfile.filename), true, null);
+				register_source_file (register_package (vdpkg), vfile);
+			}
+		}
+
 		context.accept(this);
 
 		return (reporter.errors == 0)? tree : null;
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 9fba548244..14a8bfa90e 100755
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -36,11 +36,14 @@ libvaladoc_la_VALASOURCES = \
 	documentation/documentationparser.vala \
 	documentation/wiki.vala \
 	documentation/wikiscanner.vala \
+	documentation/gtkdoccommentparser.vala \
+	documentation/gtkdoccommentscanner.vala \
 	importer/documentationimporter.vala \
 	importer/valadocdocumentationimporter.vala \
 	importer/valadocdocumentationimporterscanner.vala \
 	api/symbolaccessibility.vala \
 	api/sourcecomment.vala \
+	api/girsourcecomment.vala \
 	api/attributeargument.vala \
 	api/attribute.vala \
 	api/array.vala \
diff --git a/src/libvaladoc/api/girsourcecomment.vala b/src/libvaladoc/api/girsourcecomment.vala
new file mode 100644
index 0000000000..e554092386
--- /dev/null
+++ b/src/libvaladoc/api/girsourcecomment.vala
@@ -0,0 +1,55 @@
+/* sourcecomment.vala
+ *
+ * Copyright (C) 2011  Florian Brosch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Florian Brosch <flo.brosch@gmail.com>
+ */
+
+
+using Gee;
+
+
+/**
+ * A documentation comment used by valadoc
+ */
+public class Valadoc.Api.GirSourceComment : SourceComment {
+	private Map<string, SourceComment> parameters = new HashMap<string, SourceComment> ();
+
+	public SourceComment return_comment { set; get; }
+
+	public MapIterator<string, SourceComment> parameter_iterator () {
+		return parameters.map_iterator ();
+	}
+
+	public void add_parameter_content (string param_name, SourceComment comment) {
+		this.parameters.set (param_name, comment);
+	}
+
+	public SourceComment? get_parameter_comment (string param_name) {
+		if (parameters == null) {
+			return null;
+		}
+
+		return parameters.get (param_name);
+	}
+
+	public GirSourceComment (string content, SourceFile file, int first_line, int first_column, int last_line, int last_column) {
+		base (content, file, first_line, first_column, last_line, last_column);
+	}
+}
+
diff --git a/src/libvaladoc/api/sourcefile.vala b/src/libvaladoc/api/sourcefile.vala
index 6ac6720365..09b821fe8a 100644
--- a/src/libvaladoc/api/sourcefile.vala
+++ b/src/libvaladoc/api/sourcefile.vala
@@ -24,6 +24,11 @@
  * Represents a source file
  */
 public class Valadoc.Api.SourceFile : Object {
+	public Package package {
+		private set;
+		get;
+	}
+
 	public string relative_path {
 		private set;
 		get;
@@ -38,9 +43,10 @@ public class Valadoc.Api.SourceFile : Object {
 		return Path.get_basename (relative_path);
 	}
 
-	public SourceFile (string relative_path, string? relative_c_path) {
+	public SourceFile (Package package, string relative_path, string? relative_c_path) {
 		this.relative_c_path = relative_c_path;
 		this.relative_path = relative_path;
+		this.package = package;
 	}
 }
 
diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala
index bddb1bfb9f..1298d06924 100755
--- a/src/libvaladoc/api/tree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -143,21 +143,25 @@ public class Valadoc.Api.Tree {
 		// absolute
 		foreach (Package package in packages) {
 			// search in root namespace
-			node = search_relative_to (package.find_by_name (""""), path);
-			if (node != null) {
-				return node;
+
+			Node? global = package.find_by_name ("""");
+			if (global != null) {
+				node = search_relative_to (global, path);
+				if (node != null) {
+					return node;
+				}
 			}
 		}
 
 		return null;
 	}
 
-	public Node? search_symbol_cstr (string cname) {
+	public Node? search_symbol_cstr (Node? element, string cname) {
 		if (_cresolver == null) {
 			_cresolver = new CTypeResolver (this);
 		}
 
-		return _cresolver.resolve_symbol (cname);
+		return _cresolver.resolve_symbol (element, cname);
 	}
 
 	public Node? search_symbol_str (Node? element, string symname) {
diff --git a/src/libvaladoc/ctyperesolver.vala b/src/libvaladoc/ctyperesolver.vala
index 87fc6f3442..a7adac8b2f 100755
--- a/src/libvaladoc/ctyperesolver.vala
+++ b/src/libvaladoc/ctyperesolver.vala
@@ -34,40 +34,99 @@ public class Valadoc.CTypeResolver : Visitor {
 		tree.accept (this);
 	}
 
+
+	private string convert_array_to_camelcase (string[] elements) {
+		StringBuilder builder = new StringBuilder ();
+
+		foreach (string element in elements) {
+			builder.append_c (((char[])element)[0].toupper ());
+			builder.append (element.next_char ().down ());
+		}
+
+		return (owned) builder.str;
+	}
+
+	private bool is_capitalized_and_underscored (string name) {
+		unowned string pos;
+
+		unichar c = name.get_char ();
+
+
+		if (c < 'A' || c > 'Z') {
+			return false;
+		}
+
+		bool last_was_underscore = false;
+		for (c = (pos = name).get_char (); c != '\0' ; c = (pos = pos.next_char ()).get_char ()) {
+			if ((c != '_'  && !(c >= 'A' && c <= 'Z')) || (last_was_underscore && c == '_')) {
+				return false;
+			}
+
+			last_was_underscore = (c == '_');
+		}
+
+		return !last_was_underscore;
+	}
+
+	private string? translate_cname (string name) {
+		if (is_capitalized_and_underscored (name)) {
+			string[] segments = name.split (""_"");
+			unowned string last_segment = segments[segments.length - 1];
+			if (last_segment == ""ERROR"") {
+			} else if (last_segment == ""TYPE"") {
+				segments.resize (segments.length - 1);
+			} else {
+				return null;
+			}
+
+			return convert_array_to_camelcase (segments);
+		}
+
+		int length = name.length;
+		if (length > 5 && name.has_suffix (""Iface"")) {
+			return name.substring (0, length - 5);
+		} else if (length > 5 && name.has_suffix (""Class"")) {
+			return name.substring (0, length - 5);
+		}
+
+		return null;
+	}
+
 	/**
 	 * Resolves symbols by C-names
 	 *
 	 * @param name a C-name
 	 * @return the resolved node or null
 	 */
-	public Api.Node? resolve_symbol (string _name) {
+	public Api.Node? resolve_symbol (Api.Node? element, string _name) {
 		string name = _name.replace (""-"", ""_"");
 
+		if (element != null && _name.has_prefix ("":"")) {
+			Item parent = element;
+			while (parent != null && !(parent is Class || parent is Interface)) {
+				parent = parent.parent;
+			}
+
+			if (parent is Class && ((Class) parent).get_cname () != null) {
+				name = ((Class) parent).get_cname () + name;
+			} else if (parent is Interface && ((Interface) parent).get_cname () != null) {
+				name = ((Interface) parent).get_cname () + name;
+			} else {
+				return null;
+			}
+
+		}
+
 		Api.Node? node = nodes.get (name);
 		if (node != null) {
 			return node;
 		}
 
-		var name_length = name.length;
-		if (name_length > 5 && name.has_suffix (""Class"")) {
-			return nodes.get (name.substring (0, name_length - 5));
+		string? alternative = translate_cname (_name);
+		if (alternative != null) {
+			return nodes.get (alternative);
 		}
 
-		/*
-		for (int i = 0; name[i] != '\0' ; i++) {
-			if (name[i] == ':' && name[i+1] == ':') {
-				string first_part = name.substring (0, i - 1);
-				string second_part = name.substring (i + 2, -1);
-				string nick = first_part + "":"" + second_part;
-				return nodes.get (nick);
-			} else if (name[i] == ':') {
-				string first_part = name.substring (0, i);
-				string second_part = name.substring (i + 1, -1);
-				string nick = first_part + ""::"" + second_part;
-				return nodes.get (nick);
-			}
-		} */
-
 		return null;
 	}
 
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 92aa69865b..b2a96f0252 100755
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -43,9 +43,13 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 		_comment_parser = new Parser (_settings, _comment_scanner, _reporter);
 		_comment_scanner.set_parser (_comment_parser);
 
+		gtkdoc_parser = new Gtkdoc.Parser (settings, reporter, tree, modules);
+
 		init_valadoc_rules ();
 	}
 
+	private Gtkdoc.Parser gtkdoc_parser;
+
 	private Settings _settings;
 	private ErrorReporter _reporter;
 	private Api.Tree _tree;
@@ -61,7 +65,12 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 	private Scanner _scanner;
 
 	public Comment? parse (Api.Node element, Api.SourceComment comment) {
-		return parse_comment_str (element, comment.content, comment.file.get_name (), comment.first_line, comment.first_column);
+		if (comment is Api.GirSourceComment) {
+			Comment doc_comment = gtkdoc_parser.parse (element, (Api.GirSourceComment) comment);
+			return doc_comment;
+		} else {
+			return parse_comment_str (element, comment.content, comment.file.get_name (), comment.first_line, comment.first_column);
+		}
 	}
 
 	public Comment? parse_comment_str (Api.Node element, string content, string filename, int first_line, int first_column) {
diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
new file mode 100644
index 0000000000..48e52276b9
--- /dev/null
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -0,0 +1,942 @@
+/* gtkcommentparser.vala
+ *
+ * Copyright (C) 2011  Florian Brosch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Florian Brosch <flo.brosch@gmail.com>
+ */
+
+
+using Valadoc.Content;
+using Valadoc.Gtkdoc;
+using Gee;
+
+
+
+public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
+	private Scanner scanner = new Scanner ();
+	private Token current;
+
+	private LinkedList<string> stack = new LinkedList<string> ();
+
+	private ContentFactory factory;
+	private ErrorReporter reporter;
+	private Settings settings;
+	private Api.Tree tree;
+
+	private bool show_warnings;
+	private Api.SourceComment comment;
+
+	private string[]? comment_lines;
+
+	private void reset (Api.SourceComment comment) {
+		this.scanner.reset (comment.content);
+		this.show_warnings = !comment.file.package.is_package || settings.verbose;
+		this.comment_lines = null;
+		this.comment = comment;
+		current = null;
+		stack.clear ();
+	}
+
+	private void report_unexpected_token (Token got, string expected) {
+		if (this.show_warnings) {
+			return ;
+		}
+
+		int startpos = (got.line == 0)? comment.first_column + got.first_column : got.first_column;
+		int endpos = (got.line == 0)? comment.first_column + got.last_column : got.last_column;
+
+		if (this.comment_lines == null) {
+			this.comment_lines = this.comment.content.split (""\n"");
+		}
+
+		this.reporter.warning (this.comment.file.get_name (), comment.first_line + got.line, startpos + 1, endpos + 1, this.comment_lines[got.line], ""Unexpected Token: %s (Expected: %s)"", got.to_string (), expected);
+	}
+
+	public Parser (Settings settings, ErrorReporter reporter, Api.Tree tree, ModuleLoader modules) {
+		this.factory = new ContentFactory (settings, this, modules);
+		this.reporter = reporter;
+		this.settings = settings;
+		this.tree = tree;
+	}
+
+	public Comment? parse (Api.Node element, Api.GirSourceComment gir_comment) {
+		Comment? comment = this.parse_main_content (gir_comment);
+		if (comment == null) {
+			return null;
+		}
+
+		if (gir_comment.return_comment != null) {
+			Taglet? taglet = this.parse_block_taglet (gir_comment.return_comment, ""return"");
+			if (taglet == null) {
+				return null;
+			}
+
+			comment.taglets.add (taglet);
+		}
+
+		MapIterator<string, Api.SourceComment> iter = gir_comment.parameter_iterator ();
+		for (bool has_next = iter.first (); has_next; has_next = iter.next ()) {
+			Taglets.Param? taglet = this.parse_block_taglet (iter.get_value (), ""param"") as Taglets.Param;
+			if (taglet == null) {
+				return null;
+			}
+
+			taglet.parameter_name = iter.get_key ();
+			comment.taglets.add (taglet);
+		}
+
+		comment.check (tree, element, reporter, settings);
+		return comment;
+	}
+
+	private Taglet? parse_block_taglet (Api.SourceComment gir_comment, string taglet_name) {
+		this.reset (gir_comment);
+		current = null;
+		next ();
+
+		parse_docbook_spaces (false);
+		var ic = parse_inline_content ();
+		parse_docbook_spaces (false);
+
+		if (current.type != TokenType.EOF) {
+			this.report_unexpected_token (current, ""<EOF>"");
+			return null;
+		}
+
+		InlineContent? taglet = factory.create_taglet (taglet_name) as InlineContent;
+		assert (taglet != null);
+		taglet.content.add (ic);
+		return taglet as Taglet;
+	}
+
+	private Comment? parse_main_content (Api.GirSourceComment gir_comment) {
+		this.reset (gir_comment);
+		current = null;
+
+		next ();
+
+		Token tmp = null;
+		parse_docbook_spaces (false);
+
+		Comment comment = factory.create_comment ();
+		while (current.type != TokenType.EOF && tmp != current) {
+			tmp = current;
+			var ic = parse_inline_content ();
+			if (ic != null && ic.content.size > 0) {
+				Paragraph p = factory.create_paragraph ();
+				p.content.add (ic);
+				comment.content.add (p);
+			}
+
+			var bc = parse_block_content ();
+			if (bc != null && bc.size > 0) {
+				comment.content.add_all (bc);
+			}
+		}
+
+		if (current.type != TokenType.EOF) {
+			this.report_unexpected_token (current, ""<INLINE|BLOCK>"");
+			return null;
+		}
+
+		return comment;
+	}
+
+
+
+	//
+	// Common:
+	//
+
+	private Token next () {
+		current = scanner.next ();
+		return current;
+	}
+
+	private bool ignore_current_xml_close () {
+		if (current.type != TokenType.XML_CLOSE) {
+			return false;
+		}
+
+		string name = current.content;
+		if ((name in stack) == false) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private bool check_xml_open_tag (string tagname) {
+		if (current.type == TokenType.XML_OPEN && current.content != tagname) {
+			return false;
+		}
+
+		stack.offer_head (tagname);
+		return true;
+	}
+
+	private bool check_xml_close_tag (string tagname) {
+		if (current.type == TokenType.XML_CLOSE && current.content != tagname) {
+			return false;
+		}
+
+		if (stack.poll_head () == tagname) {
+			stack.peek_head ();
+		}
+
+		return true;
+	}
+
+
+	private void parse_docbook_spaces (bool accept_paragraphs = true) {
+		while (true) {
+			if (current.type == TokenType.SPACE) {
+				next ();
+			} else if (current.type == TokenType.NEWLINE) {
+				next ();
+			} else if (accept_paragraphs && current.type == TokenType.GTKDOC_PARAGRAPH) {
+				next ();
+			} else {
+				break;
+			}
+		}
+	}
+
+
+
+	//
+	// Rules, Ground:
+	//
+
+	private Inline? parse_docbook_link_tempalte (string tagname) {
+		if (!check_xml_open_tag (tagname)) {
+			this.report_unexpected_token (current, ""<%s>"".printf (tagname));
+			return null;
+		}
+
+		StringBuilder builder = new StringBuilder ();
+		string url = current.attributes.get (""linkend"");
+		next ();
+
+		// TODO: check xml
+		while (current.type != TokenType.XML_CLOSE && current.content != tagname && current.type != TokenType.EOF) {
+			if (current.type == TokenType.XML_OPEN) {
+			} else if (current.type == TokenType.XML_CLOSE) {
+			} else if (current.type == TokenType.XML_COMMENT) {
+			} else {
+				builder.append (current.content);
+			}
+
+			next ();
+		}
+
+		var link = factory.create_link ();
+		link.url = url;
+
+		if (builder.len == 0) {
+			link.content.add (factory.create_text (url));
+		} else {
+			link.content.add (factory.create_text (builder.str));
+		}
+
+		if (!check_xml_close_tag (tagname)) {
+			this.report_unexpected_token (current, ""</%s>"".printf (tagname));
+			return link;
+		}
+
+		next ();
+		return link;
+	}
+
+	private InlineTaglet? parse_symbol_link (string tagname) {
+		if (!check_xml_open_tag (tagname)) {
+			this.report_unexpected_token (current, ""<%s>"".printf (tagname));
+			return null;
+		}
+
+		if (next ().type == TokenType.SPACE) {
+			next ();
+		}
+
+		InlineTaglet? taglet = null;
+
+		if (current.type == TokenType.GTKDOC_FUNCTION || current.type == TokenType.GTKDOC_CONST || current.type == TokenType.GTKDOC_TYPE || current.type == TokenType.WORD || current.type == TokenType.GTKDOC_PROPERTY || current.type == TokenType.GTKDOC_SIGNAL) {
+			taglet = this.create_type_link (current.content) as InlineTaglet;
+			assert (taglet != null);
+		}
+
+		if (next ().type == TokenType.SPACE) {
+			next ();
+		}
+
+		if (!check_xml_close_tag (tagname)) {
+			this.report_unexpected_token (current, ""</%s>"".printf (tagname));
+			return taglet;
+		}
+
+		next ();
+		return taglet;
+	}
+
+	private void parse_anchor () {
+		if (!check_xml_open_tag (""anchor"")) {
+			this.report_unexpected_token (current, ""<anchor>"");
+			return;
+		}
+
+		string id = current.attributes.get (""id"");
+		next ();
+		// TODO register xref
+
+		if (!check_xml_close_tag (""anchor"")) {
+			this.report_unexpected_token (current, ""</anchor>"");
+			return;
+		}
+
+		next ();
+	}
+
+	private void parse_xref () {
+		if (!check_xml_open_tag (""xref"")) {
+			this.report_unexpected_token (current, ""<xref>"");
+			return;
+		}
+
+		string linkend = current.attributes.get (""linkend"");
+		next ();
+		// TODO register xref
+
+		if (!check_xml_close_tag (""xref"")) {
+			this.report_unexpected_token (current, ""</xref>"");
+			return;
+		}
+
+		next ();
+	}
+
+	private Run? parse_highlighted_template (string tag_name, Run.Style style) {
+		if (!check_xml_open_tag (tag_name)) {
+			this.report_unexpected_token (current, ""<%s>"".printf (tag_name));
+			return null;
+		}
+
+		next ();
+		Run run = parse_inline_content ();
+		if (run.style != Run.Style.NONE && run.style != style) {
+			Run tmp = factory.create_run (style);
+			tmp.content.add (run);
+			run = tmp;
+		} else {
+			run.style = style;
+		}
+
+		if (!check_xml_close_tag (tag_name)) {
+			this.report_unexpected_token (current, ""</%s>"".printf (tag_name));
+			return run;
+		}
+
+		next ();
+		return run;
+	}
+
+	private ListItem?  parse_docbook_listitem () {
+		if (!check_xml_open_tag (""listitem"")) {
+			this.report_unexpected_token (current, ""<listitem>"");
+			return null;
+		}
+
+		next ();
+
+		ListItem item = factory.create_list_item ();
+	
+		while (current.type != TokenType.XML_CLOSE && current.type != TokenType.EOF) {
+			if (current.type == TokenType.XML_OPEN && current.content == ""para"") {
+				foreach (Block block in parse_docbook_para ()) {
+					if (block is Paragraph) {
+						if (item.content.size > 0) {
+							item.content.add (factory.create_text (""\n""));
+						}
+
+						item.content.add_all (((Paragraph) block).content);
+					} else {
+						// TODO: extend me
+						this.report_unexpected_token (current, ""<para>|</listitem>"");
+						return null;
+					}
+				}
+			} else {
+				Token tmp_t = current;
+				parse_inline_content ();
+				if (tmp_t == current) {
+					break;
+				}
+			}
+		}
+
+		if (!check_xml_close_tag (""listitem"")) {
+			this.report_unexpected_token (current, ""</listitem>"");
+			return item;
+		}
+
+		next ();
+		return item;
+	}
+
+	private LinkedList<Block>? parse_docbook_information_box_template (string tagname) {
+		if (!check_xml_open_tag (tagname)) {
+			this.report_unexpected_token (current, ""<%s>"".printf (tagname));
+			return null;
+		}
+
+		next ();
+		parse_docbook_spaces ();
+
+		LinkedList<Block> content = new LinkedList<Block> ();
+
+		var header_run = factory.create_run (Run.Style.BOLD);
+		header_run.content.add (factory.create_text (""Note:""));
+
+		while (current.type != TokenType.XML_CLOSE && current.type != TokenType.EOF) {
+			if (current.type == TokenType.XML_OPEN && current.content == ""para"") {
+				var paragraphs = parse_docbook_para ();
+				if (header_run != null) {
+					content.add_all (paragraphs);
+				} else {
+					Paragraph fp = paragraphs.first ();
+					fp.content.insert (0, factory.create_text ("" ""));
+					fp.content.insert (0, header_run);
+				}
+			} else {
+				Token tmp_t = current;
+
+				Run? inline_run = parse_inline_content ();
+				Paragraph p = factory.create_paragraph ();
+	
+				if (content != null) {
+					p.content.add (header_run);
+					p.content.add (factory.create_text ("" ""));
+					header_run = null;
+				}
+
+				p.content.add (inline_run);
+				content.add (p);
+
+				if (tmp_t == current) {
+					break;
+				}
+			}
+		}
+
+		//parse_block_content ();
+		parse_docbook_spaces ();
+
+		if (!check_xml_close_tag (tagname)) {
+			this.report_unexpected_token (current, ""</%s>"".printf (tagname));
+			return content;
+		}
+
+		next ();
+		return content;
+	}
+
+	private LinkedList<Block>? parse_docbook_note () {
+		return parse_docbook_information_box_template (""note"");
+	}
+
+	private LinkedList<Block>? parse_docbook_warning () {
+		return parse_docbook_information_box_template (""warning"");
+	}
+
+	private Content.List? parse_docbook_itemizedlist () {
+		if (!check_xml_open_tag (""itemizedlist"")) {
+			this.report_unexpected_token (current, ""<itemizedlist>"");
+			return null;
+		}
+
+		next ();
+
+		parse_docbook_spaces ();
+
+		Content.List list = factory.create_list ();
+		list.bullet = Content.List.Bullet.UNORDERED;
+
+		while (current.type == TokenType.XML_OPEN) {
+			if (current.content == ""listitem"") {
+				list.items.add (parse_docbook_listitem ());
+			} else {
+				break;
+			}
+
+			parse_docbook_spaces ();
+		}
+
+		if (!check_xml_close_tag (""itemizedlist"")) {
+			this.report_unexpected_token (current, ""</itemizedlist>"");
+			return list;
+		}
+
+		next ();
+		return list;
+	}
+
+	private Paragraph? parse_gtkdoc_paragraph () {
+		if (current.type != TokenType.GTKDOC_PARAGRAPH) {
+			this.report_unexpected_token (current, ""<GTKDOC-PARAGRAPH>"");
+			return null;
+		}
+
+		next ();
+
+		Paragraph p = factory.create_paragraph ();
+
+		Run? run = parse_inline_content ();
+		p.content.add (run);
+		return p;
+	}
+
+	private LinkedList<Paragraph>? parse_docbook_para () {
+		if (!check_xml_open_tag (""para"")) {
+			this.report_unexpected_token (current, ""<para>"");
+			return null;
+		}
+
+		next ();
+
+		LinkedList<Paragraph> content = new LinkedList<Paragraph> ();
+
+		Token tmp = null;
+		while (tmp != current) {
+			tmp = current;
+			parse_docbook_spaces ();
+
+			Run? run = parse_inline_content ();
+			if (run != null && run.content.size > 0) {
+				Paragraph p = factory.create_paragraph ();
+				p.content.add (run);
+				content.add (p);
+				continue;
+			}
+
+			LinkedList<Block> lst = parse_block_content ();
+			if (lst != null && run.content.size > 0) {
+				content.add_all (lst);
+				continue;
+			}
+		}
+
+		if (!check_xml_close_tag (""para"")) {
+			this.report_unexpected_token (current, ""</para>"");
+			return content;
+		}
+
+		next ();
+		return content;
+	}
+
+	private Paragraph? parse_gtkdoc_source () {
+		if (current.type != TokenType.GTKDOC_SOURCE_OPEN) {
+			this.report_unexpected_token (current, ""|["");
+			return null;
+		}
+
+
+		StringBuilder builder = new StringBuilder ();
+
+		for (next (); current.type != TokenType.EOF && current.type != TokenType.GTKDOC_SOURCE_CLOSE; next ()) {
+			if (current.type == TokenType.WORD) {
+				builder.append (current.content);
+			} else if (current.type != TokenType.XML_COMMENT) {
+				builder.append_len (current.start, current.length);
+			}
+		}
+
+		SourceCode src = factory.create_source_code ();
+		src.language = SourceCode.Language.C;
+		src.code = builder.str;
+
+		Paragraph p = factory.create_paragraph ();
+		p.content.add (src);
+
+		if (current.type != TokenType.GTKDOC_SOURCE_CLOSE) {
+			this.report_unexpected_token (current, ""|]"");
+			return p;
+		}
+
+		next ();
+		return p;
+	}
+
+	private Paragraph? parse_docbook_title () {
+		if (!check_xml_open_tag (""title"")) {
+			this.report_unexpected_token (current, ""<title>"");
+			return null;
+		}
+
+		next ();
+
+		Paragraph p = factory.create_paragraph ();
+		Run content = parse_inline_content ();
+		content.content.add (factory.create_text ("":""));
+		content.style = Run.Style.BOLD;
+		p.content.add (content);
+
+		if (!check_xml_close_tag (""title"")) {
+			this.report_unexpected_token (current, ""</title>"");
+			return p;
+		}
+
+		next ();
+		return p;
+	}
+
+	private Embedded? parse_docbook_inlinegraphic () {
+		if (!check_xml_open_tag (""inlinegraphic"")) {
+			this.report_unexpected_token (current, ""<inlinegraphic>"");
+			return null;
+		}
+
+		Embedded e = factory.create_embedded ();
+		e.url = current.attributes.get (""fileref"");
+
+		next ();
+		parse_docbook_spaces ();
+
+		if (!check_xml_close_tag (""inlinegraphic"")) {
+			this.report_unexpected_token (current, ""</inlinegrapic>"");
+			return e;
+		}
+
+		next ();
+		return e;
+	}
+
+	private Paragraph? parse_docbook_programlisting () {
+		if (!check_xml_open_tag (""programlisting"")) {
+			this.report_unexpected_token (current, ""<programlisting>"");
+			return null;
+		}
+
+		StringBuilder builder = new StringBuilder ();
+
+		for (next (); current.type != TokenType.EOF && !(current.type == TokenType.XML_CLOSE && current.content == ""programlisting""); next ()) {
+			if (current.type == TokenType.WORD) {
+				builder.append (current.content);
+			} else if (current.type != TokenType.XML_COMMENT) {
+				builder.append_len (current.start, current.length);
+			}
+		}
+
+		SourceCode src = factory.create_source_code ();
+		src.language = SourceCode.Language.C;
+		src.code = builder.str;
+
+		Paragraph p = factory.create_paragraph ();
+		p.content.add (src);
+
+		if (!check_xml_close_tag (""programlisting"")) {
+			this.report_unexpected_token (current, ""</programlisting>"");
+			return p;
+		}
+
+		next ();
+		return p;
+	}
+
+	private LinkedList<Block>? parse_docbook_informalexample () {
+		if (!check_xml_open_tag (""informalexample"")) {
+			this.report_unexpected_token (current, ""<informalexample>"");
+			return null;
+		}
+
+		next ();
+
+		parse_docbook_spaces ();
+
+		LinkedList<Block> content = new LinkedList<Block> ();
+
+		if (current.type == TokenType.XML_OPEN && current.content == ""title"") {
+			append_block_content_not_null (content, parse_docbook_title ());
+			parse_docbook_spaces ();
+		}
+
+		append_block_content_not_null (content, parse_docbook_programlisting ());
+
+		parse_docbook_spaces ();
+
+		if (!check_xml_close_tag (""informalexample"")) {
+			this.report_unexpected_token (current, ""</informalexample>"");
+			return content;
+		}
+
+		next ();
+		return content;
+	}
+
+	private LinkedList<Block>? parse_docbook_example () {
+		if (!check_xml_open_tag (""example"")) {
+			this.report_unexpected_token (current, ""<example>"");
+			return null;
+		}
+
+		next ();
+
+		parse_docbook_spaces ();
+
+		LinkedList<Block> content = new LinkedList<Block> ();
+
+		if (current.type == TokenType.XML_OPEN && current.content == ""title"") {
+			append_block_content_not_null (content, parse_docbook_title ());
+			parse_docbook_spaces ();
+		}
+
+		while (current.type == TokenType.XML_OPEN) {
+			if (current.content == ""inlinegraphic"") {
+				Paragraph p = factory.create_paragraph ();
+				while (current.type == TokenType.XML_OPEN && current.content == ""inlinegraphic"") {
+					p.content.add (parse_docbook_inlinegraphic ());
+					next ();
+					parse_docbook_spaces ();
+				}
+			} else if (current.content == ""programlisting"") {
+				append_block_content_not_null (content, parse_docbook_programlisting ());
+				next ();
+			} else {
+				break;
+			}
+
+			parse_docbook_spaces ();
+		}
+
+		if (!check_xml_close_tag (""example"")) {
+			this.report_unexpected_token (current, ""</example>"");
+			return content;
+		}
+
+		next ();
+		return content;
+	}
+
+	private LinkedList<Block>? parse_docbook_refsect2 () {
+		if (!check_xml_open_tag (""refsect2"")) {
+			this.report_unexpected_token (current, ""<refsect2>"");
+			return null;
+		}
+
+		// TODO: register id
+		string id = current.attributes.get (""id"");
+		next ();
+
+		parse_docbook_spaces ();
+
+		LinkedList<Block> content = new LinkedList<Block> ();
+
+		if (current.type == TokenType.XML_OPEN && current.content == ""title"") {
+			append_block_content_not_null (content, parse_docbook_title ());
+			parse_docbook_spaces ();
+		}
+
+		this.append_block_content_not_null_all (content, parse_block_content ());
+
+		if (!check_xml_close_tag (""refsect2"")) {
+			this.report_unexpected_token (current, ""</refsect2>"");
+			return content;
+		}
+
+		next ();
+		return content;
+	}
+
+	private inline void append_block_content_not_null_all (LinkedList<Block> run, LinkedList<Block>? elements) {
+		if (elements != null) {
+			run.add_all (elements);
+		}
+	}
+
+	private inline void append_block_content_not_null (LinkedList<Block> run, Block? element) {
+		if (element != null) {
+			run.add (element);
+		}
+	}
+
+	private LinkedList<Block> parse_block_content () {
+		LinkedList<Block> content = new LinkedList<Block> ();
+
+		while (current.type != TokenType.EOF) {
+			parse_docbook_spaces (false);
+
+			if (current.type == TokenType.XML_OPEN && current.content == ""itemizedlist"") {
+				this.append_block_content_not_null (content, parse_docbook_itemizedlist ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""para"") {
+				this.append_block_content_not_null_all (content, parse_docbook_para ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""informalexample"") {
+				this.append_block_content_not_null_all (content, parse_docbook_informalexample ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""example"") {
+				this.append_block_content_not_null_all (content, parse_docbook_example ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""warning"") {
+				this.append_block_content_not_null_all (content, parse_docbook_warning ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""note"") {
+				this.append_block_content_not_null_all (content, parse_docbook_note ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""refsect2"") {
+				this.append_block_content_not_null_all (content, parse_docbook_refsect2 ());
+			} else if (current.type == TokenType.GTKDOC_PARAGRAPH) {
+				this.append_block_content_not_null (content, parse_gtkdoc_paragraph ());
+			} else if (current.type == TokenType.GTKDOC_SOURCE_OPEN) {
+				this.append_block_content_not_null (content, parse_gtkdoc_source ());
+			} else {
+				break;
+			}
+		}
+
+		return content;
+	}
+
+	private void append_inline_content_string (Run run, string current) {
+		Text last_as_text = null;
+
+		if (run.content.size > 0) {
+			last_as_text = run.content.last () as Text;
+		}
+
+		if (last_as_text == null) {
+			run.content.add (factory.create_text (current));
+		} else if (current.has_prefix ("" "") && last_as_text.content.has_suffix ("" "")) {
+			last_as_text.content += current.chug ();
+		} else {
+			last_as_text.content += current;
+		}
+	}
+
+	private Inline create_type_link (string name) {
+		if (name == ""TRUE"" || name == ""FALSE"" || name == ""NULL"") {
+			var monospaced = factory.create_run (Run.Style.MONOSPACED);
+			monospaced.content.add (factory.create_text (name));
+			return monospaced;
+		} else {
+			Taglets.Link? taglet = factory.create_taglet (""link"") as Taglets.Link;
+			assert (taglet != null);
+			taglet.symbol_name = ""c::""+name;
+			return taglet;
+		}
+	}
+
+	private inline void append_inline_content_not_null (Run run, Inline element) {
+		if (element != null) {
+			run.content.add (element);
+		}
+	}
+
+	private Run parse_inline_content () {
+		Run run = factory.create_run (Run.Style.NONE);
+
+		while (current.type != TokenType.EOF) {
+			if (current.type == TokenType.XML_OPEN && current.content == ""firstterm"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""firstterm"", Run.Style.ITALIC));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""literal"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""literal"", Run.Style.ITALIC));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""application"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""application"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""emphasis"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""emphasis"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""code"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""code"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""command"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""command"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""option"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""option"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""keycap"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""keycap"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""keycombo"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""keycombo"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""envar"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""envar"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""filename"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""filename"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""replaceable"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""replaceable"", Run.Style.ITALIC));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""type"") {
+				append_inline_content_not_null (run, parse_symbol_link (""type""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""function"") {
+				append_inline_content_not_null (run, parse_symbol_link (""function""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""classname"") {
+				append_inline_content_not_null (run, parse_symbol_link (""classname""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""structname"") {
+				append_inline_content_not_null (run, parse_symbol_link (""structname""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""structfield"") {
+				append_inline_content_not_null (run, parse_symbol_link (""structfield""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""errorcode"") {
+				append_inline_content_not_null (run, parse_symbol_link (""errorcode""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""constant"") {
+				append_inline_content_not_null (run, parse_symbol_link (""constant""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""anchor"") {
+				parse_anchor ();
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""link"") {
+				append_inline_content_not_null (run, parse_docbook_link_tempalte (""link""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""ulink"") {
+				append_inline_content_not_null (run, parse_docbook_link_tempalte (""ulink""));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""xref"") {
+				parse_xref ();
+			} else if (current.type == TokenType.GTKDOC_FUNCTION) {
+				run.content.add (this.create_type_link (current.content));
+				next ();
+			} else if (current.type == TokenType.GTKDOC_PARAM) {
+				Run current_run = factory.create_run (Run.Style.MONOSPACED);
+				current_run.content.add (factory.create_text (current.content));
+				run.content.add (current_run);
+				next ();
+			} else if (current.type == TokenType.GTKDOC_SIGNAL) {
+				run.content.add (this.create_type_link (""::""+current.content));
+				next ();
+			} else if (current.type == TokenType.GTKDOC_PROPERTY) {
+				run.content.add (this.create_type_link ("":""+current.content));
+				next ();
+			} else if (current.type == TokenType.GTKDOC_CONST) {
+				run.content.add (this.create_type_link (current.content));
+				next ();
+			} else if (current.type == TokenType.GTKDOC_TYPE) {
+				run.content.add (this.create_type_link (current.content));
+				next ();
+			} else if (current.type == TokenType.NEWLINE || current.type == TokenType.SPACE) {
+				append_inline_content_string (run, "" "");
+				next ();
+			} else if (current.type == TokenType.WORD) {
+				append_inline_content_string (run, current.content);
+				next ();
+			} else if (current.type == TokenType.XML_CLOSE && ignore_current_xml_close ()) {
+				next ();
+			} else if (current.type == TokenType.XML_COMMENT) {
+				next ();
+			} else {
+				break;
+			}
+		}
+
+		return run;
+	}
+
+
+
+	//
+	// Resource Locator:
+	//
+
+	public string resolve (string path) {
+		return path;
+	}
+}
+
+
diff --git a/src/libvaladoc/documentation/gtkdoccommentscanner.vala b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
new file mode 100644
index 0000000000..ca03b1530d
--- /dev/null
+++ b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
@@ -0,0 +1,644 @@
+/* gtkcommentscanner.vala
+ *
+ * Copyright (C) 2011  Florian Brosch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Florian Brosch <flo.brosch@gmail.com>
+ */
+
+
+using Valadoc.Gtkdoc;
+using Gee;
+
+
+
+public enum Valadoc.Gtkdoc.TokenType {
+	XML_OPEN,
+	XML_CLOSE,
+	XML_COMMENT,
+	GTKDOC_FUNCTION,
+	GTKDOC_CONST,
+	GTKDOC_TYPE,
+	GTKDOC_PARAM,
+	GTKDOC_SOURCE_OPEN,
+	GTKDOC_SOURCE_CLOSE,
+	GTKDOC_SIGNAL,
+	GTKDOC_PROPERTY,
+	GTKDOC_PARAGRAPH,
+	NEWLINE,
+	SPACE,
+	WORD,
+	EOF
+}
+
+
+public class Valadoc.Gtkdoc.Token {
+	public TokenType type;
+	public string content;
+	public HashMap<string, string>? attributes;
+	public unowned string start;
+	public int length;
+	public int line;
+	public int first_column;
+	public int last_column;
+
+	public Token (TokenType type, string content, HashMap<string, string>? attributes, string start, int length, int line, int first_column, int last_column) {
+		this.attributes = attributes;
+		this.content = content;
+		this.length = length;
+		this.start = start;
+		this.type = type;
+		this.line = line;
+		this.first_column = first_column;
+		this.last_column = last_column;
+	}
+
+	public string to_string () {
+		switch (this.type) {
+		case TokenType.XML_OPEN:
+			return ""`<%s>'"".printf (this.content);
+
+		case TokenType.XML_CLOSE:
+			return ""`<%s>'"".printf (this.content);
+
+		case TokenType.XML_COMMENT:
+			return ""<XML-COMMENT>"";
+
+		case TokenType.GTKDOC_FUNCTION:
+			return ""`%s ()'"".printf (this.content);
+
+		case TokenType.GTKDOC_CONST:
+			return ""`%%%s'"".printf (this.content);
+
+		case TokenType.GTKDOC_TYPE:
+			return ""`#%s'"".printf (this.content);
+
+		case TokenType.GTKDOC_PARAM:
+			return ""<GTKDOC-PARAM>"";
+
+		case TokenType.GTKDOC_SOURCE_OPEN:
+			return ""[|"";
+
+		case TokenType.GTKDOC_SOURCE_CLOSE:
+			return ""|]"";
+
+		case TokenType.GTKDOC_SIGNAL:
+			return ""`::%s'"".printf (this.content);
+
+		case TokenType.GTKDOC_PROPERTY:
+			return ""`:%s'"".printf (this.content);
+
+		case TokenType.GTKDOC_PARAGRAPH:
+			return ""<GKTDOC-PARAGRAPH>"";
+
+		case TokenType.NEWLINE:
+			return ""<NEWLNIE>"";
+
+		case TokenType.SPACE:
+			return ""<SPACE>"";
+
+		case TokenType.WORD:
+			return ""`%s'"".printf (this.content);
+
+		case TokenType.EOF:
+			return ""<EOF>"";
+
+		default:
+			assert_not_reached ();
+		}
+	}
+}
+
+
+public class Valadoc.Gtkdoc.Scanner {
+	private unowned string content;
+	private unowned string pos;
+	private int column;
+	private int line;
+	private Token tmp_token;
+
+	public Scanner () {
+	}
+
+	public void reset (string content) {
+		this.content = content;
+		this.tmp_token = null;
+		this.pos = content;
+		this.column = 0;
+		this.line = 0;
+	}
+
+	private inline unichar next_char () {
+		this.pos = this.pos.next_char ();
+		this.column++;
+
+		return this.pos.get_char ();
+	}
+
+	private inline unichar get () {
+		return this.pos.get_char ();
+	}
+
+	private inline bool letter (unichar c) {
+		return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+	}
+
+	private inline bool letter_or_number (unichar c) {
+		return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9');
+	}
+
+	private inline bool space (unichar c) {
+		return c == ' ' || c == '\t';
+	}
+
+	private inline bool space_or_newline (unichar c) {
+		if (c == '\n') {
+			this.line++;
+			this.column = 0;
+			return true;
+		}
+
+		return space (c);
+	}
+
+	private inline int offset (string a, string b) {
+		return (int) ((char*) a - (char*) b);
+	}
+
+	private inline int id_prefix () {
+		if (!letter (get ())) {
+			return 0;
+		}
+
+		int start = this.column;
+		unichar c;
+		while ((c = next_char ()) == '_' || letter_or_number (c));
+		return this.column - start;
+	}
+
+	private inline int g_id_prefix () {
+		unowned string start = this.pos;
+
+		if (!letter (get ())) {
+			return 0;
+		}
+
+		unichar c;
+		while ((c = next_char ()) == '_' || c == '-' || letter_or_number (c));
+		return offset (this.pos, start);
+	}
+
+	private inline int skip_spaces_and_newlines () {
+		unowned string start = this.pos;
+		if (space_or_newline (get ())) {
+			while (space_or_newline (next_char ()));
+		}
+
+		return offset (this.pos, start);
+	}
+
+	private inline Token? function_prefix () {
+		unowned string start = this.pos;
+		int column_start = this.column;
+		int id_len = 0;
+		if ((id_len = id_prefix ()) == 0) {
+			return null;
+		}
+
+		space_prefix ();
+
+		if (get () != '(') {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		next_char ();
+		space_prefix ();
+
+		if (get () != ')') {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		next_char ();
+		return new Token (TokenType.GTKDOC_FUNCTION, start.substring (0, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private inline Token? gtkdoc_symbolic_link_prefix (unichar c, TokenType type) {
+		if (get () != c) {
+			return null;
+		}
+
+		unowned string start = this.pos;
+		int column_start = this.column;
+		next_char ();		
+
+		int id_len = 0;
+
+		if ((id_len = id_prefix ()) == 0) {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		unowned string separator = this.pos;
+		if (get () == ':') {
+			int separator_len = 1;
+			if (next_char () == ':') {
+				next_char ();
+				separator_len++;
+			}
+
+			int id_len2;
+			if ((id_len2 = g_id_prefix ()) == 0) {
+				this.pos = separator;
+			} else {
+				id_len += id_len2 + separator_len;
+			}
+		}
+
+		return new Token (type, start.substring (1, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private inline Token? gtkdoc_property_prefix () {
+		if (get () != ':') {
+			return null;
+		}		
+
+		unowned string start = this.pos;
+		int column_start = this.column;
+		next_char ();		
+
+		int id_len = 0;
+
+		if ((id_len = g_id_prefix ()) == 0) {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		return new Token (TokenType.GTKDOC_PROPERTY, start.substring (1, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private inline Token? gtkdoc_signal_prefix () {
+		if (get () != ':') {
+			return null;
+		}		
+
+		unowned string start = this.pos;
+		int column_start = this.column;
+		if (next_char () != ':') {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+
+		start = this.pos;
+		next_char ();		
+
+		int id_len = 0;
+
+		if ((id_len = g_id_prefix ()) == 0) {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		return new Token (TokenType.GTKDOC_SIGNAL, start.substring (1, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private inline Token? gtkdoc_const_prefix () {
+		return gtkdoc_symbolic_link_prefix ('%', TokenType.GTKDOC_CONST);
+	}
+
+	private inline Token? gtkdoc_param_prefix () {
+		return gtkdoc_symbolic_link_prefix ('@', TokenType.GTKDOC_PARAM);
+	}
+
+	private inline Token? gtkdoc_type_prefix () {
+		return gtkdoc_symbolic_link_prefix ('#', TokenType.GTKDOC_TYPE);
+	}
+
+	private inline Token? xml_prefix () {
+		if (get () != '<') {
+			return null;
+		}
+
+		unowned string start = this.pos;
+		int line_start = this.line;
+		int column_start = this.column;
+		next_char ();
+
+		if (get () == '!') {
+			// comment
+			if (next_char () == '-') {
+				if (next_char () != '-') {
+					this.column = column_start;
+					this.pos = start;
+					return null;
+				}
+
+				for (unichar c = next_char (); c != '\0'; c = next_char ()) {
+					if (c == '\n') {
+						this.line++;
+						this.column = 0;
+					} else if (this.pos.has_prefix (""-->"")) {
+						next_char ();
+						next_char ();
+						next_char ();
+						return new Token (TokenType.XML_COMMENT, """", null, start, offset (this.pos, start), this.line, column_start, this.column);
+					}
+				}
+			} else if (this.pos.has_prefix (""[CDATA["")) {
+				next_char ();
+				next_char ();
+				next_char ();
+				next_char ();
+				next_char ();
+				next_char ();
+
+				for (unichar c = next_char (); c != '\0'; c = next_char ()) {
+					if (c == '\n') {
+						this.line++;
+						this.column = 0;
+					} else if (this.pos.has_prefix (""]]>"")) {
+						string content = start.substring (9, offset (this.pos, start) - 9);
+						next_char ();
+						next_char ();
+						next_char ();
+						return new Token (TokenType.WORD, content, null, start, offset (this.pos, start), this.line, column_start, this.column);
+					}
+				}
+			}
+
+			this.pos = start;
+			this.column = column_start;
+			this.line = line_start;
+			return null;
+		}
+
+		bool close = false;
+		if (get () == '/') {
+			next_char ();
+			close = true;
+		}
+
+		unowned string id_start = this.pos;
+
+		int id_len = 0;
+		if ((id_len = id_prefix ()) == 0) {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		HashMap<string, string> map = new HashMap<string, string> ();
+
+		while (close == false && skip_spaces_and_newlines () > 0) {
+			string name;
+			string val;
+
+			unowned string att_pos = this.pos;
+			int att_id_len = 0;
+			if ((att_id_len = id_prefix ()) == 0) {
+				break;
+			}
+
+			name = att_pos.substring (0, att_id_len);
+
+			if (get() != '=') {
+				break;
+			}
+
+			next_char ();
+			skip_spaces_and_newlines ();
+
+			if (get() != '""') {
+				break;
+			}
+
+			unichar c = next_char ();
+			att_pos = this.pos;
+			for (; c != '\0' && c != '\n' && c != '""' ; c = next_char ());
+
+			val = att_pos.substring (0, offset (this.pos, att_pos));
+
+			if (get() != '""') {
+				break;
+			}
+
+			next_char ();
+
+			map.set (name, val);
+		}
+
+		skip_spaces_and_newlines ();
+
+		bool open_and_close = false;
+
+		if (!close && get () == '/') {
+			open_and_close = true;
+			next_char ();
+		}
+
+		if (get () != '>') {
+			this.line = line_start;
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		next_char ();
+
+		if (open_and_close) {
+			this.tmp_token = new Token (TokenType.XML_CLOSE, id_start.substring (0, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+		}
+
+		if (close) {
+			return new Token (TokenType.XML_CLOSE, id_start.substring (0, id_len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+		} else {
+			return new Token (TokenType.XML_OPEN, id_start.substring (0, id_len), map, start, offset (this.pos, start), this.line, column_start, this.column);
+		}
+	}
+
+	private Token? newline_prefix () {
+		if (get () != '\n') {
+			return null;
+		}
+
+		unowned string start = this.pos;
+		this.line++;
+		this.column = 0;
+
+		for (unichar c = next_char (); c == ' ' || c == '\t' ; c = next_char ());
+
+		if (get () == '\n') {
+			next_char ();
+			this.line++;
+			this.column = 0;
+			return new Token (TokenType.GTKDOC_PARAGRAPH, ""\n\n"", null, start, offset (this.pos, start), this.line, this.column, this.column);
+		} else {
+			return new Token (TokenType.NEWLINE, ""\n"", null, start, offset (this.pos, start), this.line, this.column, this.column);
+		}
+	}
+
+	private Token? eof_prefix () {
+		if (get () != '\0') {
+			return null;
+		}
+
+		return new Token (TokenType.EOF, """", null, this.pos, 1, this.line, this.column, this.column);
+	}
+
+	private Token? space_prefix () {
+		unowned string start = this.pos;
+		int column_start = this.column;
+		for (unichar c = get (); c == ' ' || c == '\t'; c = next_char ());
+		int len = offset (this.pos, start);
+		if (len == 0) {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		return new Token (TokenType.SPACE, start.substring (0, len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private Token? word_prefix () {
+		unowned string start = this.pos;
+		int column_start = this.column;
+		if (get () == '<') {
+			next_char ();
+		}
+
+		for (unichar c = get (); c != ' ' && c != '\t' && c != '\n' && c != '\0' && c != '<'; c = next_char ());
+		int len = offset (this.pos, start);
+		if (len == 0) {
+			this.column = column_start;
+			this.pos = start;
+			return null;
+		}
+
+		return new Token (TokenType.WORD, start.substring (0, len), null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private Token? gtkdoc_source_open_prefix () {
+		if (!this.pos.has_prefix (""|["")) {
+			return null;
+		}
+
+		unowned string start = this.pos;
+		int column_start = this.column;
+		next_char ();
+		next_char ();
+
+		return new Token (TokenType.GTKDOC_SOURCE_OPEN, ""|["", null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	private Token? gtkdoc_source_close_prefix () {
+		if (!this.pos.has_prefix (""]|"")) {
+			return null;
+		}
+
+		unowned string start = this.pos;
+		int column_start = this.column;
+		next_char ();
+		next_char ();
+
+		return new Token (TokenType.GTKDOC_SOURCE_CLOSE, ""]|"", null, start, offset (this.pos, start), this.line, column_start, this.column);
+	}
+
+	public Token next () {
+		if (tmp_token != null) {
+			var tmp = tmp_token;
+			tmp_token = null;
+			return tmp;
+		}
+
+		Token? token = function_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = xml_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_param_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_const_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_type_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = space_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = newline_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_signal_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_property_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_source_open_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = gtkdoc_source_close_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = eof_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		token = word_prefix ();
+		if (token != null) {
+			return token;
+		}
+
+		assert_not_reached ();
+	}
+}
+
+
diff --git a/src/libvaladoc/importer/valadocdocumentationimporter.vala b/src/libvaladoc/importer/valadocdocumentationimporter.vala
index d0cdb84e75..16bb1086d4 100755
--- a/src/libvaladoc/importer/valadocdocumentationimporter.vala
+++ b/src/libvaladoc/importer/valadocdocumentationimporter.vala
@@ -116,7 +116,7 @@ public class Valadoc.Importer.ValadocDocumentationImporter : DocumentationImport
 		Api.Node? symbol = null;
 
 		if (symbol_name.has_prefix (""c::"")) {
-			symbol = tree.search_symbol_cstr (symbol_name.substring (3));
+			symbol = tree.search_symbol_cstr (null, symbol_name.substring (3));
 		} else {
 			symbol = tree.search_symbol_str (null, symbol_name);
 		}
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 93ba7ab6e6..57b14747c5 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -47,7 +47,11 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		if (symbol_name.has_prefix (""c::"")) {
 			_symbol_name = _symbol_name.substring (3);
-			_symbol = api_root.search_symbol_cstr (symbol_name);
+			_symbol = api_root.search_symbol_cstr (container, symbol_name);
+			if (_symbol == null) {
+				
+			}
+
 			if (_symbol != null) {
 				symbol_name = _symbol.name;
 			}
diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index eb4562eae3..d976688770 100755
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -41,7 +41,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		if (symbol_name.has_prefix (""c::"")) {
 			symbol_name = symbol_name.substring (3);
-			symbol = api_root.search_symbol_cstr (symbol_name);
+			symbol = api_root.search_symbol_cstr (container, symbol_name);
 			if (symbol != null) {
 				symbol_name = _symbol.name;
 			}"
198b4d0f2c3293b1a45f261c011fcf92543d4b15,Vala,"vapigen: add support for member access based default values
",a,https://github.com/GNOME/vala/,"diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index d0831128f4..6d3e03d6b6 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1779,6 +1779,8 @@ public class Vala.GIdlParser : CodeVisitor {
 							p.default_expression = new BooleanLiteral (true, param_type.source_reference);
 						} else if (val == ""false"") {
 							p.default_expression = new BooleanLiteral (false, param_type.source_reference);
+						} else if (val == """") {
+							p.default_expression = new StringLiteral (""\""\"""", param_type.source_reference);
 						} else {
 							unowned string endptr;
 							unowned string val_end = val.offset (val.len ());
@@ -1791,7 +1793,13 @@ public class Vala.GIdlParser : CodeVisitor {
 								if ((long)endptr == (long)val_end) {
 									p.default_expression = new RealLiteral (val, param_type.source_reference);
 								} else {
-									p.default_expression = new StringLiteral (""\""%s\"""".printf (val), param_type.source_reference);
+									if (val.has_prefix (""\"""") && val.has_suffix (""\"""")) {
+										p.default_expression = new StringLiteral (val, param_type.source_reference);
+									} else {
+										foreach (var member in val.split (""."")) {
+											p.default_expression = new MemberAccess (p.default_expression, member, param_type.source_reference);
+										}
+									}
 								}
 							}
 						}"
737771ba18bca7bdd3e8684f06f127b6f16f6e18,Delta Spike,"DELTASPIKE-277 add JsfMessage API
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/message/JsfMessage.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/message/JsfMessage.java
new file mode 100644
index 000000000..01bbdd70d
--- /dev/null
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/message/JsfMessage.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.jsf.message;
+
+/**
+ * <p>An injectable component for typesafe FacesMessages.
+ * T must be a class which is annotated with
+ * {@link org.apache.deltaspike.core.api.message.annotation.MessageBundle}</p>
+ *
+ * <p>Usage:
+ * <pre>
+ * &#064;Inject
+ * JsfMessage&lt;MyMessages&gt; msg;
+ * ...
+ * msg.addError().userNotLoggedIn();
+ * </pre>
+ * <p>MessageBundle methods which are used as JsfMessage can return a
+ * {@link org.apache.deltaspike.core.api.message.Message} or a String.
+ * In case of a String we use it for both the summary and detail
+ * information on the FacesMessage. </p>
+ * <p>If a Message is returned, we lookup the 'detail' and 'summary'
+ * categories (see {@link org.apache.deltaspike.core.api.message.Message#toString(String)}
+ * for creating the FacesMessage.</p>
+ *
+ */
+public interface JsfMessage<T>
+{
+    T addError();
+    T addFatal();
+    T addInfo();
+    T addWarn();
+}"
9a94fd278693e098837dddce222a732c1a57f532,ReactiveX-RxJava,CurrentThreadScheduler Memory Leak Fixed-MIME-Version: 1.0-Content-Type: text/plain; charset=UTF-8-Content-Transfer-Encoding: 8bit--- Current/Immediate/NewThread/Executor Schedulers are passing unit tests-- Current/NewThread/Executor Schedulers do not leak memory on the recursion test (Immediate can’t be used for recursion otherwise it stack overflows)-,c,https://github.com/ReactiveX/RxJava,"diff --git a/rxjava-core/src/main/java/rx/schedulers/CurrentThreadScheduler.java b/rxjava-core/src/main/java/rx/schedulers/CurrentThreadScheduler.java
index d1550a2422..67d66aa4aa 100644
--- a/rxjava-core/src/main/java/rx/schedulers/CurrentThreadScheduler.java
+++ b/rxjava-core/src/main/java/rx/schedulers/CurrentThreadScheduler.java
@@ -17,10 +17,12 @@
 
 import java.util.PriorityQueue;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import rx.Scheduler;
 import rx.Subscription;
+import rx.subscriptions.CompositeSubscription;
+import rx.subscriptions.MultipleAssignmentSubscription;
 import rx.util.functions.Func2;
 
 /**
@@ -28,6 +30,7 @@
  */
 public class CurrentThreadScheduler extends Scheduler {
     private static final CurrentThreadScheduler INSTANCE = new CurrentThreadScheduler();
+    private static final AtomicLong counter = new AtomicLong(0);
 
     public static CurrentThreadScheduler getInstance() {
         return INSTANCE;
@@ -38,25 +41,27 @@ public static CurrentThreadScheduler getInstance() {
     /* package accessible for unit tests */CurrentThreadScheduler() {
     }
 
-    private final AtomicInteger counter = new AtomicInteger(0);
-
     @Override
     public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action) {
+        // immediately move to the InnerCurrentThreadScheduler
+        InnerCurrentThreadScheduler innerScheduler = new InnerCurrentThreadScheduler();
         DiscardableAction<T> discardableAction = new DiscardableAction<T>(state, action);
-        enqueue(discardableAction, now());
-        return discardableAction;
+        enqueue(innerScheduler, discardableAction, now());
+        return innerScheduler;
     }
 
     @Override
     public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action, long dueTime, TimeUnit unit) {
         long execTime = now() + unit.toMillis(dueTime);
 
+        // immediately move to the InnerCurrentThreadScheduler
+        InnerCurrentThreadScheduler innerScheduler = new InnerCurrentThreadScheduler();
         DiscardableAction<T> discardableAction = new DiscardableAction<T>(state, new SleepingAction<T>(action, this, execTime));
-        enqueue(discardableAction, execTime);
+        enqueue(innerScheduler, discardableAction, execTime);
         return discardableAction;
     }
 
-    private void enqueue(DiscardableAction<?> action, long execTime) {
+    private static void enqueue(Scheduler scheduler, DiscardableAction<?> action, long execTime) {
         PriorityQueue<TimedAction> queue = QUEUE.get();
         boolean exec = queue == null;
 
@@ -69,19 +74,50 @@ private void enqueue(DiscardableAction<?> action, long execTime) {
 
         if (exec) {
             while (!queue.isEmpty()) {
-                queue.poll().action.call(this);
+                queue.poll().action.call(scheduler);
             }
 
             QUEUE.set(null);
         }
     }
 
+    private static class InnerCurrentThreadScheduler extends Scheduler implements Subscription {
+        private final MultipleAssignmentSubscription childSubscription = new MultipleAssignmentSubscription();
+
+        @Override
+        public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action) {
+            DiscardableAction<T> discardableAction = new DiscardableAction<T>(state, action);
+            childSubscription.set(discardableAction);
+            enqueue(this, discardableAction, now());
+            return childSubscription;
+        }
+
+        @Override
+        public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action, long delayTime, TimeUnit unit) {
+            long execTime = now() + unit.toMillis(delayTime);
+
+            DiscardableAction<T> discardableAction = new DiscardableAction<T>(state, action);
+            childSubscription.set(discardableAction);
+            enqueue(this, discardableAction, execTime);
+            return childSubscription;
+        }
+
+        @Override
+        public void unsubscribe() {
+            childSubscription.unsubscribe();
+        }
+
+    }
+
+    /**
+     * Use time to sort items so delayed actions are sorted to their appropriate position in the queue.
+     */
     private static class TimedAction implements Comparable<TimedAction> {
         final DiscardableAction<?> action;
         final Long execTime;
-        final Integer count; // In case if time between enqueueing took less than 1ms
+        final Long count; // In case if time between enqueueing took less than 1ms
 
-        private TimedAction(DiscardableAction<?> action, Long execTime, Integer count) {
+        private TimedAction(DiscardableAction<?> action, Long execTime, Long count) {
             this.action = action;
             this.execTime = execTime;
             this.count = count;
diff --git a/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java b/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java
index 8fb00c6553..6602d5071d 100644
--- a/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java
+++ b/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java
@@ -8,13 +8,15 @@
 
 import org.junit.Test;
 
+import rx.Observable;
+import rx.Observer;
 import rx.Scheduler;
 import rx.Subscription;
 import rx.operators.SafeObservableSubscription;
-import rx.subscriptions.CompositeSubscription;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
+import rx.util.functions.Func1;
 import rx.util.functions.Func2;
 
 /**
@@ -26,6 +28,55 @@
  */
 public abstract class AbstractSchedulerConcurrencyTests extends AbstractSchedulerTests {
 
+    /**
+     * Bug report: https://github.com/Netflix/RxJava/issues/431
+     */
+    @Test
+    public final void testUnSubscribeForScheduler() throws InterruptedException {
+        final AtomicInteger countReceived = new AtomicInteger();
+        final AtomicInteger countGenerated = new AtomicInteger();
+        final SafeObservableSubscription s = new SafeObservableSubscription();
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        s.wrap(Observable.interval(50, TimeUnit.MILLISECONDS)
+                .map(new Func1<Long, Long>() {
+                    @Override
+                    public Long call(Long aLong) {
+                        countGenerated.incrementAndGet();
+                        return aLong;
+                    }
+                })
+                .subscribeOn(getScheduler())
+                .observeOn(getScheduler())
+                .subscribe(new Observer<Long>() {
+                    @Override
+                    public void onCompleted() {
+                        System.out.println(""--- completed"");
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        System.out.println(""--- onError"");
+                    }
+
+                    @Override
+                    public void onNext(Long args) {
+                        if (countReceived.incrementAndGet() == 2) {
+                            s.unsubscribe();
+                            latch.countDown();
+                        }
+                        System.out.println(""==> Received "" + args);
+                    }
+                }));
+
+        latch.await(1000, TimeUnit.MILLISECONDS);
+
+        System.out.println(""----------- it thinks it is finished ------------------ "");
+        Thread.sleep(100);
+
+        assertEquals(2, countGenerated.get());
+    }
+
     @Test
     public void testUnsubscribeRecursiveScheduleWithStateAndFunc2() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
diff --git a/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerTests.java b/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerTests.java
index 921780f2b2..508727bc12 100644
--- a/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerTests.java
+++ b/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerTests.java
@@ -15,11 +15,11 @@
 import rx.Observer;
 import rx.Scheduler;
 import rx.Subscription;
-import rx.operators.SafeObservableSubscription;
 import rx.subscriptions.BooleanSubscription;
+import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
-import rx.util.functions.Func1;
+import rx.util.functions.Func2;
 
 /**
  * Base tests for all schedulers including Immediate/Current.
@@ -98,60 +98,11 @@ public void call(Integer i) {
         assertEquals(10, countTaken.get());
     }
 
-    /**
-     * Bug report: https://github.com/Netflix/RxJava/issues/431
-     */
     @Test
-    public final void testUnSubscribeForScheduler() throws InterruptedException {
-
-        final AtomicInteger countReceived = new AtomicInteger();
-        final AtomicInteger countGenerated = new AtomicInteger();
-        final SafeObservableSubscription s = new SafeObservableSubscription();
+    public void testNestedActions() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
         final CountDownLatch latch = new CountDownLatch(1);
 
-        s.wrap(Observable.interval(50, TimeUnit.MILLISECONDS)
-                .map(new Func1<Long, Long>() {
-                    @Override
-                    public Long call(Long aLong) {
-                        countGenerated.incrementAndGet();
-                        return aLong;
-                    }
-                })
-                .subscribeOn(getScheduler())
-                .observeOn(getScheduler())
-                .subscribe(new Observer<Long>() {
-                    @Override
-                    public void onCompleted() {
-                        System.out.println(""--- completed"");
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        System.out.println(""--- onError"");
-                    }
-
-                    @Override
-                    public void onNext(Long args) {
-                        if (countReceived.incrementAndGet() == 2) {
-                            s.unsubscribe();
-                            latch.countDown();
-                        }
-                        System.out.println(""==> Received "" + args);
-                    }
-                }));
-
-        latch.await(1000, TimeUnit.MILLISECONDS);
-
-        System.out.println(""----------- it thinks it is finished ------------------ "");
-        Thread.sleep(100);
-
-        assertEquals(2, countGenerated.get());
-    }
-
-    @Test
-    public final void testNestedActions() {
-        final CurrentThreadScheduler scheduler = new CurrentThreadScheduler();
-
         final Action0 firstStepStart = mock(Action0.class);
         final Action0 firstStepEnd = mock(Action0.class);
 
@@ -166,6 +117,7 @@ public final void testNestedActions() {
             public void call() {
                 firstStepStart.call();
                 firstStepEnd.call();
+                latch.countDown();
             }
         };
         final Action0 secondAction = new Action0() {
@@ -189,6 +141,8 @@ public void call() {
         InOrder inOrder = inOrder(firstStepStart, firstStepEnd, secondStepStart, secondStepEnd, thirdStepStart, thirdStepEnd);
 
         scheduler.schedule(thirdAction);
+        
+        latch.await();
 
         inOrder.verify(thirdStepStart, times(1)).call();
         inOrder.verify(thirdStepEnd, times(1)).call();
@@ -199,14 +153,24 @@ public void call() {
     }
 
     @Test
-    public final void testSequenceOfActions() {
-        final CurrentThreadScheduler scheduler = new CurrentThreadScheduler();
+    public final void testSequenceOfActions() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
 
+        final CountDownLatch latch = new CountDownLatch(1);
         final Action0 first = mock(Action0.class);
         final Action0 second = mock(Action0.class);
 
         scheduler.schedule(first);
         scheduler.schedule(second);
+        scheduler.schedule(new Action0() {
+
+            @Override
+            public void call() {
+                latch.countDown();
+            }
+        });
+
+        latch.await();
 
         verify(first, times(1)).call();
         verify(second, times(1)).call();
@@ -214,9 +178,10 @@ public final void testSequenceOfActions() {
     }
 
     @Test
-    public final void testSequenceOfDelayedActions() {
-        final CurrentThreadScheduler scheduler = new CurrentThreadScheduler();
+    public void testSequenceOfDelayedActions() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
 
+        final CountDownLatch latch = new CountDownLatch(1);
         final Action0 first = mock(Action0.class);
         final Action0 second = mock(Action0.class);
 
@@ -225,9 +190,17 @@ public final void testSequenceOfDelayedActions() {
             public void call() {
                 scheduler.schedule(first, 30, TimeUnit.MILLISECONDS);
                 scheduler.schedule(second, 10, TimeUnit.MILLISECONDS);
+                scheduler.schedule(new Action0() {
+
+                    @Override
+                    public void call() {
+                        latch.countDown();
+                    }
+                }, 40, TimeUnit.MILLISECONDS);
             }
         });
 
+        latch.await();
         InOrder inOrder = inOrder(first, second);
 
         inOrder.verify(second, times(1)).call();
@@ -236,9 +209,10 @@ public void call() {
     }
 
     @Test
-    public final void testMixOfDelayedAndNonDelayedActions() {
-        final CurrentThreadScheduler scheduler = new CurrentThreadScheduler();
+    public void testMixOfDelayedAndNonDelayedActions() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
 
+        final CountDownLatch latch = new CountDownLatch(1);
         final Action0 first = mock(Action0.class);
         final Action0 second = mock(Action0.class);
         final Action0 third = mock(Action0.class);
@@ -251,16 +225,94 @@ public void call() {
                 scheduler.schedule(second, 300, TimeUnit.MILLISECONDS);
                 scheduler.schedule(third, 100, TimeUnit.MILLISECONDS);
                 scheduler.schedule(fourth);
+                scheduler.schedule(new Action0() {
+
+                    @Override
+                    public void call() {
+                        latch.countDown();
+                    }
+                }, 400, TimeUnit.MILLISECONDS);
             }
         });
 
+        latch.await();
         InOrder inOrder = inOrder(first, second, third, fourth);
 
         inOrder.verify(first, times(1)).call();
         inOrder.verify(fourth, times(1)).call();
         inOrder.verify(third, times(1)).call();
         inOrder.verify(second, times(1)).call();
+    }
+
+    @Test
+    public final void testRecursiveExecutionWithAction0() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
+        final AtomicInteger i = new AtomicInteger();
+        final CountDownLatch latch = new CountDownLatch(1);
+        scheduler.schedule(new Action1<Action0>() {
+
+            @Override
+            public void call(Action0 self) {
+                if (i.incrementAndGet() < 100) {
+                    self.call();
+                } else {
+                    latch.countDown();
+                }
+            }
+        });
+
+        latch.await();
+        assertEquals(100, i.get());
+    }
+
+    @Test
+    public final void testRecursiveExecutionWithFunc2() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
+        final AtomicInteger i = new AtomicInteger();
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        scheduler.schedule(0, new Func2<Scheduler, Integer, Subscription>() {
+
+            @Override
+            public Subscription call(Scheduler innerScheduler, Integer state) {
+                i.set(state);
+                if (state < 100) {
+                    return innerScheduler.schedule(state + 1, this);
+                } else {
+                    latch.countDown();
+                    return Subscriptions.empty();
+                }
+            }
+
+        });
+
+        latch.await();
+        assertEquals(100, i.get());
+    }
+
+    @Test
+    public final void testRecursiveExecutionWithFunc2AndDelayTime() throws InterruptedException {
+        final Scheduler scheduler = getScheduler();
+        final AtomicInteger i = new AtomicInteger();
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        scheduler.schedule(0, new Func2<Scheduler, Integer, Subscription>() {
+
+            @Override
+            public Subscription call(Scheduler innerScheduler, Integer state) {
+                i.set(state);
+                if (state < 100) {
+                    return innerScheduler.schedule(state + 1, this, 5, TimeUnit.MILLISECONDS);
+                } else {
+                    latch.countDown();
+                    return Subscriptions.empty();
+                }
+            }
+
+        }, 50, TimeUnit.MILLISECONDS);
 
+        latch.await();
+        assertEquals(100, i.get());
     }
 
 }
diff --git a/rxjava-core/src/test/java/rx/schedulers/ImmediateSchedulerTest.java b/rxjava-core/src/test/java/rx/schedulers/ImmediateSchedulerTest.java
index ff3e6c138b..a00878de10 100644
--- a/rxjava-core/src/test/java/rx/schedulers/ImmediateSchedulerTest.java
+++ b/rxjava-core/src/test/java/rx/schedulers/ImmediateSchedulerTest.java
@@ -15,6 +15,8 @@
  */
 package rx.schedulers;
 
+import org.junit.Test;
+
 import rx.Scheduler;
 
 public class ImmediateSchedulerTest extends AbstractSchedulerTests {
@@ -24,4 +26,25 @@ protected Scheduler getScheduler() {
         return ImmediateScheduler.getInstance();
     }
 
+    @Override
+    @Test
+    public final void testNestedActions() {
+        // ordering of nested actions will not match other schedulers
+        // because there is no reordering or concurrency with ImmediateScheduler
+    }
+
+    @Override
+    @Test
+    public final void testSequenceOfDelayedActions() {
+        // ordering of nested actions will not match other schedulers
+        // because there is no reordering or concurrency with ImmediateScheduler
+    }
+
+    @Override
+    @Test
+    public final void testMixOfDelayedAndNonDelayedActions() {
+        // ordering of nested actions will not match other schedulers
+        // because there is no reordering or concurrency with ImmediateScheduler
+    }
+
 }
diff --git a/rxjava-core/src/test/java/rx/schedulers/TestRecursionMemoryUsage.java b/rxjava-core/src/test/java/rx/schedulers/TestRecursionMemoryUsage.java
index 294193b167..80c36e9bd3 100644
--- a/rxjava-core/src/test/java/rx/schedulers/TestRecursionMemoryUsage.java
+++ b/rxjava-core/src/test/java/rx/schedulers/TestRecursionMemoryUsage.java
@@ -20,8 +20,8 @@ public static void main(String args[]) {
         usingFunc2(Schedulers.newThread());
         usingAction0(Schedulers.newThread());
 
-//        usingFunc2(Schedulers.currentThread());
-//        usingAction0(Schedulers.currentThread());
+        usingFunc2(Schedulers.currentThread());
+        usingAction0(Schedulers.currentThread());
 
         usingFunc2(Schedulers.threadPoolForComputation());
         usingAction0(Schedulers.threadPoolForComputation());"
ca801cceaa0d38103754d1c3e31505216baa89de,Valadoc,"libvaladoc: Add context check for @throws
",a,https://github.com/GNOME/vala/,"diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index 986e797c9b..4136624750 100644
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -37,13 +37,25 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
 	}
 
 	public override void check (Api.Tree api_root, Api.Node container, string file_path, ErrorReporter reporter, Settings settings) {
+		// context check:
+		if (container is Api.Method == false && container is Api.Delegate == false) {
+			reporter.simple_warning (""@throws used outside method/delegate context"");
+			base.check (api_root, container, file_path, reporter, settings);
+			return ;
+		}
+
+
+		// type check:
 		error_domain = api_root.search_symbol_str (container, error_domain_name);
 		if (error_domain == null) {
 			// TODO use ContentElement's source reference
-			reporter.simple_error (""%s does not exist"", error_domain_name);
+			reporter.simple_error (""%s: %s does not exist"", container.get_full_name (), error_domain_name);
+			base.check (api_root, container, file_path, reporter, settings);
+			return ;
 		}
 
 
+		// Check if the method is allowed to throw the given type:
 		Gee.List<Api.Node> exceptions = container.get_children_by_types ({Api.NodeType.ERROR_DOMAIN, Api.NodeType.CLASS}, false);
 		bool report_warning = true;
 		foreach (Api.Node exception in exceptions) {
@@ -53,10 +65,9 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
 			}
 		}
 		if (report_warning) {
-			reporter.simple_warning (""%s does not exist in exception list"", error_domain_name);			
+			reporter.simple_warning (""%s: @throws: %s does not exist in exception list"", container.get_full_name (), error_domain_name);			
 		}
 
-
 		base.check (api_root, container, file_path, reporter, settings);
 	}"
4f0dca67c29eda2ef5894a7e39b8f340fb423889,orientdb,Fix by Andrey to get working test cases even on- Linux (Windows seems to eat anything)--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/test/java/com/orientechnologies/orient/core/index/OPropertyIndexDefinitionTest.java b/core/src/test/java/com/orientechnologies/orient/core/index/OPropertyIndexDefinitionTest.java
index d31579a4cc6..aeec76304bc 100644
--- a/core/src/test/java/com/orientechnologies/orient/core/index/OPropertyIndexDefinitionTest.java
+++ b/core/src/test/java/com/orientechnologies/orient/core/index/OPropertyIndexDefinitionTest.java
@@ -89,7 +89,7 @@ public void testEmptyIndexReload() {
         propertyIndex = new OPropertyIndexDefinition(""tesClass"", ""fOne"", OType.INTEGER);
 
         final ODocument docToStore = propertyIndex.toStream();
-        docToStore.save();
+        database.save(docToStore);
 
         final ODocument docToLoad = database.load(docToStore.getIdentity());"
32b5ef9df68ad121ed7bb3f790a36b074d103117,Delta Spike,"DELTASPIKE-289 controllable WindowContext
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java
index b08ede1e8..fbd585cdb 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/scope/window/WindowContext.java
@@ -58,7 +58,7 @@ public interface WindowContext
 
     /**
      * Close all WindowContexts which are managed by the WindowContextManager.
-     * This is necessary when the session gets closed down.
+     * This is necessary when the session gets closed down or the application closes.
      * @return
      */
     void destroy();
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java
index 9f03783b2..ad8186e04 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java
@@ -20,19 +20,44 @@
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+
+import org.apache.deltaspike.core.api.provider.BeanProvider;
 
 /**
  * Handle all DeltaSpike WindowContext and ConversationContext
  * related features.
  */
-public class DeltaSpikeContextExtension
+public class DeltaSpikeContextExtension implements Extension
 {
-    private DefaultWindowContext windowContext;
+    private WindowContextImpl windowContext;
 
     public void registerDeltaSpikeContexts(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager)
     {
-        windowContext = new DefaultWindowContext(beanManager);
+        windowContext = new WindowContextImpl(beanManager);
         afterBeanDiscovery.addContext(windowContext);
     }
+
+    /**
+     * We can only initialize our contexts in AfterDeploymentValidation because
+     * getBeans must not be invoked earlier than this phase to reduce randomness
+     * caused by Beans no being fully registered yet.
+     */
+    public void initializeDeltaSpikeContexts(@Observes AfterDeploymentValidation adv, BeanManager beanManager)
+    {
+        WindowBeanHolder windowBeanHolder
+            = BeanProvider.getContextualReference(beanManager, WindowBeanHolder.class, false);
+
+        WindowIdHolder windowIdHolder
+            = BeanProvider.getContextualReference(beanManager, WindowIdHolder.class, false);
+
+        windowContext.initWindowContext(windowBeanHolder, windowIdHolder);
+    }
+
+    public WindowContextImpl getWindowContext()
+    {
+        return windowContext;
+    }
 }
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
similarity index 90%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
rename to deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
index 1d63b2bc2..f20d02fe1 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
@@ -19,8 +19,8 @@
 package org.apache.deltaspike.core.impl.scope.window;
 
 import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.inject.Typed;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -34,23 +34,21 @@
 /**
  * Context to handle &#064;{@link WindowScoped} beans.
  */
-public class DefaultWindowContext extends AbstractContext implements WindowContext
+@Typed()
+public class WindowContextImpl extends AbstractContext implements WindowContext
 {
     /**
      * all the {@link WindowContext}s which are active in this very Session.
      */
     private Map<String, WindowContext> windowContexts = new ConcurrentHashMap<String, WindowContext>();
 
-    @Inject
     private WindowIdHolder windowIdHolder;
-
-    @Inject
     private WindowBeanHolder windowBeanHolder;
 
     private BeanManager beanManager;
 
 
-    public DefaultWindowContext(BeanManager beanManager)
+    public WindowContextImpl(BeanManager beanManager)
     {
         super(beanManager);
 
@@ -128,4 +126,10 @@ public boolean isActive()
         String windowId = getCurrentWindowId();
         return windowId != null;
     }
+
+    void initWindowContext(WindowBeanHolder windowBeanHolder, WindowIdHolder windowIdHolder)
+    {
+        this.windowBeanHolder = windowBeanHolder;
+        this.windowIdHolder = windowIdHolder;
+    }
 }
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java
new file mode 100644
index 000000000..54ca5cbc7
--- /dev/null
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.scope.window;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+
+/**
+ * This producer provides access to the internally created
+ * {@link WindowContext} implementation.
+ * It simply wraps through to the instance used in the
+ * {@link DeltaSpikeContextExtension}.
+ */
+@ApplicationScoped
+public class WindowContextProducer
+{
+    @Inject
+    private DeltaSpikeContextExtension deltaSpikeContextExtension;
+
+    @Produces
+    @Dependent
+    public WindowContext getWindowContext()
+    {
+        return deltaSpikeContextExtension.getWindowContext();
+    }
+}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
index f318c1b62..519d77e89 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
@@ -21,7 +21,11 @@
 import javax.enterprise.context.RequestScoped;
 
 /**
- * Simple class which just provides a @RequestScoped windowId.
+ * Simple class which just provides a &#064;RequestScoped windowId.
+ * This assures that there is maximum one single windowId associated
+ * with a single Thread or Request. We use &#064;RequestScoped because
+ * this also works in async-supported Servlets without having to
+ * take care about moving info between ThreadLocals.
  */
 @RequestScoped
 public class WindowIdHolder
diff --git a/deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index b58a69f74..666a6b65c 100644
--- a/deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -22,3 +22,4 @@ org.apache.deltaspike.core.impl.message.MessageBundleExtension
 org.apache.deltaspike.core.impl.exception.control.extension.ExceptionControlExtension
 org.apache.deltaspike.core.impl.config.ConfigurationExtension
 org.apache.deltaspike.core.impl.jmx.MBeanExtension
+org.apache.deltaspike.core.impl.scope.window.DeltaSpikeContextExtension
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
new file mode 100644
index 000000000..68408fda5
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.core.impl.scope.window;
+
+import javax.inject.Inject;
+
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.Assert;
+
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class DefaultWindowContextTest
+{
+    @Deployment
+    public static WebArchive deploy()
+    {
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, ""defaultWindowContextTest.jar"")
+                .addPackage(DefaultWindowContextTest.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, ""beans.xml"");
+
+        return ShrinkWrap.create(WebArchive.class, ""defaultWindowContextTest.war"")
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
+                .addAsLibraries(testJar)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ""beans.xml"");
+    }
+
+
+    @Inject
+    private WindowContext windowContext;
+
+    @Inject
+    private SomeWindowScopedBean someWindowScopedBean;
+
+    /**
+     * Tests {@link org.apache.deltaspike.core.impl.util.JndiUtils#lookup(String, Class)} by looking up the {@link javax.enterprise.inject.spi.BeanManager}
+     */
+    @Test
+    public void testWindowScoedBean()
+    {
+        Assert.assertNotNull(windowContext);
+        Assert.assertNotNull(someWindowScopedBean);
+
+        {
+            windowContext.activateWindowContext(""window1"");
+            someWindowScopedBean.setValue(""Hans"");
+            Assert.assertEquals(""Hans"", someWindowScopedBean.getValue());
+        }
+
+        // now we switch it away to another 'window'
+        {
+            windowContext.activateWindowContext(""window2"");
+            Assert.assertNull(someWindowScopedBean.getValue());
+            someWindowScopedBean.setValue(""Karl"");
+            Assert.assertEquals(""Karl"", someWindowScopedBean.getValue());
+        }
+
+        // and now back to the first window
+        {
+            windowContext.activateWindowContext(""window1"");
+
+            // which must still contain the old value
+            Assert.assertEquals(""Hans"", someWindowScopedBean.getValue());
+        }
+
+        // and again back to the second window
+        {
+            windowContext.activateWindowContext(""window2"");
+
+            // which must still contain the old value of the 2nd window
+            Assert.assertEquals(""Karl"", someWindowScopedBean.getValue());
+        }
+
+    }
+
+}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/SomeWindowScopedBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/SomeWindowScopedBean.java
new file mode 100644
index 000000000..368f62cf2
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/SomeWindowScopedBean.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.core.impl.scope.window;
+
+import java.io.Serializable;
+
+import org.apache.deltaspike.core.api.scope.WindowScoped;
+
+/**
+ * example bean for &#064;WindowScoped
+ */
+@WindowScoped
+public class SomeWindowScopedBean implements Serializable
+{
+    private String value;
+
+    public String getValue()
+    {
+        return value;
+    }
+
+    public void setValue(String value)
+    {
+        this.value = value;
+    }
+}"
46ccb06f43fa17fd6e60aea15747f34f70516107,restlet-framework-java," - Renamed the ""org.restlet.ssl.hostnameVerifier""- attribute into just ""hostnameVerifier"" for consistency with existing naming.--",p,https://github.com/restlet/restlet-framework-java,"diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
index 58afd0717c..79a5dfc320 100644
--- a/build/tmpl/text/changes.txt
+++ b/build/tmpl/text/changes.txt
@@ -89,9 +89,9 @@ Changes log
           Sponsored by NetDev Ltd (http://www.netdev.co.uk).
         - The Apache HTTP Client extension can now have a retry handler
           parameter set. Suggested by Sanjay Acharya.
-        - Added a ""sslContextFactory"" parameter to HTTPS connector to 
-          improve the flexibility of SSL configuration. If this 
-          parameter isn't set, the previous parameters are used 
+        - Added a ""sslContextFactory"" parameter and attribute to HTTPS 
+          connectors to improve the flexibility of SSL configuration. If
+          this parameter isn't set, the previous parameters are used 
           instead. Contributed by Bruno Harbulot.
         - Exceptions occuring while writing the response entities are 
           now reported as severe errors instead of just info messages.
@@ -103,7 +103,9 @@ Changes log
         - Added a port of Restlet to GWT. This is a subset of the 
           Restlet API and Engine, mostly the client side working on top
           of GWT 1.5 RC1.
-        - Slightly refactored and documented OAuth extension. 
+        - Slightly refactored and documented OAuth extension.
+        - Renamed the ""org.restlet.ssl.hostnameVerifier"" attribute into
+          just ""hostnameVerifier"" for consistency with existing naming. 
     - Misc
         - Refactored WAR client to remove remaining class in NRE core.
 
diff --git a/modules/com.noelios.restlet.ext.net/src/com/noelios/restlet/ext/net/HttpClientHelper.java b/modules/com.noelios.restlet.ext.net/src/com/noelios/restlet/ext/net/HttpClientHelper.java
index 4e79910eb7..7fe2d71913 100644
--- a/modules/com.noelios.restlet.ext.net/src/com/noelios/restlet/ext/net/HttpClientHelper.java
+++ b/modules/com.noelios.restlet.ext.net/src/com/noelios/restlet/ext/net/HttpClientHelper.java
@@ -161,13 +161,13 @@ public int getConnectTimeout() {
 
     /**
      * Returns the hostname verifier by looking up the
-     * ""org.restlet.ssl.hostnameVerifier"" attribute of the client's context.
+     * ""hostnameVerifier"" attribute of the client's context.
      * 
      * @return The hostname verifier or null.
      */
     public HostnameVerifier getHostnameVerifier() {
         return (HostnameVerifier) getAttributes().get(
-                ""org.restlet.ssl.hostnameVerifier"");
+                ""hostnameVerifier"");
     }
 
     /**
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/util/ExceptionHandler.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/util/ExceptionHandler.java
index 4a02c71dab..cd139ec056 100644
--- a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/util/ExceptionHandler.java
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/util/ExceptionHandler.java
@@ -211,7 +211,7 @@ public RequestHandledException missingAnnotation(
      * @return staticly to throw, if needed by compiler.
      */
     public WebApplicationException noMessageBodyWriter(Class<?> entityClass,
-            Type genericType, @SuppressWarnings(""unused"") Annotation[] annotations) {
+            Type genericType, Annotation[] annotations) {
         this.logger.warning(""No message body writer found for class ""
                 + entityClass + "", genericType "" + genericType);
         // LATER log also annotations
diff --git a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/ResourceClass.java b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/ResourceClass.java
index 60fe5d36c5..8450f5af99 100644
--- a/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/ResourceClass.java
+++ b/modules/org.restlet.ext.jaxrs_0.9/src/org/restlet/ext/jaxrs/internal/wrappers/ResourceClass.java
@@ -144,7 +144,7 @@ public class ResourceClass extends AbstractJaxRsWrapper {
     protected ResourceClass(Class<?> jaxRsClass,
             ThreadLocalizedContext tlContext, JaxRsProviders jaxRsProviders,
             ExtensionBackwardMapping extensionBackwardMapping,
-            Logger logger, @SuppressWarnings(""unused"") Logger sameLogger) throws IllegalArgumentException,
+            Logger logger, Logger sameLogger) throws IllegalArgumentException,
             IllegalPathOnClassException, MissingAnnotationException {
         super(PathRegExp.createForClass(jaxRsClass));
         this.leaveEncoded = jaxRsClass.isAnnotationPresent(Encoded.class);"
c132766c3a12ae98d3892c2470da7336cd5a35cf,tapiji,"Remove remaining dependency to pdeutils from the RCP translators product definition
",a,https://github.com/tapiji/tapiji,"diff --git a/org.eclipselabs.tapiji.translator.swt.product/org.eclipselabs.tapiji.translator.swt.product.product b/org.eclipselabs.tapiji.translator.swt.product/org.eclipselabs.tapiji.translator.swt.product.product
index c23d3e83..642b63f4 100644
--- a/org.eclipselabs.tapiji.translator.swt.product/org.eclipselabs.tapiji.translator.swt.product.product
+++ b/org.eclipselabs.tapiji.translator.swt.product/org.eclipselabs.tapiji.translator.swt.product.product
@@ -239,7 +239,6 @@ litigation.
       <plugin id=""com.ibm.icu""/>
       <plugin id=""org.eclipse.ant.core""/>
       <plugin id=""org.eclipse.babel.core""/>
-      <plugin id=""org.eclipse.babel.core.pdeutils"" fragment=""true""/>
       <plugin id=""org.eclipse.babel.editor""/>
       <plugin id=""org.eclipse.babel.editor.nls"" fragment=""true""/>
       <plugin id=""org.eclipse.babel.editor.swt"" fragment=""true""/>"
1257196d255cf3697ab869a86eb6f84034232f78,orientdb,Fixed problem of ConcurrentModificationException- reported by Bayoda: the problem should be due to a wrong isolation on Map in- cache: used exclusive lock even for keys() and get().--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/cache/ODefaultCache.java b/core/src/main/java/com/orientechnologies/orient/core/cache/ODefaultCache.java
index 21d3ea1a889..ee0286cde1b 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/cache/ODefaultCache.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/cache/ODefaultCache.java
@@ -80,11 +80,11 @@ public ORecordInternal<?> get(final ORID id) {
     if (!isEnabled())
       return null;
 
-    lock.acquireSharedLock();
+    lock.acquireExclusiveLock();
     try {
       return cache.get(id);
     } finally {
-      lock.releaseSharedLock();
+      lock.releaseExclusiveLock();
     }
   }
 
@@ -138,11 +138,11 @@ public int limit() {
   }
 
   public Collection<ORID> keys() {
-    lock.acquireSharedLock();
+    lock.acquireExclusiveLock();
     try {
       return new ArrayList<ORID>(cache.keySet());
     } finally {
-      lock.releaseSharedLock();
+      lock.releaseExclusiveLock();
     }
   }"
48694d0bba7f6756c0b2396ca32d6aee1bfad2e4,Delta Spike,"DELTASPIKE-277 improve graphene setup
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
new file mode 100644
index 000000000..ed1849c30
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
@@ -0,0 +1,90 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.deltaspike.test.jsf.impl.message;
+
+
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.scope.view.beans.BackingBean;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+
+/**
+ * Test for the DeltaSpike ViewScoped context
+ */
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class JsfMessageTest
+{
+    @Drone
+    private WebDriver driver;
+
+    @ArquillianResource
+    private URL contextPath;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        return ShrinkWrap
+                .create(WebArchive.class, ""jsfMessageTest.war"")
+                .addPackage(BackingBean.class.getPackage())
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+                .addAsWebInfResource(""default/WEB-INF/web.xml"", ""web.xml"")
+                .addAsWebResource(""jsfMessageTest/page.xhtml"", ""page.xhtml"")
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ""beans.xml"");
+    }
+
+
+    @Test
+    @RunAsClient
+    public void testViewScopedContext() throws Exception
+    {
+        driver.get(new URL(contextPath, ""page.xhtml"").toString());
+
+/*X
+        WebElement inputField = driver.findElement(By.id(""test:valueInput""));
+        inputField.sendKeys(""23"");
+
+        WebElement button = driver.findElement(By.id(""test:saveButton""));
+        button.click();
+
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""test:valueOutput""), ""23"").apply(driver));
+*/
+    }
+
+}
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/web.xml b/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/web.xml
index 5e874fd8f..9d0668bdf 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/web.xml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/default/WEB-INF/web.xml
@@ -22,6 +22,12 @@
          xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""
          xsi:schemaLocation=""http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd""
          version=""2.5"">
+
+    <!--
+     * This is a simple web.xml for JSF applications.
+     * It just registers the FacesServlet and defines
+     * a mapping for xhtml files.
+    -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/jsfMessageTest/page.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/jsfMessageTest/page.xhtml
new file mode 100644
index 000000000..0174237ac
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/resources/jsfMessageTest/page.xhtml
@@ -0,0 +1,39 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    ""License""); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!DOCTYPE html PUBLIC ""-//W3C//DTD XHTML 1.0 Strict//EN"" ""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"">
+<html xmlns=""http://www.w3.org/1999/xhtml""
+      xmlns:h=""http://java.sun.com/jsf/html""
+        >
+
+<body>
+<div>
+    <h:form id=""test"">
+        <h:outputLabel for=""valueInput"" value=""ViewScoped value:""/>
+        <h:inputText id=""valueInput"" value=""#{viewScopedBean.i}""/>
+        <br/>
+        <h:outputLabel for=""valueOutput"" value=""backing bean value:""/>
+        <h:outputText id=""valueOutput"" value=""#{viewScopedBean.i}""/>
+        <br/>
+        <h:commandButton id=""saveButton"" action=""#{viewScopedBean.someAction}"" value=""save""/>
+    </h:form>
+</div>
+</body>
+</html>
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/viewScopedContextTest/page.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/viewScopedContextTest/page.xhtml
index ead52307f..627404016 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/viewScopedContextTest/page.xhtml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/viewScopedContextTest/page.xhtml
@@ -26,9 +26,6 @@
       xmlns:c=""http://java.sun.com/jsp/jstl/core"">
 
 <body>
-<div>
-    it works!
-</div>
 <div>
     <h:form id=""test"">
         <h:outputLabel for=""valueInput"" value=""ViewScoped value:""/>"
9102b09aeca480dad12bf2edb56266b2d20ccbfb,Vala,"gtk+-2.0: Gtk.MessageDialog:buttons does not have an accessor method

Fixes bug 607992.
",c,https://github.com/GNOME/vala/,"diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 3986db90c4..0884db8ef7 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -2481,6 +2481,7 @@ namespace Gtk {
 		public void set_markup (string str);
 		[CCode (type = ""GtkWidget*"", has_construct_function = false)]
 		public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
+		[NoAccessorMethod]
 		public Gtk.ButtonsType buttons { construct; }
 		public Gtk.Widget image { get; set; }
 		[NoAccessorMethod]
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 951ecea383..ef90e74969 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -248,6 +248,7 @@ GtkMenuShell::deactivate has_emitter=""1""
 gtk_menu_shell_append.child type_name=""MenuItem"" ctype=""GtkWidget*""
 gtk_menu_tool_button_new.icon_widget nullable=""1""
 gtk_menu_tool_button_new.label nullable=""1""
+GtkMessageDialog:buttons accessor_method=""0""
 gtk_message_dialog_new ellipsis=""1"" printf_format=""1""
 gtk_message_dialog_new.parent nullable=""1""
 gtk_message_dialog_new_with_markup ellipsis=""1"""
7db30f8428ef341cc39b2758d3bd6dcccc25b080,hadoop,MAPREDUCE-3345. Fixed a race condition in- ResourceManager that was causing TestContainerManagerSecurity to fail- sometimes. Contributed by Hitesh Shah. svn merge -c r1199144- --ignore-ancestry ../../trunk/--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199145 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 43cb6b7dd248c..e1034c880ef65 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -39,6 +39,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3342. Fixed JobHistoryServer to also show the job's queue
     name. (Jonathan Eagles via vinodkv)
 
+    MAPREDUCE-3345. Fixed a race condition in ResourceManager that was causing
+    TestContainerManagerSecurity to fail sometimes. (Hitesh Shah via vinodkv)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
index 0d81f80121213..71dd982b607af 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
@@ -595,8 +595,13 @@ public void transition(RMAppAttemptImpl appAttempt,
           AM_CONTAINER_PRIORITY, ""*"", appAttempt.submissionContext
               .getAMContainerSpec().getResource(), 1);
 
-      appAttempt.scheduler.allocate(appAttempt.applicationAttemptId,
-          Collections.singletonList(request), EMPTY_CONTAINER_RELEASE_LIST);
+      Allocation amContainerAllocation = 
+          appAttempt.scheduler.allocate(appAttempt.applicationAttemptId,
+              Collections.singletonList(request), EMPTY_CONTAINER_RELEASE_LIST);
+      if (amContainerAllocation != null
+          && amContainerAllocation.getContainers() != null) {
+        assert(amContainerAllocation.getContainers().size() == 0);
+      }
     }
   }
 
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java
index c61c7ab89f0ec..977150520a195 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java
@@ -236,28 +236,30 @@ public Allocation allocate(
           RMContainerEventType.RELEASED);
     }
 
-    if (!ask.isEmpty()) {
-      LOG.debug(""allocate: pre-update"" +
-          "" applicationId="" + applicationAttemptId + 
-          "" application="" + application);
-      application.showRequests();
-
-      // Update application requests
-      application.updateResourceRequests(ask);
-
-      LOG.debug(""allocate: post-update"" +
-          "" applicationId="" + applicationAttemptId + 
-          "" application="" + application);
-      application.showRequests();
+    synchronized (application) {
+      if (!ask.isEmpty()) {
+        LOG.debug(""allocate: pre-update"" +
+            "" applicationId="" + applicationAttemptId + 
+            "" application="" + application);
+        application.showRequests();
+
+        // Update application requests
+        application.updateResourceRequests(ask);
+
+        LOG.debug(""allocate: post-update"" +
+            "" applicationId="" + applicationAttemptId + 
+            "" application="" + application);
+        application.showRequests();
+
+        LOG.debug(""allocate:"" +
+            "" applicationId="" + applicationAttemptId + 
+            "" #ask="" + ask.size());
+      }
 
-      LOG.debug(""allocate:"" +
-          "" applicationId="" + applicationAttemptId + 
-          "" #ask="" + ask.size());
+      return new Allocation(
+          application.pullNewlyAllocatedContainers(), 
+          application.getHeadroom());
     }
-
-    return new Allocation(
-        application.pullNewlyAllocatedContainers(), 
-        application.getHeadroom());
   }
 
   private SchedulerApp getApplication("
9b07112e30871a4a4f8253c8418e93417dcdad97,drools,JBRULES-1906: NPE when LiteralRestriction value is- set to null--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@24509 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-verifier/src/main/java/org/drools/verifier/components/Field.java b/drools-verifier/src/main/java/org/drools/verifier/components/Field.java
index 4e4b6463cc8..453f1b59d12 100644
--- a/drools-verifier/src/main/java/org/drools/verifier/components/Field.java
+++ b/drools-verifier/src/main/java/org/drools/verifier/components/Field.java
@@ -18,6 +18,7 @@ public static class FieldType {
 		public static final FieldType VARIABLE = new FieldType(""Variable"");
 		public static final FieldType OBJECT = new FieldType(""Object"");
 		public static final FieldType ENUM = new FieldType(""Enum"");
+		public static final FieldType UNKNOWN = new FieldType(""Unknown"");
 
 		private final String string;
 
diff --git a/drools-verifier/src/main/java/org/drools/verifier/components/LiteralRestriction.java b/drools-verifier/src/main/java/org/drools/verifier/components/LiteralRestriction.java
index 73133feb2db..756d31dac0d 100644
--- a/drools-verifier/src/main/java/org/drools/verifier/components/LiteralRestriction.java
+++ b/drools-verifier/src/main/java/org/drools/verifier/components/LiteralRestriction.java
@@ -8,7 +8,7 @@
 import org.drools.verifier.report.components.Cause;
 
 /**
- *
+ * 
  * @author Toni Rikkola
  */
 public class LiteralRestriction extends Restriction implements Cause {
@@ -31,7 +31,7 @@ public RestrictionType getRestrictionType() {
 
 	/**
 	 * Compares two LiteralRestrictions by value.
-	 *
+	 * 
 	 * @param restriction
 	 *            Restriction that this object is compared to.
 	 * @return a negative integer, zero, or a positive integer as this object is
@@ -68,6 +68,8 @@ public int compareValues(LiteralRestriction restriction)
 			}
 		} else if (valueType == Field.FieldType.STRING) {
 			return stringValue.compareTo(restriction.getValueAsString());
+		} else if (valueType == Field.FieldType.UNKNOWN) {
+			return 0;
 		}
 
 		throw new DataFormatException(""Value types did not match. Value type ""
@@ -109,6 +111,15 @@ public Date getDateValue() {
 
 	public void setValue(String value) {
 
+		if (value == null) {
+			stringValue = null;
+			valueType = Field.FieldType.UNKNOWN;
+			return;
+		}
+
+		stringValue = value;
+		valueType = Field.FieldType.STRING;
+
 		if (""true"".equals(value) || ""false"".equals(value)) {
 			booleanValue = value.equals(""true"");
 			valueType = Field.FieldType.BOOLEAN;
@@ -147,11 +158,9 @@ public void setValue(String value) {
 			// Not a date.
 		}
 
-		stringValue = value;
-		valueType = Field.FieldType.STRING;
 	}
 
-	public boolean isBooleanValue() {
+	public boolean getBooleanValue() {
 		return booleanValue;
 	}
 
diff --git a/drools-verifier/src/test/java/org/drools/verifier/components/LiteralRestrictionTest.java b/drools-verifier/src/test/java/org/drools/verifier/components/LiteralRestrictionTest.java
new file mode 100644
index 00000000000..668e9bed5c7
--- /dev/null
+++ b/drools-verifier/src/test/java/org/drools/verifier/components/LiteralRestrictionTest.java
@@ -0,0 +1,44 @@
+package org.drools.verifier.components;
+
+import junit.framework.TestCase;
+
+public class LiteralRestrictionTest extends TestCase {
+
+	public void testSetValue() {
+		LiteralRestriction booleanRestriction = new LiteralRestriction();
+		booleanRestriction.setValue(""true"");
+
+		assertEquals(Field.FieldType.BOOLEAN, booleanRestriction.getValueType());
+		assertEquals(true, booleanRestriction.getBooleanValue());
+
+		LiteralRestriction intRestriction = new LiteralRestriction();
+		intRestriction.setValue(""1"");
+
+		assertEquals(Field.FieldType.INT, intRestriction.getValueType());
+		assertEquals(1, intRestriction.getIntValue());
+
+		LiteralRestriction doubleRestriction = new LiteralRestriction();
+		doubleRestriction.setValue(""1.0"");
+
+		assertEquals(Field.FieldType.DOUBLE, doubleRestriction.getValueType());
+		assertEquals(1.0, doubleRestriction.getDoubleValue());
+
+		LiteralRestriction dateRestriction = new LiteralRestriction();
+		dateRestriction.setValue(""11-jan-2008"");
+
+		assertEquals(Field.FieldType.DATE, dateRestriction.getValueType());
+
+		LiteralRestriction stringRestriction = new LiteralRestriction();
+		stringRestriction.setValue(""test test"");
+
+		assertEquals(Field.FieldType.STRING, stringRestriction.getValueType());
+		assertEquals(""test test"", stringRestriction.getValueAsString());
+
+		LiteralRestriction nullRestriction = new LiteralRestriction();
+		nullRestriction.setValue(null);
+
+		assertEquals(Field.FieldType.UNKNOWN, nullRestriction.getValueType());
+		assertEquals(null, nullRestriction.getValueAsString());
+		assertEquals(null, nullRestriction.getValueAsObject());
+	}
+}"
bb33f4f482c3914efb4b2498ec2d34f79beff145,tapiji,"Removes icon folder from the tool's core plugin.

Since all UI specific concerns are part of the *.ui plug-ins, the icon folder within the tool's core plug-in does not fit the coding conventions and must be removed.
(cherry picked from commit 10f451944f14261f2d425dd085705e2db00df76b)
",p,https://github.com/tapiji/tapiji,"diff --git a/org.eclipse.babel.tapiji.tools.core/build.properties b/org.eclipse.babel.tapiji.tools.core/build.properties
index e8dfe316..58be59e2 100644
--- a/org.eclipse.babel.tapiji.tools.core/build.properties
+++ b/org.eclipse.babel.tapiji.tools.core/build.properties
@@ -2,33 +2,15 @@ source.. = src/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               icons/,\
                schema/,\
                about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               TapiJI.png,\
-               Splash.bmp,\
-               TapiJI.gif,\
                epl-v10.html,\
                bin/,\
                src/,\
                resourcebundle.jar
-bin.excludes = icons/original/,\
-               icons/photoshop/
-src.excludes = icons/original/,\
-               icons/photoshop/
 src.includes = src/,\
                schema/,\
-               icons/,\
                about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               TapiJI.png,\
-               Splash.bmp,\
-               TapiJI.gif,\
                epl-v10.html
 jars.compile.order = .,\
                      resourcebundle.jar
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/Folder.png b/org.eclipse.babel.tapiji.tools.core/icons/Folder.png
deleted file mode 100644
index a699bfc6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/Folder.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/Glossary.psd b/org.eclipse.babel.tapiji.tools.core/icons/Glossary.psd
deleted file mode 100644
index 9da95ac3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/Glossary.psd and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/NewGlossary.png b/org.eclipse.babel.tapiji.tools.core/icons/NewGlossary.png
deleted file mode 100644
index ac91bf14..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/NewGlossary.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary.png b/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary.png
deleted file mode 100644
index 85917f41..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary2.png b/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary2.png
deleted file mode 100644
index e02b952f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary2.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary3.png b/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary3.png
deleted file mode 100644
index e8a0b0a4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary3.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary4.png b/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary4.png
deleted file mode 100644
index 7a2ddc74..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary4.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary5.png b/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary5.png
deleted file mode 100644
index 020c1adf..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/OpenGlossary5.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/Resource16.png b/org.eclipse.babel.tapiji.tools.core/icons/Resource16.png
deleted file mode 100644
index 1b0966cb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/Resource16.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/Resource16_small.png b/org.eclipse.babel.tapiji.tools.core/icons/Resource16_small.png
deleted file mode 100644
index da9f603a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/Resource16_small.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/Resource16_warning_small.png b/org.eclipse.babel.tapiji.tools.core/icons/Resource16_warning_small.png
deleted file mode 100644
index ec47a9ac..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/Resource16_warning_small.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI.png b/org.eclipse.babel.tapiji.tools.core/icons/TapiJI.png
deleted file mode 100644
index e274c0cd..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_128.png b/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_128.png
deleted file mode 100644
index 98514e0e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_128.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_16.png b/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_16.png
deleted file mode 100644
index 73b82c2f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_16.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_32.png b/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_32.png
deleted file mode 100644
index 3984eba6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_32.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_48.png b/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_48.png
deleted file mode 100644
index 190a92e4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_48.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_64.png b/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_64.png
deleted file mode 100644
index 89988073..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/TapiJI_64.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/.cvsignore b/org.eclipse.babel.tapiji.tools.core/icons/countries/.cvsignore
deleted file mode 100644
index f47afba9..00000000
--- a/org.eclipse.babel.tapiji.tools.core/icons/countries/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/__.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/__.gif
deleted file mode 100644
index 65167847..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/__.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/_f.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/_f.gif
deleted file mode 100644
index a5f340d4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/_f.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ad.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ad.gif
deleted file mode 100644
index 0b240549..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ad.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ae.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ae.gif
deleted file mode 100644
index a4a82ff8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ae.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/af.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/af.gif
deleted file mode 100644
index 70e1a15b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/af.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ag.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ag.gif
deleted file mode 100644
index 2dc04e5e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ag.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/al.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/al.gif
deleted file mode 100644
index 1384f59b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/al.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/am.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/am.gif
deleted file mode 100644
index eda901ed..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/am.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ao.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ao.gif
deleted file mode 100644
index 56f02bbc..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ao.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/aq.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/aq.gif
deleted file mode 100644
index d8e99da6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/aq.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ar.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ar.gif
deleted file mode 100644
index 0231d503..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ar.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/at.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/at.gif
deleted file mode 100644
index ecf48b9b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/at.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/au.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/au.gif
deleted file mode 100644
index 77761249..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/au.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/az.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/az.gif
deleted file mode 100644
index bc77ff24..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/az.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ba.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ba.gif
deleted file mode 100644
index 8e4e5499..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ba.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bb.gif
deleted file mode 100644
index 54928a68..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bd.gif
deleted file mode 100644
index 25890b90..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/be.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/be.gif
deleted file mode 100644
index f917f396..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/be.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bf.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bf.gif
deleted file mode 100644
index 53afd44c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bf.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bg.gif
deleted file mode 100644
index 5ce1db10..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bh.gif
deleted file mode 100644
index ba39230e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bi.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bi.gif
deleted file mode 100644
index ee3d6a48..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bi.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bj.gif
deleted file mode 100644
index 55463ef0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/blank.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/blank.gif
deleted file mode 100644
index 314b8633..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/blank.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bn.gif
deleted file mode 100644
index ed11638b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bo.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bo.gif
deleted file mode 100644
index f1796980..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bo.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/br.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/br.gif
deleted file mode 100644
index e1069e08..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/br.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bs.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bs.gif
deleted file mode 100644
index 30c32c32..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bs.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bt.gif
deleted file mode 100644
index b53dddfb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bw.gif
deleted file mode 100644
index d73ad712..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/by.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/by.gif
deleted file mode 100644
index 3335ae02..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/by.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/bz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/bz.gif
deleted file mode 100644
index ec056372..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/bz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ca.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ca.gif
deleted file mode 100644
index 547011ac..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ca.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cd.gif
deleted file mode 100644
index 44fa4411..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cf.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cf.gif
deleted file mode 100644
index 41405ce0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cf.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cg.gif
deleted file mode 100644
index 00fa29c0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ch.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ch.gif
deleted file mode 100644
index b0dc176e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ch.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ci.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ci.gif
deleted file mode 100644
index b1167c0d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ci.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cl.gif
deleted file mode 100644
index 31dcb03e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cm.gif
deleted file mode 100644
index f361dbd7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cn.gif
deleted file mode 100644
index f12f17d1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/co.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/co.gif
deleted file mode 100644
index d9f14e79..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/co.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cr.gif
deleted file mode 100644
index 2a5f0b93..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cs.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cs.gif
deleted file mode 100644
index 580d26f5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cs.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cu.gif
deleted file mode 100644
index 823befcc..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cv.gif
deleted file mode 100644
index d21a45cb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cy.gif
deleted file mode 100644
index 1a332d90..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/cz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/cz.gif
deleted file mode 100644
index 2faee5e1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/cz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/dd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/dd.gif
deleted file mode 100644
index 99eda38f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/dd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/de.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/de.gif
deleted file mode 100644
index c7b28406..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/de.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/dj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/dj.gif
deleted file mode 100644
index 94fc2eb3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/dj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/dk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/dk.gif
deleted file mode 100644
index 4f01ec95..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/dk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/dm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/dm.gif
deleted file mode 100644
index b4fed906..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/dm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/do.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/do.gif
deleted file mode 100644
index 85d7be8b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/do.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/dz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/dz.gif
deleted file mode 100644
index 622ff6ba..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/dz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ec.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ec.gif
deleted file mode 100644
index 5d1641b1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ec.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ee.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ee.gif
deleted file mode 100644
index c678c73c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ee.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/eg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/eg.gif
deleted file mode 100644
index a740c668..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/eg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/eh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/eh.gif
deleted file mode 100644
index 6a75cc3c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/eh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/er.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/er.gif
deleted file mode 100644
index 71297d62..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/er.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/es.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/es.gif
deleted file mode 100644
index 6dee15c1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/es.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/et.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/et.gif
deleted file mode 100644
index 4188e4ff..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/et.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/eu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/eu.gif
deleted file mode 100644
index 45caabf2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/eu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/fi.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/fi.gif
deleted file mode 100644
index b8311cac..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/fi.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/fj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/fj.gif
deleted file mode 100644
index f5481b79..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/fj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/fm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/fm.gif
deleted file mode 100644
index 050eca09..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/fm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/fr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/fr.gif
deleted file mode 100644
index a2a2354d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/fr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ga.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ga.gif
deleted file mode 100644
index 54fb2514..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ga.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gb.gif
deleted file mode 100644
index 4ae2d0f8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gd.gif
deleted file mode 100644
index 0095032c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ge.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ge.gif
deleted file mode 100644
index f3927c8a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ge.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gh.gif
deleted file mode 100644
index 6d3b6142..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gm.gif
deleted file mode 100644
index 2ecf0b0b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gn.gif
deleted file mode 100644
index 83179352..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gq.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gq.gif
deleted file mode 100644
index 6c2bc475..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gq.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gr.gif
deleted file mode 100644
index 1599add4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gt.gif
deleted file mode 100644
index c306f25d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gw.gif
deleted file mode 100644
index 6cba5901..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/gy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/gy.gif
deleted file mode 100644
index a4b4da97..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/gy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/hk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/hk.gif
deleted file mode 100644
index 230723af..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/hk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/hn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/hn.gif
deleted file mode 100644
index 05501572..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/hn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/hr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/hr.gif
deleted file mode 100644
index 893778a1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/hr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ht.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ht.gif
deleted file mode 100644
index e5cf7803..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ht.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/hu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/hu.gif
deleted file mode 100644
index 07778839..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/hu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/id.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/id.gif
deleted file mode 100644
index 9fed7642..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/id.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ie.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ie.gif
deleted file mode 100644
index 82ec5535..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ie.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/il.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/il.gif
deleted file mode 100644
index 554a7612..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/il.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/in.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/in.gif
deleted file mode 100644
index 430b37b9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/in.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/iq.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/iq.gif
deleted file mode 100644
index dae4d593..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/iq.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ir.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ir.gif
deleted file mode 100644
index 50f5432a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ir.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/is.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/is.gif
deleted file mode 100644
index e9580e07..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/is.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/it.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/it.gif
deleted file mode 100644
index 4256b464..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/it.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/jm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/jm.gif
deleted file mode 100644
index f1459feb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/jm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/jo.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/jo.gif
deleted file mode 100644
index a9d36128..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/jo.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/jp.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/jp.gif
deleted file mode 100644
index ddad6e3b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/jp.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ke.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ke.gif
deleted file mode 100644
index 6e06f4a7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ke.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kg.gif
deleted file mode 100644
index e47fb0f2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kh.gif
deleted file mode 100644
index 31f5be16..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ki.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ki.gif
deleted file mode 100644
index 9f12bb0d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ki.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/km.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/km.gif
deleted file mode 100644
index 027276bf..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/km.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kn.gif
deleted file mode 100644
index f690875e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kp.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kp.gif
deleted file mode 100644
index 42584efa..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kp.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kr.gif
deleted file mode 100644
index 800c6cdd..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kw.gif
deleted file mode 100644
index ff083b5e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/kz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/kz.gif
deleted file mode 100644
index 9b13afe0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/kz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/la.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/la.gif
deleted file mode 100644
index 3c6f2f15..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/la.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lb.gif
deleted file mode 100644
index f3c45527..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lc.gif
deleted file mode 100644
index fdcbd97f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/li.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/li.gif
deleted file mode 100644
index eb9d9384..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/li.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lk.gif
deleted file mode 100644
index 3aa25aa8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lr.gif
deleted file mode 100644
index f54468fc..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ls.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ls.gif
deleted file mode 100644
index c1ad8d2f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ls.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lt.gif
deleted file mode 100644
index 78447f07..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lu.gif
deleted file mode 100644
index d74df5ab..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/lv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/lv.gif
deleted file mode 100644
index 5f7419c6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/lv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ly.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ly.gif
deleted file mode 100644
index 8ca9e0a0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ly.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ma.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ma.gif
deleted file mode 100644
index 3aab8cbb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ma.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mc.gif
deleted file mode 100644
index c22c1717..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/md.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/md.gif
deleted file mode 100644
index 4951b21a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/md.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mg.gif
deleted file mode 100644
index 24281d87..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mh.gif
deleted file mode 100644
index c472aee6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mk.gif
deleted file mode 100644
index 88c077fa..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ml.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ml.gif
deleted file mode 100644
index 4eb75ae1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ml.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mm.gif
deleted file mode 100644
index bd378555..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mn.gif
deleted file mode 100644
index de3029b3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mr.gif
deleted file mode 100644
index d7cbb38a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mt.gif
deleted file mode 100644
index 677969a7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mu.gif
deleted file mode 100644
index d102ab7e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mv.gif
deleted file mode 100644
index 69ac6863..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mw.gif
deleted file mode 100644
index a0f0320b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mx.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mx.gif
deleted file mode 100644
index bbcb376b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mx.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/my.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/my.gif
deleted file mode 100644
index 8874751b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/my.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/mz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/mz.gif
deleted file mode 100644
index b63af289..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/mz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/na.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/na.gif
deleted file mode 100644
index bee7072e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/na.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ne.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ne.gif
deleted file mode 100644
index fc1b74b8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ne.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ng.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ng.gif
deleted file mode 100644
index 43af12c9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ng.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ni.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ni.gif
deleted file mode 100644
index cac0042d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ni.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/nl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/nl.gif
deleted file mode 100644
index c4258e62..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/nl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/no.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/no.gif
deleted file mode 100644
index 873baca1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/no.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/np.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/np.gif
deleted file mode 100644
index f01f2f9e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/np.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/nr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/nr.gif
deleted file mode 100644
index d485c4b1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/nr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/nu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/nu.gif
deleted file mode 100644
index 73177056..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/nu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/nz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/nz.gif
deleted file mode 100644
index 49f8464e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/nz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/om.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/om.gif
deleted file mode 100644
index d90ca333..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/om.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pa.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pa.gif
deleted file mode 100644
index cae5432f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pa.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pe.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pe.gif
deleted file mode 100644
index e6cc7348..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pe.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pg.gif
deleted file mode 100644
index 108204f3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ph.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ph.gif
deleted file mode 100644
index b141cd81..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ph.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pk.gif
deleted file mode 100644
index f612b977..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pl.gif
deleted file mode 100644
index 6ff3ba6f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ps.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ps.gif
deleted file mode 100644
index 71717cc9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ps.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pt.gif
deleted file mode 100644
index 9bfc8ca4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/pw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/pw.gif
deleted file mode 100644
index 0a520911..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/pw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/py.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/py.gif
deleted file mode 100644
index b52de243..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/py.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/qa.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/qa.gif
deleted file mode 100644
index e078e46c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/qa.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ro.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ro.gif
deleted file mode 100644
index 6bdbad14..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ro.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ru.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ru.gif
deleted file mode 100644
index cf4d30c8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ru.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/rw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/rw.gif
deleted file mode 100644
index 02cf0cb1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/rw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sa.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sa.gif
deleted file mode 100644
index 4b7632ee..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sa.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sb.gif
deleted file mode 100644
index eb8acc08..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sc.gif
deleted file mode 100644
index 4324c21f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sd.gif
deleted file mode 100644
index 2d74f622..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/se.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/se.gif
deleted file mode 100644
index 9bbcb1fa..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/se.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sg.gif
deleted file mode 100644
index b81f461e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/si.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/si.gif
deleted file mode 100644
index f6afb67d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/si.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sk.gif
deleted file mode 100644
index b0c4ab19..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sl.gif
deleted file mode 100644
index 00d59d3b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sm.gif
deleted file mode 100644
index 8d9d76b3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/__.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/__.gif
deleted file mode 100644
index e077f110..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/__.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/_f.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/_f.gif
deleted file mode 100644
index 06c11464..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/_f.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ad.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ad.gif
deleted file mode 100644
index 578acbb7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ad.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ae.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ae.gif
deleted file mode 100644
index 9e6f62a1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ae.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/af.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/af.gif
deleted file mode 100644
index 9fe39759..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/af.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ag.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ag.gif
deleted file mode 100644
index dff85d5f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ag.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/al.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/al.gif
deleted file mode 100644
index 3cd0dbc6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/al.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/am.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/am.gif
deleted file mode 100644
index b5968d0e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/am.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ao.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ao.gif
deleted file mode 100644
index cf5f1bb4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ao.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/aq.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/aq.gif
deleted file mode 100644
index 8394537d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/aq.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ar.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ar.gif
deleted file mode 100644
index 7101d184..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ar.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/at.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/at.gif
deleted file mode 100644
index b302cb90..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/at.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/au.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/au.gif
deleted file mode 100644
index 1e7d95c2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/au.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/az.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/az.gif
deleted file mode 100644
index 02d9ee9b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/az.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ba.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ba.gif
deleted file mode 100644
index 1007efd2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ba.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bb.gif
deleted file mode 100644
index 29a51f96..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bd.gif
deleted file mode 100644
index e6f4dc5e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/be.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/be.gif
deleted file mode 100644
index 55ec17f4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/be.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bf.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bf.gif
deleted file mode 100644
index fc26ebbf..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bf.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bg.gif
deleted file mode 100644
index 04664c06..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bh.gif
deleted file mode 100644
index 9dc18e6b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bi.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bi.gif
deleted file mode 100644
index 6aed0376..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bi.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bj.gif
deleted file mode 100644
index c4d0f869..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/blank.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/blank.gif
deleted file mode 100644
index 93f91133..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/blank.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bn.gif
deleted file mode 100644
index e9481fe7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bo.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bo.gif
deleted file mode 100644
index f083da32..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bo.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/br.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/br.gif
deleted file mode 100644
index b44b8570..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/br.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bs.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bs.gif
deleted file mode 100644
index dd013c4a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bs.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bt.gif
deleted file mode 100644
index c12cc451..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bw.gif
deleted file mode 100644
index 0bd4935a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/by.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/by.gif
deleted file mode 100644
index 495e17a1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/by.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bz.gif
deleted file mode 100644
index ebc5a1f2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/bz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ca.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ca.gif
deleted file mode 100644
index 111f6b54..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ca.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cd.gif
deleted file mode 100644
index 48a5d4b1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cf.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cf.gif
deleted file mode 100644
index 82dfeb88..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cf.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cg.gif
deleted file mode 100644
index bc4ce41a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ch.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ch.gif
deleted file mode 100644
index c1daa8c3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ch.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ci.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ci.gif
deleted file mode 100644
index 01ce79fb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ci.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cl.gif
deleted file mode 100644
index 579c7377..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cm.gif
deleted file mode 100644
index 5093f621..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cn.gif
deleted file mode 100644
index e0644265..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/co.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/co.gif
deleted file mode 100644
index ea33538a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/co.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cr.gif
deleted file mode 100644
index 1c3175b4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cs.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cs.gif
deleted file mode 100644
index 88b65987..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cs.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cu.gif
deleted file mode 100644
index 33334341..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cv.gif
deleted file mode 100644
index 9b13e53b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cy.gif
deleted file mode 100644
index 249719a2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cz.gif
deleted file mode 100644
index 0ae066ca..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/cz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dd.gif
deleted file mode 100644
index 4a47e19e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/de.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/de.gif
deleted file mode 100644
index 6cc466d3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/de.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dj.gif
deleted file mode 100644
index e62e277d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dk.gif
deleted file mode 100644
index f3803a0b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dm.gif
deleted file mode 100644
index 69f80797..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/do.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/do.gif
deleted file mode 100644
index 4b9a2695..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/do.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dz.gif
deleted file mode 100644
index e88ec913..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/dz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ec.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ec.gif
deleted file mode 100644
index 7060478f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ec.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ee.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ee.gif
deleted file mode 100644
index 1eb10798..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ee.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eg.gif
deleted file mode 100644
index 4efa2884..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eh.gif
deleted file mode 100644
index 9acceed3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/er.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/er.gif
deleted file mode 100644
index 30550a36..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/er.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/es.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/es.gif
deleted file mode 100644
index 9d01bd4d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/es.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/et.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/et.gif
deleted file mode 100644
index 7352fcaa..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/et.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eu.gif
deleted file mode 100644
index 1eadf213..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/eu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fi.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fi.gif
deleted file mode 100644
index d61952f4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fi.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fj.gif
deleted file mode 100644
index 2bcd330f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fm.gif
deleted file mode 100644
index 7f5dbf18..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fr.gif
deleted file mode 100644
index 5b9680b6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/fr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ga.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ga.gif
deleted file mode 100644
index 10322d22..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ga.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gb.gif
deleted file mode 100644
index 03a74145..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gd.gif
deleted file mode 100644
index 69e2b79d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ge.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ge.gif
deleted file mode 100644
index daeade34..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ge.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gh.gif
deleted file mode 100644
index b1ee6cc8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gm.gif
deleted file mode 100644
index 0540321d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gn.gif
deleted file mode 100644
index 18c92115..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gq.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gq.gif
deleted file mode 100644
index 21b35aa6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gq.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gr.gif
deleted file mode 100644
index e6905195..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gt.gif
deleted file mode 100644
index 5c3d0618..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gw.gif
deleted file mode 100644
index 5d8901f5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gy.gif
deleted file mode 100644
index 42483db9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/gy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hk.gif
deleted file mode 100644
index c745c141..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hn.gif
deleted file mode 100644
index e43bd5e5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hr.gif
deleted file mode 100644
index a6f704ca..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ht.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ht.gif
deleted file mode 100644
index 854c9698..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ht.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hu.gif
deleted file mode 100644
index 04ddf9f4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/hu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/id.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/id.gif
deleted file mode 100644
index dcc678e9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/id.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ie.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ie.gif
deleted file mode 100644
index b82a61bf..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ie.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/il.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/il.gif
deleted file mode 100644
index e53b0625..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/il.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/in.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/in.gif
deleted file mode 100644
index 929e0c25..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/in.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/iq.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/iq.gif
deleted file mode 100644
index f0845872..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/iq.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ir.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ir.gif
deleted file mode 100644
index fbfdf319..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ir.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/is.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/is.gif
deleted file mode 100644
index 3f490ab7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/is.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/it.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/it.gif
deleted file mode 100644
index 5bc1bb2c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/it.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jm.gif
deleted file mode 100644
index 6e97f20d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jo.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jo.gif
deleted file mode 100644
index 8dfb7143..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jo.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jp.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jp.gif
deleted file mode 100644
index 6ecf4ff2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/jp.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ke.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ke.gif
deleted file mode 100644
index 742aab84..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ke.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kg.gif
deleted file mode 100644
index 88608a30..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kh.gif
deleted file mode 100644
index ee7ec64b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ki.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ki.gif
deleted file mode 100644
index 5eab4ed6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ki.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/km.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/km.gif
deleted file mode 100644
index f529c42d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/km.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kn.gif
deleted file mode 100644
index 20f55e9b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kp.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kp.gif
deleted file mode 100644
index 2c99418b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kp.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kr.gif
deleted file mode 100644
index 139cf5c8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kw.gif
deleted file mode 100644
index 27a43e4c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kz.gif
deleted file mode 100644
index 81cc714a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/kz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/la.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/la.gif
deleted file mode 100644
index 86dc6af2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/la.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lb.gif
deleted file mode 100644
index f39803f6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lc.gif
deleted file mode 100644
index 95f6ba69..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/li.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/li.gif
deleted file mode 100644
index cdfe54c6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/li.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lk.gif
deleted file mode 100644
index 5486bf0b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lr.gif
deleted file mode 100644
index a70179ad..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ls.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ls.gif
deleted file mode 100644
index e4611d05..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ls.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lt.gif
deleted file mode 100644
index eca2f152..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lu.gif
deleted file mode 100644
index c8e2e76f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lv.gif
deleted file mode 100644
index 8e2cabee..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/lv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ly.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ly.gif
deleted file mode 100644
index b31fbec6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ly.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ma.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ma.gif
deleted file mode 100644
index c9829260..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ma.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mc.gif
deleted file mode 100644
index 6bd1424a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/md.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/md.gif
deleted file mode 100644
index a19ff5cb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/md.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mg.gif
deleted file mode 100644
index a0bed496..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mh.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mh.gif
deleted file mode 100644
index b5f879a9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mh.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mk.gif
deleted file mode 100644
index 776a1a6b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ml.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ml.gif
deleted file mode 100644
index 7ea931ab..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ml.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mm.gif
deleted file mode 100644
index 2f8adbd7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mn.gif
deleted file mode 100644
index 4d812a01..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mr.gif
deleted file mode 100644
index d92a4643..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mt.gif
deleted file mode 100644
index aa5a7298..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mu.gif
deleted file mode 100644
index 98d3bd9a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mv.gif
deleted file mode 100644
index dbd75919..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mw.gif
deleted file mode 100644
index 9ba7c7ba..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mx.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mx.gif
deleted file mode 100644
index e5e70bb0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mx.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/my.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/my.gif
deleted file mode 100644
index 4bb4e268..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/my.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mz.gif
deleted file mode 100644
index fe3df698..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/mz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/na.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/na.gif
deleted file mode 100644
index e4c953a4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/na.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ne.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ne.gif
deleted file mode 100644
index dd616577..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ne.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ng.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ng.gif
deleted file mode 100644
index 498b3d59..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ng.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ni.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ni.gif
deleted file mode 100644
index b6c8e208..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ni.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nl.gif
deleted file mode 100644
index 9053bfc3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/no.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/no.gif
deleted file mode 100644
index 8ca359a7..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/no.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/np.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/np.gif
deleted file mode 100644
index d0fd2f7a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/np.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nr.gif
deleted file mode 100644
index d82bc57d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nu.gif
deleted file mode 100644
index 755c1b33..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nz.gif
deleted file mode 100644
index 2ebcec83..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/nz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/om.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/om.gif
deleted file mode 100644
index 9984131b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/om.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pa.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pa.gif
deleted file mode 100644
index 016a2274..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pa.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pe.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pe.gif
deleted file mode 100644
index b8f37c68..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pe.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pg.gif
deleted file mode 100644
index fffb3517..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ph.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ph.gif
deleted file mode 100644
index 1b126944..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ph.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pk.gif
deleted file mode 100644
index 9f5ca278..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pl.gif
deleted file mode 100644
index e4252c5d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ps.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ps.gif
deleted file mode 100644
index 31d1aefd..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ps.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pt.gif
deleted file mode 100644
index 2614c827..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pw.gif
deleted file mode 100644
index 8da1b47b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/pw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/py.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/py.gif
deleted file mode 100644
index 23738a4e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/py.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/qa.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/qa.gif
deleted file mode 100644
index b4f9f55e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/qa.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ro.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ro.gif
deleted file mode 100644
index 94c6ade2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ro.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ru.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ru.gif
deleted file mode 100644
index a6e78729..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ru.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/rw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/rw.gif
deleted file mode 100644
index a925bee8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/rw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sa.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sa.gif
deleted file mode 100644
index afcb768a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sa.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sb.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sb.gif
deleted file mode 100644
index d2f20798..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sb.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sc.gif
deleted file mode 100644
index 815a8cec..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sd.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sd.gif
deleted file mode 100644
index 47b2e6a4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sd.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/se.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/se.gif
deleted file mode 100644
index 333f7f18..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/se.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sg.gif
deleted file mode 100644
index ad264e45..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/si.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/si.gif
deleted file mode 100644
index ebc6c9b6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/si.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sk.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sk.gif
deleted file mode 100644
index 78e654b0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sk.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sl.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sl.gif
deleted file mode 100644
index dacd1f09..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sl.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sm.gif
deleted file mode 100644
index c12e13aa..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sn.gif
deleted file mode 100644
index c6ffb1d1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/so.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/so.gif
deleted file mode 100644
index 7bec9284..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/so.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sr.gif
deleted file mode 100644
index ba6269f9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/st.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/st.gif
deleted file mode 100644
index d29916f3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/st.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/su.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/su.gif
deleted file mode 100644
index c64c7b6b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/su.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sv.gif
deleted file mode 100644
index 199699ea..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sy.gif
deleted file mode 100644
index 56d81175..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sz.gif
deleted file mode 100644
index 9a7f9aa1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/sz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/td.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/td.gif
deleted file mode 100644
index be3c4e49..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/td.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tg.gif
deleted file mode 100644
index d15557fa..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/th.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/th.gif
deleted file mode 100644
index f6b68f6d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/th.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tj.gif
deleted file mode 100644
index 26c9c6a0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tm.gif
deleted file mode 100644
index 09a0f66f..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tn.gif
deleted file mode 100644
index ff2ce465..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/to.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/to.gif
deleted file mode 100644
index eb45eaf4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/to.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tp.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tp.gif
deleted file mode 100644
index fd588323..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tp.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tr.gif
deleted file mode 100644
index a8d150a4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tt.gif
deleted file mode 100644
index bbf1729b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tv.gif
deleted file mode 100644
index df58585d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tw.gif
deleted file mode 100644
index 01f360e5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tz.gif
deleted file mode 100644
index ae33cb9a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/tz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ua.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ua.gif
deleted file mode 100644
index 1666575a..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ua.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ug.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ug.gif
deleted file mode 100644
index 6a8f9df8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ug.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/un.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/un.gif
deleted file mode 100644
index 683897e4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/un.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/us.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/us.gif
deleted file mode 100644
index 12739673..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/us.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/uy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/uy.gif
deleted file mode 100644
index 2339df56..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/uy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/uz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/uz.gif
deleted file mode 100644
index 96d13fd9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/uz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/va.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/va.gif
deleted file mode 100644
index 2e4757ec..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/va.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vc.gif
deleted file mode 100644
index 5e2edfb1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ve.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ve.gif
deleted file mode 100644
index f4d14918..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ve.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vn.gif
deleted file mode 100644
index 527ab1e5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vu.gif
deleted file mode 100644
index 38dca348..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/vu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ws.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ws.gif
deleted file mode 100644
index af159f3c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ws.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ya.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ya.gif
deleted file mode 100644
index 07bad2d4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ya.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ye.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ye.gif
deleted file mode 100644
index b5fbb0f5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ye.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ye0.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ye0.gif
deleted file mode 100644
index aa1942ee..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/ye0.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/yu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/yu.gif
deleted file mode 100644
index d127d277..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/yu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/za.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/za.gif
deleted file mode 100644
index 9554d129..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/za.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/zm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/zm.gif
deleted file mode 100644
index ff76b8dd..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/zm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/zw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/small/zw.gif
deleted file mode 100644
index 571bac88..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/small/zw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sn.gif
deleted file mode 100644
index 1a541741..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/so.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/so.gif
deleted file mode 100644
index 7f1dba35..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/so.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sr.gif
deleted file mode 100644
index de781c13..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/st.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/st.gif
deleted file mode 100644
index cd9036fb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/st.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/su.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/su.gif
deleted file mode 100644
index 23e162a1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/su.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sv.gif
deleted file mode 100644
index bef488e2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sy.gif
deleted file mode 100644
index a3a53cd4..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/sz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/sz.gif
deleted file mode 100644
index b3a20ba5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/sz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/td.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/td.gif
deleted file mode 100644
index 3ccc8dff..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/td.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tg.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tg.gif
deleted file mode 100644
index 674e68f0..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tg.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/th.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/th.gif
deleted file mode 100644
index 83318c0c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/th.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tj.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tj.gif
deleted file mode 100644
index 1f44255c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tm.gif
deleted file mode 100644
index a603afd2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tn.gif
deleted file mode 100644
index 083238da..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/to.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/to.gif
deleted file mode 100644
index 603aa8e3..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/to.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tp.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tp.gif
deleted file mode 100644
index 40599d56..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tp.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tr.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tr.gif
deleted file mode 100644
index 2eac7305..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tr.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tt.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tt.gif
deleted file mode 100644
index f7154195..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tt.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tv.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tv.gif
deleted file mode 100644
index 9b018e87..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tv.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tw.gif
deleted file mode 100644
index 57a04829..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/tz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/tz.gif
deleted file mode 100644
index 6d28d408..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/tz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ua.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ua.gif
deleted file mode 100644
index bebd6705..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ua.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ug.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ug.gif
deleted file mode 100644
index 151e3037..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ug.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/un.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/un.gif
deleted file mode 100644
index 135b5281..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/un.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/us.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/us.gif
deleted file mode 100644
index 850094ea..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/us.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/uy.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/uy.gif
deleted file mode 100644
index 4d129fc5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/uy.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/uz.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/uz.gif
deleted file mode 100644
index d9cc88eb..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/uz.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/va.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/va.gif
deleted file mode 100644
index 5db146d6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/va.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/vc.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/vc.gif
deleted file mode 100644
index 6519018d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/vc.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ve.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ve.gif
deleted file mode 100644
index 4abf999b..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ve.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/vn.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/vn.gif
deleted file mode 100644
index e7d1e5b9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/vn.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/vu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/vu.gif
deleted file mode 100644
index f8736a18..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/vu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ws.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ws.gif
deleted file mode 100644
index b2bc2f76..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ws.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ya.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ya.gif
deleted file mode 100644
index 91536134..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ya.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ye.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ye.gif
deleted file mode 100644
index f183847c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ye.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/ye0.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/ye0.gif
deleted file mode 100644
index b9c28b30..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/ye0.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/yu.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/yu.gif
deleted file mode 100644
index c91bf1ef..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/yu.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/za.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/za.gif
deleted file mode 100644
index 8579793e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/za.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/zm.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/zm.gif
deleted file mode 100644
index fc686bb8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/zm.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/countries/zw.gif b/org.eclipse.babel.tapiji.tools.core/icons/countries/zw.gif
deleted file mode 100644
index 9821c41c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/countries/zw.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/duplicate.gif b/org.eclipse.babel.tapiji.tools.core/icons/duplicate.gif
deleted file mode 100644
index 3366a273..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/duplicate.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/entry.gif b/org.eclipse.babel.tapiji.tools.core/icons/entry.gif
deleted file mode 100644
index 442539fc..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/entry.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/exclude.png b/org.eclipse.babel.tapiji.tools.core/icons/exclude.png
deleted file mode 100644
index d1105295..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/exclude.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/file_obj.gif b/org.eclipse.babel.tapiji.tools.core/icons/file_obj.gif
deleted file mode 100644
index 7ccc6a70..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/file_obj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/flatLayout.gif b/org.eclipse.babel.tapiji.tools.core/icons/flatLayout.gif
deleted file mode 100644
index 1ef74cf9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/flatLayout.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/fldr_obj.gif b/org.eclipse.babel.tapiji.tools.core/icons/fldr_obj.gif
deleted file mode 100644
index 51e703b1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/fldr_obj.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/hierarchicalLayout.gif b/org.eclipse.babel.tapiji.tools.core/icons/hierarchicalLayout.gif
deleted file mode 100644
index 23448617..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/hierarchicalLayout.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/icon_new_memory_view.png b/org.eclipse.babel.tapiji.tools.core/icons/icon_new_memory_view.png
deleted file mode 100644
index 2ceac484..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/icon_new_memory_view.png and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/incomplete.gif b/org.eclipse.babel.tapiji.tools.core/icons/incomplete.gif
deleted file mode 100644
index 6583d366..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/incomplete.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/int.gif b/org.eclipse.babel.tapiji.tools.core/icons/int.gif
deleted file mode 100644
index 7d24707e..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/int.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/key.gif b/org.eclipse.babel.tapiji.tools.core/icons/key.gif
deleted file mode 100644
index bdb8e971..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/key.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/keyCommented.gif b/org.eclipse.babel.tapiji.tools.core/icons/keyCommented.gif
deleted file mode 100644
index 869eb6bd..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/keyCommented.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/keyNone.gif b/org.eclipse.babel.tapiji.tools.core/icons/keyNone.gif
deleted file mode 100644
index dd1bd7c2..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/keyNone.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/newpropertiesfile.gif b/org.eclipse.babel.tapiji.tools.core/icons/newpropertiesfile.gif
deleted file mode 100644
index 11e436b8..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/newpropertiesfile.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/no_int1.gif b/org.eclipse.babel.tapiji.tools.core/icons/no_int1.gif
deleted file mode 100644
index a1b17488..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/no_int1.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/no_int2.gif b/org.eclipse.babel.tapiji.tools.core/icons/no_int2.gif
deleted file mode 100644
index 98a2dbc6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/no_int2.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/original/entry.gif b/org.eclipse.babel.tapiji.tools.core/icons/original/entry.gif
deleted file mode 100644
index d26afe53..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/original/entry.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/original/entry.psd b/org.eclipse.babel.tapiji.tools.core/icons/original/entry.psd
deleted file mode 100644
index eaa418a1..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/original/entry.psd and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/propertiesfile.gif b/org.eclipse.babel.tapiji.tools.core/icons/propertiesfile.gif
deleted file mode 100644
index 9090c04d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/propertiesfile.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/read_only.gif b/org.eclipse.babel.tapiji.tools.core/icons/read_only.gif
deleted file mode 100644
index dde3cbd6..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/read_only.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/resourcebundle.gif b/org.eclipse.babel.tapiji.tools.core/icons/resourcebundle.gif
deleted file mode 100644
index fe05bad9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/resourcebundle.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/sample.gif b/org.eclipse.babel.tapiji.tools.core/icons/sample.gif
deleted file mode 100644
index 34fb3c9d..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/sample.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/similar.gif b/org.eclipse.babel.tapiji.tools.core/icons/similar.gif
deleted file mode 100644
index 74cf98e5..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/similar.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/toc_open.gif b/org.eclipse.babel.tapiji.tools.core/icons/toc_open.gif
deleted file mode 100644
index 9e665d5c..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/toc_open.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/warning.gif b/org.eclipse.babel.tapiji.tools.core/icons/warning.gif
deleted file mode 100644
index 801a1f81..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/warning.gif and /dev/null differ
diff --git a/org.eclipse.babel.tapiji.tools.core/icons/warningGrey.gif b/org.eclipse.babel.tapiji.tools.core/icons/warningGrey.gif
deleted file mode 100644
index e11147e9..00000000
Binary files a/org.eclipse.babel.tapiji.tools.core/icons/warningGrey.gif and /dev/null differ"
4916128227c75b9ead023d37ba86a2685aebf62c,Delta Spike,"DELTASPIKE-289 enable WindowContext via Extension
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java
new file mode 100644
index 000000000..9f03783b2
--- /dev/null
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DeltaSpikeContextExtension.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.scope.window;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
+
+/**
+ * Handle all DeltaSpike WindowContext and ConversationContext
+ * related features.
+ */
+public class DeltaSpikeContextExtension
+{
+    private DefaultWindowContext windowContext;
+
+    public void registerDeltaSpikeContexts(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager)
+    {
+        windowContext = new DefaultWindowContext(beanManager);
+        afterBeanDiscovery.addContext(windowContext);
+    }
+}"
3f0c9e5fe36d201de021d989b23ebaeb2d9a027b,hadoop,YARN-3379. Fixed missing data in localityTable and- ResourceRequests table in RM WebUI. Contributed by Xuan Gong (cherry picked- from commit 4e886eb9cbd2dcb128bbfd17309c734083093a4c)--,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 66079e22c496d..5f9e8dd7ec3bc 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -751,6 +751,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3349. Treat all exceptions as failure in
     TestFSRMStateStore#testFSRMStateStoreClientRetry. (Zhihai Xu via ozawa)
 
+    YARN-3379. Fixed missing data in localityTable and ResourceRequests table
+    in RM WebUI. (Xuan Gong via jianhe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java
index eeccf0fc0e30e..dca39d6d3c02c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java
@@ -19,12 +19,6 @@
 
 import static org.apache.hadoop.yarn.util.StringHelper.join;
 import static org.apache.hadoop.yarn.webapp.YarnWebParams.APPLICATION_ATTEMPT_ID;
-import static org.apache.hadoop.yarn.webapp.YarnWebParams.WEB_UI_TYPE;
-import static org.apache.hadoop.yarn.webapp.view.JQueryUI._EVEN;
-import static org.apache.hadoop.yarn.webapp.view.JQueryUI._INFO_WRAP;
-import static org.apache.hadoop.yarn.webapp.view.JQueryUI._ODD;
-import static org.apache.hadoop.yarn.webapp.view.JQueryUI._TH;
-
 import java.security.PrivilegedExceptionAction;
 import java.util.Collection;
 
@@ -43,20 +37,18 @@
 import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
 import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.hadoop.yarn.webapp.YarnWebParams;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
-import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 import org.apache.hadoop.yarn.webapp.view.InfoBlock;
-
 import com.google.inject.Inject;
 
 public class AppAttemptBlock extends HtmlBlock {
 
   private static final Log LOG = LogFactory.getLog(AppAttemptBlock.class);
   protected ApplicationBaseProtocol appBaseProt;
+  protected ApplicationAttemptId appAttemptId = null;
 
   @Inject
   public AppAttemptBlock(ApplicationBaseProtocol appBaseProt, ViewContext ctx) {
@@ -66,14 +58,12 @@ public AppAttemptBlock(ApplicationBaseProtocol appBaseProt, ViewContext ctx) {
 
   @Override
   protected void render(Block html) {
-    String webUiType = $(WEB_UI_TYPE);
     String attemptid = $(APPLICATION_ATTEMPT_ID);
     if (attemptid.isEmpty()) {
       puts(""Bad request: requires application attempt ID"");
       return;
     }
 
-    ApplicationAttemptId appAttemptId = null;
     try {
       appAttemptId = ConverterUtils.toApplicationAttemptId(attemptid);
     } catch (IllegalArgumentException e) {
@@ -183,17 +173,7 @@ public Collection<ContainerReport> run() throws Exception {
       return;
     }
 
-    // TODO need to render applicationHeadRoom value from
-    // ApplicationAttemptMetrics after YARN-3284
-    if (webUiType.equals(YarnWebParams.RM_WEB_UI)) {
-      if (!isApplicationInFinalState(appAttempt.getAppAttemptState())) {
-        DIV<Hamlet> pdiv = html._(InfoBlock.class).div(_INFO_WRAP);
-        info(""Application Attempt Overview"").clear();
-        info(""Application Attempt Metrics"")._(
-            ""Application Attempt Headroom : "", 0);
-        pdiv._();
-      }
-    }
+    createAttemptHeadRoomTable(html);
     html._(InfoBlock.class);
 
     // Container Table
@@ -236,45 +216,6 @@ public Collection<ContainerReport> run() throws Exception {
       ._(""var containersTableData="" + containersTableData)._();
 
     tbody._()._();
-
-    if (webUiType.equals(YarnWebParams.RM_WEB_UI)) {
-      createContainerLocalityTable(html); // TODO:YARN-3284
-    }
-  }
-
-  //TODO: YARN-3284
-  //The containerLocality metrics will be exposed from AttemptReport
-  private void createContainerLocalityTable(Block html) {
-    int totalAllocatedContainers = 0; //TODO: YARN-3284
-    int[][] localityStatistics = new int[0][0];//TODO:YARN-3284
-    DIV<Hamlet> div = html.div(_INFO_WRAP);
-    TABLE<DIV<Hamlet>> table =
-        div.h3(
-          ""Total Allocated Containers: ""
-              + totalAllocatedContainers).h3(""Each table cell""
-            + "" represents the number of NodeLocal/RackLocal/OffSwitch containers""
-            + "" satisfied by NodeLocal/RackLocal/OffSwitch resource requests."").table(
-          ""#containerLocality"");
-    table.
-      tr().
-        th(_TH, """").
-        th(_TH, ""Node Local Request"").
-        th(_TH, ""Rack Local Request"").
-        th(_TH, ""Off Switch Request"").
-      _();
-
-    String[] containersType =
-        { ""Num Node Local Containers (satisfied by)"", ""Num Rack Local Containers (satisfied by)"",
-            ""Num Off Switch Containers (satisfied by)"" };
-    boolean odd = false;
-    for (int i = 0; i < localityStatistics.length; i++) {
-      table.tr((odd = !odd) ? _ODD : _EVEN).td(containersType[i])
-        .td(String.valueOf(localityStatistics[i][0]))
-        .td(i == 0 ? """" : String.valueOf(localityStatistics[i][1]))
-        .td(i <= 1 ? """" : String.valueOf(localityStatistics[i][2]))._();
-    }
-    table._();
-    div._();
   }
 
   private boolean hasAMContainer(ContainerId containerId,
@@ -286,10 +227,8 @@ private boolean hasAMContainer(ContainerId containerId,
     }
     return false;
   }
-  
-  private boolean isApplicationInFinalState(YarnApplicationAttemptState state) {
-    return state == YarnApplicationAttemptState.FINISHED
-        || state == YarnApplicationAttemptState.FAILED
-        || state == YarnApplicationAttemptState.KILLED;
+
+  protected void createAttemptHeadRoomTable(Block html) {
+    
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
index 5fc5fa06ac0fc..abb6b9cebf381 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
@@ -21,11 +21,8 @@
 import static org.apache.hadoop.yarn.util.StringHelper.join;
 import static org.apache.hadoop.yarn.webapp.YarnWebParams.APPLICATION_ID;
 import static org.apache.hadoop.yarn.webapp.YarnWebParams.WEB_UI_TYPE;
-import static org.apache.hadoop.yarn.webapp.view.JQueryUI._INFO_WRAP;
 import java.security.PrivilegedExceptionAction;
 import java.util.Collection;
-import java.util.List;
-
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -39,12 +36,9 @@
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
-import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.ContainerReport;
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
-import org.apache.hadoop.yarn.api.records.Resource;
-import org.apache.hadoop.yarn.api.records.ResourceRequest;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.ContainerNotFoundException;
@@ -53,10 +47,8 @@
 import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
 import org.apache.hadoop.yarn.util.Apps;
 import org.apache.hadoop.yarn.util.Times;
-import org.apache.hadoop.yarn.util.resource.Resources;
 import org.apache.hadoop.yarn.webapp.YarnWebParams;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
-import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
@@ -69,9 +61,11 @@ public class AppBlock extends HtmlBlock {
   private static final Log LOG = LogFactory.getLog(AppBlock.class);
   protected ApplicationBaseProtocol appBaseProt;
   protected Configuration conf;
+  protected ApplicationId appID = null;
 
   @Inject
-  AppBlock(ApplicationBaseProtocol appBaseProt, ViewContext ctx, Configuration conf) {
+  protected AppBlock(ApplicationBaseProtocol appBaseProt, ViewContext ctx,
+      Configuration conf) {
     super(ctx);
     this.appBaseProt = appBaseProt;
     this.conf = conf;
@@ -86,7 +80,6 @@ protected void render(Block html) {
       return;
     }
 
-    ApplicationId appID = null;
     try {
       appID = Apps.toAppID(aid);
     } catch (Exception e) {
@@ -213,31 +206,7 @@ public Collection<ApplicationAttemptReport> run() throws Exception {
       return;
     }
 
-    //TODO:YARN-3284
-    //The preemption metrics will be exposed from ApplicationReport
-    // and ApplicationAttemptReport
-    ApplicationResourceUsageReport usageReport =
-        appReport.getApplicationResourceUsageReport();
-    DIV<Hamlet> pdiv = html.
-        _(InfoBlock.class).
-        div(_INFO_WRAP);
-    info(""Application Overview"").clear();
-    info(""Application Metrics"")
-        ._(""Total Resource Preempted:"",
-          Resources.none()) // TODO: YARN-3284
-        ._(""Total Number of Non-AM Containers Preempted:"",
-          String.valueOf(0)) // TODO: YARN-3284
-        ._(""Total Number of AM Containers Preempted:"",
-          String.valueOf(0)) // TODO: YARN-3284
-        ._(""Resource Preempted from Current Attempt:"",
-          Resources.none()) // TODO: YARN-3284
-        ._(""Number of Non-AM Containers Preempted from Current Attempt:"",
-          0) // TODO: YARN-3284
-        ._(""Aggregate Resource Allocation:"",
-          String.format(""%d MB-seconds, %d vcore-seconds"", usageReport == null
-            ? 0 : usageReport.getMemorySeconds(), usageReport == null ? 0
-            : usageReport.getVcoreSeconds()));
-    pdiv._();
+    createApplicationMetricsTable(html);
 
     html._(InfoBlock.class);
 
@@ -319,49 +288,6 @@ public ContainerReport run() throws Exception {
       ._(""var attemptsTableData="" + attemptsTableData)._();
 
     tbody._()._();
-
-    if (webUiType != null && webUiType.equals(YarnWebParams.RM_WEB_UI)) {
-      createResourceRequestsTable(html, null); // TODO:YARN-3284
-    }
-  }
-
-  //TODO:YARN-3284
-  //The resource requests metrics will be exposed from attemptReport
-  private void createResourceRequestsTable(Block html, List<ResourceRequest> resouceRequests) {
-    TBODY<TABLE<Hamlet>> tbody =
-        html.table(""#ResourceRequests"").thead().tr()
-          .th("".priority"", ""Priority"")
-          .th("".resourceName"", ""ResourceName"")
-          .th("".totalResource"", ""Capability"")
-          .th("".numContainers"", ""NumContainers"")
-          .th("".relaxLocality"", ""RelaxLocality"")
-          .th("".nodeLabelExpression"", ""NodeLabelExpression"")._()._().tbody();
-
-    Resource totalResource = Resource.newInstance(0, 0);
-    if (resouceRequests != null) {
-      for (ResourceRequest request : resouceRequests) {
-        if (request.getNumContainers() == 0) {
-          continue;
-        }
-
-        tbody.tr()
-          .td(String.valueOf(request.getPriority()))
-          .td(request.getResourceName())
-          .td(String.valueOf(request.getCapability()))
-          .td(String.valueOf(request.getNumContainers()))
-          .td(String.valueOf(request.getRelaxLocality()))
-          .td(request.getNodeLabelExpression() == null ? ""N/A"" : request
-              .getNodeLabelExpression())._();
-        if (request.getResourceName().equals(ResourceRequest.ANY)) {
-          Resources.addTo(totalResource,
-            Resources.multiply(request.getCapability(),
-              request.getNumContainers()));
-        }
-      }
-    }
-    html.div().$class(""totalResourceRequests"")
-      .h3(""Total Outstanding Resource Requests: "" + totalResource)._();
-    tbody._()._();
   }
 
   private String clarifyAppState(YarnApplicationState state) {
@@ -389,4 +315,9 @@ private String clairfyAppFinalStatus(FinalApplicationStatus status) {
     }
     return status.toString();
   }
+
+  // The preemption metrics only need to be shown in RM WebUI
+  protected void createApplicationMetricsTable(Block html) {
+
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java
index 6e4cfade9ff05..df5fb9e8a5984 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java
@@ -23,7 +23,6 @@
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
 
-import org.apache.hadoop.yarn.server.webapp.AppAttemptBlock;
 import org.apache.hadoop.yarn.server.webapp.WebPageUtils;
 import org.apache.hadoop.yarn.webapp.SubView;
 import org.apache.hadoop.yarn.webapp.YarnWebParams;
@@ -51,7 +50,7 @@ protected void preHead(Page.HTML<_> html) {
 
   @Override
   protected Class<? extends SubView> content() {
-    return AppAttemptBlock.class;
+    return RMAppAttemptBlock.class;
   }
 
 }
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java
index 9f9b7c969d2b9..0c5516a304ade 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java
@@ -23,7 +23,6 @@
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
 
-import org.apache.hadoop.yarn.server.webapp.AppBlock;
 import org.apache.hadoop.yarn.server.webapp.WebPageUtils;
 import org.apache.hadoop.yarn.webapp.SubView;
 import org.apache.hadoop.yarn.webapp.YarnWebParams;
@@ -50,6 +49,6 @@ protected void preHead(Page.HTML<_> html) {
 
   @Override 
   protected Class<? extends SubView> content() {
-    return AppBlock.class;
+    return RMAppBlock.class;
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
new file mode 100644
index 0000000000000..419c0ce67539e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
@@ -0,0 +1,177 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.webapp;
+
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._EVEN;
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._INFO_WRAP;
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._ODD;
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._TH;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.api.records.ResourceRequest;
+import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState;
+import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptMetrics;
+import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+import org.apache.hadoop.yarn.server.webapp.AppAttemptBlock;
+import org.apache.hadoop.yarn.util.resource.Resources;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY;
+import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+import org.apache.hadoop.yarn.webapp.view.InfoBlock;
+import com.google.inject.Inject;
+
+public class RMAppAttemptBlock extends AppAttemptBlock{
+
+  private final ResourceManager rm;
+  protected Configuration conf;
+
+  @Inject
+  RMAppAttemptBlock(ViewContext ctx, ResourceManager rm, Configuration conf) {
+    super(rm.getClientRMService(), ctx);
+    this.rm = rm;
+    this.conf = conf;
+  }
+
+  @Override
+  protected void render(Block html) {
+    super.render(html);
+    createContainerLocalityTable(html);
+    createResourceRequestsTable(html);
+  }
+
+  private void createResourceRequestsTable(Block html) {
+    AppInfo app =
+        new AppInfo(rm, rm.getRMContext().getRMApps()
+          .get(this.appAttemptId.getApplicationId()), true,
+          WebAppUtils.getHttpSchemePrefix(conf));
+    TBODY<TABLE<Hamlet>> tbody =
+        html.table(""#ResourceRequests"").thead().tr()
+          .th("".priority"", ""Priority"")
+          .th("".resourceName"", ""ResourceName"")
+          .th("".totalResource"", ""Capability"")
+          .th("".numContainers"", ""NumContainers"")
+          .th("".relaxLocality"", ""RelaxLocality"")
+          .th("".nodeLabelExpression"", ""NodeLabelExpression"")._()._().tbody();
+
+    Resource totalResource = Resource.newInstance(0, 0);
+    if (app.getResourceRequests() != null) {
+      for (ResourceRequest request : app.getResourceRequests()) {
+        if (request.getNumContainers() == 0) {
+          continue;
+        }
+
+        tbody.tr()
+          .td(String.valueOf(request.getPriority()))
+          .td(request.getResourceName())
+          .td(String.valueOf(request.getCapability()))
+          .td(String.valueOf(request.getNumContainers()))
+          .td(String.valueOf(request.getRelaxLocality()))
+          .td(request.getNodeLabelExpression() == null ? ""N/A"" : request
+              .getNodeLabelExpression())._();
+        if (request.getResourceName().equals(ResourceRequest.ANY)) {
+          Resources.addTo(totalResource,
+            Resources.multiply(request.getCapability(),
+              request.getNumContainers()));
+        }
+      }
+    }
+    html.div().$class(""totalResourceRequests"")
+      .h3(""Total Outstanding Resource Requests: "" + totalResource)._();
+    tbody._()._();
+  }
+
+  private void createContainerLocalityTable(Block html) {
+    RMAppAttemptMetrics attemptMetrics = null;
+    RMAppAttempt attempt = getRMAppAttempt();
+    if (attempt != null) {
+      attemptMetrics = attempt.getRMAppAttemptMetrics();
+    }
+    
+    if (attemptMetrics == null) {
+      return;
+    }
+
+    DIV<Hamlet> div = html.div(_INFO_WRAP);
+    TABLE<DIV<Hamlet>> table =
+        div.h3(
+          ""Total Allocated Containers: ""
+              + attemptMetrics.getTotalAllocatedContainers()).h3(""Each table cell""
+            + "" represents the number of NodeLocal/RackLocal/OffSwitch containers""
+            + "" satisfied by NodeLocal/RackLocal/OffSwitch resource requests."").table(
+          ""#containerLocality"");
+    table.
+      tr().
+        th(_TH, """").
+        th(_TH, ""Node Local Request"").
+        th(_TH, ""Rack Local Request"").
+        th(_TH, ""Off Switch Request"").
+      _();
+
+    String[] containersType =
+        { ""Num Node Local Containers (satisfied by)"", ""Num Rack Local Containers (satisfied by)"",
+            ""Num Off Switch Containers (satisfied by)"" };
+    boolean odd = false;
+    for (int i = 0; i < attemptMetrics.getLocalityStatistics().length; i++) {
+      table.tr((odd = !odd) ? _ODD : _EVEN).td(containersType[i])
+        .td(String.valueOf(attemptMetrics.getLocalityStatistics()[i][0]))
+        .td(i == 0 ? """" : String.valueOf(attemptMetrics.getLocalityStatistics()[i][1]))
+        .td(i <= 1 ? """" : String.valueOf(attemptMetrics.getLocalityStatistics()[i][2]))._();
+    }
+    table._();
+    div._();
+  }
+
+  private boolean isApplicationInFinalState(YarnApplicationAttemptState state) {
+    return state == YarnApplicationAttemptState.FINISHED
+        || state == YarnApplicationAttemptState.FAILED
+        || state == YarnApplicationAttemptState.KILLED;
+  }
+
+  @Override
+  protected void createAttemptHeadRoomTable(Block html) {
+    RMAppAttempt attempt = getRMAppAttempt();
+    if (attempt != null) {
+      if (!isApplicationInFinalState(YarnApplicationAttemptState
+          .valueOf(attempt.getAppAttemptState().toString()))) {
+        DIV<Hamlet> pdiv = html._(InfoBlock.class).div(_INFO_WRAP);
+        info(""Application Attempt Overview"").clear();
+        info(""Application Attempt Metrics"")._(
+          ""Application Attempt Headroom : "", 0);
+        pdiv._();
+      }
+    }
+  }
+
+  private RMAppAttempt getRMAppAttempt() {
+    ApplicationId appId = this.appAttemptId.getApplicationId();
+    RMAppAttempt attempt = null;
+    RMApp rmApp = rm.getRMContext().getRMApps().get(appId);
+    if (rmApp != null) { 
+      attempt = rmApp.getAppAttempts().get(appAttemptId);
+    }
+    return attempt;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java
new file mode 100644
index 0000000000000..64c57476f7951
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java
@@ -0,0 +1,94 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.webapp;
+
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._INFO_WRAP;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppMetrics;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptMetrics;
+import org.apache.hadoop.yarn.server.webapp.AppBlock;
+import org.apache.hadoop.yarn.util.resource.Resources;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV;
+import org.apache.hadoop.yarn.webapp.view.InfoBlock;
+
+import com.google.inject.Inject;
+
+public class RMAppBlock extends AppBlock{
+
+  private final ResourceManager rm;
+
+  @Inject
+  RMAppBlock(ViewContext ctx, Configuration conf, ResourceManager rm) {
+    super(rm.getClientRMService(), ctx, conf);
+    this.rm = rm;
+  }
+
+  @Override
+  protected void render(Block html) {
+    super.render(html);
+  }
+
+  @Override
+  protected void createApplicationMetricsTable(Block html){
+    RMApp rmApp = this.rm.getRMContext().getRMApps().get(appID);
+    RMAppMetrics appMetrics = rmApp == null ? null : rmApp.getRMAppMetrics();
+    // Get attempt metrics and fields, it is possible currentAttempt of RMApp is
+    // null. In that case, we will assume resource preempted and number of Non
+    // AM container preempted on that attempt is 0
+    RMAppAttemptMetrics attemptMetrics;
+    if (rmApp == null || null == rmApp.getCurrentAppAttempt()) {
+      attemptMetrics = null;
+    } else {
+      attemptMetrics = rmApp.getCurrentAppAttempt().getRMAppAttemptMetrics();
+    }
+    Resource attemptResourcePreempted =
+        attemptMetrics == null ? Resources.none() : attemptMetrics
+          .getResourcePreempted();
+    int attemptNumNonAMContainerPreempted =
+        attemptMetrics == null ? 0 : attemptMetrics
+          .getNumNonAMContainersPreempted();
+    DIV<Hamlet> pdiv = html.
+        _(InfoBlock.class).
+        div(_INFO_WRAP);
+    info(""Application Overview"").clear();
+    info(""Application Metrics"")
+        ._(""Total Resource Preempted:"",
+          appMetrics == null ? ""N/A"" : appMetrics.getResourcePreempted())
+        ._(""Total Number of Non-AM Containers Preempted:"",
+          appMetrics == null ? ""N/A""
+              : appMetrics.getNumNonAMContainersPreempted())
+        ._(""Total Number of AM Containers Preempted:"",
+          appMetrics == null ? ""N/A""
+              : appMetrics.getNumAMContainersPreempted())
+        ._(""Resource Preempted from Current Attempt:"",
+          attemptResourcePreempted)
+        ._(""Number of Non-AM Containers Preempted from Current Attempt:"",
+          attemptNumNonAMContainerPreempted)
+        ._(""Aggregate Resource Allocation:"",
+          String.format(""%d MB-seconds, %d vcore-seconds"",
+              appMetrics == null ? ""N/A"" : appMetrics.getMemorySeconds(),
+              appMetrics == null ? ""N/A"" : appMetrics.getVcoreSeconds()));
+    pdiv._();
+  }
+}"
609d6c4b1eea2c33d9fb950fcbb9ba9dc1f80fc3,jexp$batch-import,"added a more memory efficient structure for storing forward looking relationships
",p,https://github.com/jexp/batch-import,"diff --git a/src/main/java/org/neo4j/batchimport/DisruptorBatchInserter.java b/src/main/java/org/neo4j/batchimport/DisruptorBatchInserter.java
index cc78ca7..feaca57 100644
--- a/src/main/java/org/neo4j/batchimport/DisruptorBatchInserter.java
+++ b/src/main/java/org/neo4j/batchimport/DisruptorBatchInserter.java
@@ -46,8 +46,9 @@ public class DisruptorBatchInserter {
 
     public DisruptorBatchInserter(String storeDir, final Map<String, String> config, long nodesToCreate, final NodeStructFactory nodeStructFactory) {
         this.storeDir = storeDir;
-        final int minBufferBits = (int) (Math.log(nodesToCreate / 100) / Math.log(2));
+        final int minBufferBits = 14; // (int) (Math.log(nodesToCreate / 100) / Math.log(2));
         RING_SIZE = 1 << Math.min(minBufferBits,18);
+        System.out.println(""Ring size ""+RING_SIZE);
         this.config = config;
         this.nodesToCreate = nodesToCreate;
         this.nodeStructFactory = nodeStructFactory;
@@ -58,8 +59,8 @@ void init() {
         nodeStructFactory.init(inserter);
         NeoStore neoStore = inserter.getNeoStore();
         neoStore.getNodeStore().setHighId(nodesToCreate + 1);
-        executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-        //executor = Executors.newCachedThreadPool();
+        final int processors = Runtime.getRuntime().availableProcessors();
+        executor = processors >=4 ? Executors.newFixedThreadPool(processors) : Executors.newCachedThreadPool();
 
         disruptor = new Disruptor<NodeStruct>(nodeStructFactory, executor, new SingleThreadedClaimStrategy(RING_SIZE), new YieldingWaitStrategy());
         disruptor.handleExceptionsWith(new BatchInserterExceptionHandler());
@@ -75,7 +76,7 @@ private void createHandlers(NeoStore neoStore, NodeStructFactory nodeStructFacto
         propertyMappingHandlers = PropertyEncodingHandler.createHandlers(inserter);
 
         propertyRecordCreatorHandler = new PropertyRecordCreatorHandler();
-        relationshipIdHandler = new RelationshipIdHandler(nodeStructFactory.getMaxRelsPerNode());
+        relationshipIdHandler = new RelationshipIdHandler();
 
         //nodeWriter = new NodeFileWriteHandler(new File(nodeStore.getStorageFileName()));
         nodeWriter = new NodeWriteRecordHandler(neoStore.getNodeStore());
diff --git a/src/main/java/org/neo4j/batchimport/ParallelImporter.java b/src/main/java/org/neo4j/batchimport/ParallelImporter.java
index 2f771d8..e8bd5c5 100644
--- a/src/main/java/org/neo4j/batchimport/ParallelImporter.java
+++ b/src/main/java/org/neo4j/batchimport/ParallelImporter.java
@@ -204,11 +204,10 @@ private void initProperties(BatchInserterImpl inserter) {
     @Override
     public void fillStruct(long nodeId, NodeStruct nodeStruct) {
         try {
-            nodeStruct.init();
             String nodesLine = nodesReader.readLine();
             if (nodesLine == null) throw new IllegalStateException(""Less Node rows than indicated at id "" + nodeId);
 
-            final Object[] rowData = nodesData.updateArray(nodesLine);
+            final Object[] rowData = nodesData.updateArray(nodesLine,(Object[])null);
             addProperties(nodeStruct, rowData, nodesData.getCount(), nodePropIds);
 
             addRelationships(nodeId, nodeStruct);
diff --git a/src/main/java/org/neo4j/batchimport/collections/CompactLongRecord.java b/src/main/java/org/neo4j/batchimport/collections/CompactLongRecord.java
new file mode 100644
index 0000000..1d2485b
--- /dev/null
+++ b/src/main/java/org/neo4j/batchimport/collections/CompactLongRecord.java
@@ -0,0 +1,113 @@
+package org.neo4j.batchimport.collections;
+
+import edu.ucla.sspace.util.primitive.IntIterator;
+
+import java.util.Arrays;
+
+/**
+* @author mh
+* @since 03.11.12
+*/
+public class CompactLongRecord {
+    private final byte highbit;
+    volatile CompactLongRecord next;
+    private final IntArray values = new IntArray();
+    private final int[] counts=new int[2];
+
+    CompactLongRecord(byte highbit) {
+        this.highbit=highbit;
+    }
+
+    public void add(long id, boolean outgoing) {
+        final byte lead = (byte)(id >> 31L);
+        add(lead,id,outgoing);
+    }
+
+    private void add(byte lead, long id, boolean outgoing) {
+        if (lead!=highbit) {
+            if (next==null) {
+                next=new CompactLongRecord((byte)(highbit+1));
+            }
+            next.add(lead,id,outgoing);
+        } else {
+            int value = (int)(id & 0x7FFFFFFF);
+            if (!outgoing) value = ~value;
+            counts[idx(outgoing)]++;
+            values.add(value);
+        }
+    }
+
+    public long[] getOutgoing() {
+        return get(true);
+    }
+
+    public long[] getIncoming() {
+        return get(false);
+    }
+
+    private long[] get(boolean outgoing) {
+        long[] result=new long[count(outgoing)];
+        return collect(result,outgoing,0);
+    }
+
+    private long[] collect(long[] result, boolean positive, int offset) {
+        final int max = counts[idx(positive)];
+        int i=offset;
+        for (int j = 0; j < values.count; j++) {
+            int value = values.data[j];
+            final boolean isPositive = value >= 0;
+            if (isPositive == positive) {
+                result[i++]= convert(value);
+            }
+        }
+        if (offset+max!=i) throw new IllegalStateException(String.format(""Max %d != array counter %d"",max,i));
+        if (next!=null) return next.collect(result,positive,i);
+        // Arrays.sort(result);
+        return result;
+    }
+
+    public int count(boolean outgoing) {
+        return counts[idx(outgoing)] + (next!=null ? next.count(outgoing) : 0);
+    }
+
+    private int idx(boolean outgoing) {
+        return outgoing?0:1;
+    }
+
+    public long first() {
+       if (values.hasData()) {
+           return convert(values.first());
+       }
+       if (next!=null) return next.first();
+       return -1L;
+    }
+
+    public long firstPositive() {
+       if (values.hasPositive()) {
+           return convert(values.firstPositive());
+       }
+       if (next!=null) return next.firstPositive();
+       return -1L;
+    }
+
+    public long firstNegative() {
+       if (values.hasNegative()) {
+           return convert(values.firstNegative());
+       }
+       if (next!= null) return next.firstNegative();
+       return -1L;
+    }
+
+    public long last() {
+        if (next!=null) return next.first();
+        if (values.hasData()) {
+            return convert(values.last());
+        }
+       return -1L;
+    }
+
+    private long convert(int value) {
+        if (value < 0) value = ~value;
+        return (long)highbit<<31 | value;
+    }
+}
diff --git a/src/main/java/org/neo4j/batchimport/collections/ConcurrentLongReverseRelationshipMap.java b/src/main/java/org/neo4j/batchimport/collections/ConcurrentLongReverseRelationshipMap.java
index 51e46d4..62a5ae0 100644
--- a/src/main/java/org/neo4j/batchimport/collections/ConcurrentLongReverseRelationshipMap.java
+++ b/src/main/java/org/neo4j/batchimport/collections/ConcurrentLongReverseRelationshipMap.java
@@ -1,5 +1,6 @@
 package org.neo4j.batchimport.collections;
 
+import edu.ucla.sspace.util.primitive.CompactIntSet;
 import edu.ucla.sspace.util.primitive.IntSet;
 
 import java.util.Arrays;
@@ -10,30 +11,18 @@
 * @since 27.10.12
 */
 public class ConcurrentLongReverseRelationshipMap implements ReverseRelationshipMap {
-    private final ConcurrentHashMap<Long,long[]> inner=new ConcurrentHashMap<Long,long[]>();
-    private final int arraySize;
+    private final ConcurrentHashMap<Long,CompactLongRecord> inner=new ConcurrentHashMap<Long,CompactLongRecord>();
 
-    public ConcurrentLongReverseRelationshipMap(int arraySize) {
-        this.arraySize = arraySize;
-    }
-
-    public void add(long key, long value) {
-        long[] ids = inner.get(key);
+    public void add(long key, long value, boolean outgoing) {
+        CompactLongRecord ids = inner.get(key);
         if (ids==null) {
-            ids = new long[arraySize];
-            Arrays.fill(ids, -1);
+            ids = new CompactLongRecord((byte)0);
             inner.put(key, ids);
         }
-        for (int i=0;i<arraySize;i++) {
-            if (ids[i]==-1) {
-                ids[i]=value;
-                return;
-            }
-        }
-        throw new ArrayIndexOutOfBoundsException(""Already ""+arraySize+"" values in array ""+Arrays.toString(ids));
+        ids.add(value,outgoing);
     }
 
-    public long[] remove(long key) {
+    public CompactLongRecord retrieve(long key) {
         return inner.remove(key);
     }
 
diff --git a/src/main/java/org/neo4j/batchimport/collections/IntArray.java b/src/main/java/org/neo4j/batchimport/collections/IntArray.java
new file mode 100644
index 0000000..4c21c73
--- /dev/null
+++ b/src/main/java/org/neo4j/batchimport/collections/IntArray.java
@@ -0,0 +1,68 @@
+package org.neo4j.batchimport.collections;
+
+/**
+* @author mh
+* @since 03.11.12
+*/
+public class IntArray {
+    volatile int[] data;
+    volatile int count;
+    volatile int negative;
+
+    public IntArray() {
+        this(64);
+    }
+
+    public IntArray(final int initial) {
+        this.data = new int[initial];
+    }
+    void add(int value) {
+        if (count == data.length) {
+            int[] newData = new int[data.length*2];
+            System.arraycopy(data,0,newData,0,data.length);
+            data = newData;
+        }
+        data[count++]=value;
+        if (value<0) negative++;
+    }
+
+    public int first() {
+        if (hasData()) return data[0];
+        throw new ArrayIndexOutOfBoundsException(""No data"");
+    }
+
+    public int firstNegative() {
+        if (hasNegative()) {
+            for (int i = 0; i < count; i++) {
+                if (data[i]<0) return data[i];
+            }
+        }
+        throw new ArrayIndexOutOfBoundsException(""No data"");
+    }
+
+    public int firstPositive() {
+        if (hasPositive()) {
+            for (int i = 0; i < count; i++) {
+                if (data[i] >= 0) return data[i];
+            }
+        }
+        throw new ArrayIndexOutOfBoundsException(""No data"");
+    }
+
+    public boolean hasData() {
+        return count > 0;
+    }
+
+    public boolean hasNegative() {
+        return negative>0;
+    }
+
+    public boolean hasPositive() {
+        return (count-negative) > 0;
+    }
+
+    public int last() {
+        if (hasData()) return data[count-1];
+        throw new ArrayIndexOutOfBoundsException(""No data"");
+    }
+}
diff --git a/src/main/java/org/neo4j/batchimport/collections/ReverseRelationshipMap.java b/src/main/java/org/neo4j/batchimport/collections/ReverseRelationshipMap.java
index 4976483..f379014 100644
--- a/src/main/java/org/neo4j/batchimport/collections/ReverseRelationshipMap.java
+++ b/src/main/java/org/neo4j/batchimport/collections/ReverseRelationshipMap.java
@@ -5,6 +5,6 @@
 * @since 27.10.12
 */
 public interface ReverseRelationshipMap {
-     void add(long nodeId, long relId);
-     long[] remove(long nodeId);
+     void add(long nodeId, long relId, boolean outgoing);
+     CompactLongRecord retrieve(long nodeId);
 }
diff --git a/src/main/java/org/neo4j/batchimport/handlers/RelationshipIdHandler.java b/src/main/java/org/neo4j/batchimport/handlers/RelationshipIdHandler.java
index 587c8cc..9a24554 100644
--- a/src/main/java/org/neo4j/batchimport/handlers/RelationshipIdHandler.java
+++ b/src/main/java/org/neo4j/batchimport/handlers/RelationshipIdHandler.java
@@ -1,9 +1,7 @@
 package org.neo4j.batchimport.handlers;
 
 import com.lmax.disruptor.EventHandler;
-import org.neo4j.batchimport.NodeStructFactory;
 import org.neo4j.batchimport.collections.ConcurrentLongReverseRelationshipMap;
-import org.neo4j.batchimport.collections.PrimitiveIntReverseRelationshipMap;
 import org.neo4j.batchimport.Utils;
 import org.neo4j.batchimport.collections.ReverseRelationshipMap;
 import org.neo4j.batchimport.structs.NodeStruct;
@@ -17,17 +15,8 @@
 public class RelationshipIdHandler implements EventHandler<NodeStruct> {
     volatile long relId = 0;
     // store reverse node-id to rel-id for future updates of relationship-records
-    final ReverseRelationshipMap futureModeRelIdQueueOutgoing;
-    final ReverseRelationshipMap futureModeRelIdQueueIncoming;
-
-    public RelationshipIdHandler(int relsPerNode) {
-        futureModeRelIdQueueOutgoing = new ConcurrentLongReverseRelationshipMap(relsPerNode);
-        futureModeRelIdQueueIncoming = new ConcurrentLongReverseRelationshipMap(relsPerNode);
-    }
-//    final ReverseRelationshipMap futureModeRelIdQueueOutgoing = new PrimitiveIntReverseRelationshipMap();
-//    final ReverseRelationshipMap futureModeRelIdQueueIncoming = new PrimitiveIntReverseRelationshipMap();
-    //final ReverseRelationshipMap futureModeRelIdQueueOutgoing = new ConcurrentReverseRelationshipMap(RELS_PER_NODE);
-    //final ReverseRelationshipMap futureModeRelIdQueueIncoming = new ConcurrentReverseRelationshipMap(RELS_PER_NODE);
+    // todo reuse and pool the CompactLongRecords, so we can skip IntArray creation
+    final ReverseRelationshipMap futureModeRelIdQueue = new ConcurrentLongReverseRelationshipMap();
 
     public void onEvent(NodeStruct event, long nodeId, boolean endOfBatch) throws Exception {
         for (int i = 0; i < event.relationshipCount; i++) {
@@ -37,8 +26,8 @@ public void onEvent(NodeStruct event, long nodeId, boolean endOfBatch) throws Ex
             storeFutureRelId(nodeId, relationship,relId);
         }
 
-        event.outgoingRelationshipsToUpdate = futureRelIds(nodeId, futureModeRelIdQueueOutgoing);
-        event.incomingRelationshipsToUpdate = futureRelIds(nodeId, futureModeRelIdQueueIncoming);
+        event.relationshipsToUpdate = futureModeRelIdQueue.retrieve(nodeId);
+
         event.nextRel = firstRelationshipId(event);
         event.maxRelationshipId = maxRelationshipId(event);
     }
@@ -46,31 +35,24 @@ public void onEvent(NodeStruct event, long nodeId, boolean endOfBatch) throws Ex
     private void storeFutureRelId(long nodeId, Relationship relationship, long relId) {
         long other = relationship.other();
         if (other < nodeId) return;
-        if (relationship.outgoing()) {
-            futureModeRelIdQueueIncoming.add(other, relId);
-        } else {
-            futureModeRelIdQueueOutgoing.add(other, relId);
-        }
-    }
-
-    private long[] futureRelIds(long nodeId, ReverseRelationshipMap futureRelIds) {
-        long[] relIds = futureRelIds.remove(nodeId);
-        if (relIds == null) return null;
-        return relIds;
+        final boolean otherDirection = !relationship.outgoing();
+        futureModeRelIdQueue.add(other, relId, otherDirection);
     }
 
     private long firstRelationshipId(NodeStruct event) {
         if (event.relationshipCount>0) return event.getRelationship(0).id;
-        if (event.outgoingRelationshipsToUpdate!=null) return event.outgoingRelationshipsToUpdate[0];
-        if (event.incomingRelationshipsToUpdate!=null) return event.incomingRelationshipsToUpdate[0];
+        if (event.relationshipsToUpdate !=null) {
+            long outgoingRelId = event.relationshipsToUpdate.firstPositive();
+            if (outgoingRelId!=-1) return outgoingRelId;
+            return event.relationshipsToUpdate.firstNegative();
+        }
         return Record.NO_PREV_RELATIONSHIP.intValue();
     }
 
     private long maxRelationshipId(NodeStruct event) {
         long result=Record.NO_NEXT_RELATIONSHIP.intValue();
 
-        if (event.incomingRelationshipsToUpdate!=null) result=Math.max(event.incomingRelationshipsToUpdate[Utils.size(event.incomingRelationshipsToUpdate)-1],result);
-        if (event.outgoingRelationshipsToUpdate!=null) result=Math.max(event.outgoingRelationshipsToUpdate[Utils.size(event.outgoingRelationshipsToUpdate)-1],result);
+        if (event.relationshipsToUpdate !=null) result=Math.max(event.relationshipsToUpdate.last(),result); // TODO max of both directions or just the last rel-id that was added, i.e. the biggest
         if (event.relationshipCount>0) result=Math.max(event.getRelationship(event.relationshipCount-1).id,result);
         return result;
     }
diff --git a/src/main/java/org/neo4j/batchimport/handlers/RelationshipWriteHandler.java b/src/main/java/org/neo4j/batchimport/handlers/RelationshipWriteHandler.java
index 1127afc..ef582cb 100644
--- a/src/main/java/org/neo4j/batchimport/handlers/RelationshipWriteHandler.java
+++ b/src/main/java/org/neo4j/batchimport/handlers/RelationshipWriteHandler.java
@@ -2,6 +2,7 @@
 
 import com.lmax.disruptor.EventHandler;
 import org.neo4j.batchimport.Utils;
+import org.neo4j.batchimport.collections.CompactLongRecord;
 import org.neo4j.batchimport.structs.NodeStruct;
 import org.neo4j.batchimport.structs.Relationship;
 import org.neo4j.kernel.impl.nioneo.store.Record;
@@ -26,10 +27,12 @@ public void onEvent(NodeStruct event, long nodeId, boolean endOfBatch) throws Ex
         relationshipWriter.start(event.maxRelationshipId);
 
         int count = event.relationshipCount;
-        long followingNextRelationshipId =
-                event.outgoingRelationshipsToUpdate!=null ? event.outgoingRelationshipsToUpdate[0] :
-                event.incomingRelationshipsToUpdate!=null ? event.incomingRelationshipsToUpdate[0] :
-                                                            Record.NO_NEXT_RELATIONSHIP.intValue();
+        long followingNextRelationshipId = Record.NO_NEXT_RELATIONSHIP.intValue();
+        if (event.relationshipsToUpdate !=null) {
+            long value = event.relationshipsToUpdate.firstPositive();
+            if (value == -1) value = event.relationshipsToUpdate.firstNegative();
+            if (value != -1) followingNextRelationshipId = value;
+        }
 
         long prevId = Record.NO_PREV_RELATIONSHIP.intValue();
         for (int i = 0; i < count; i++) {
@@ -40,22 +43,22 @@ public void onEvent(NodeStruct event, long nodeId, boolean endOfBatch) throws Ex
             counter++;
         }
 
-        followingNextRelationshipId =
-                event.incomingRelationshipsToUpdate!=null ? event.incomingRelationshipsToUpdate[0] :
-                                                            Record.NO_NEXT_RELATIONSHIP.intValue();
+        if (event.relationshipsToUpdate!=null) {
 
-        prevId = createUpdateRecords(event.outgoingRelationshipsToUpdate, prevId, followingNextRelationshipId,true);
+            followingNextRelationshipId = event.relationshipsToUpdate.firstNegative();
 
-        followingNextRelationshipId = Record.NO_NEXT_RELATIONSHIP.intValue();
+            prevId = createUpdateRecords(event.relationshipsToUpdate.getOutgoing(), prevId, followingNextRelationshipId,true);
 
-        createUpdateRecords(event.incomingRelationshipsToUpdate, prevId, followingNextRelationshipId, false);
+            followingNextRelationshipId = Record.NO_NEXT_RELATIONSHIP.intValue();
 
-        if (endOfBatch) relationshipWriter.flush();
+            createUpdateRecords(event.relationshipsToUpdate.getIncoming(), prevId, followingNextRelationshipId, false);
+        }
+            if (endOfBatch) relationshipWriter.flush();
     }
 
     private long createUpdateRecords(long[] relIds, long prevId, long followingNextRelationshipId, boolean outgoing) throws IOException {
-        if (relIds==null) return prevId;
-        int count = Utils.size(relIds);
+        if (relIds==null || relIds.length==0) return prevId;
+        int count = relIds.length;
         for (int i = 0; i < count; i++) {
             long nextId = i+1 < count ? relIds[i + 1] : followingNextRelationshipId;
             relationshipWriter.update(relIds[i], outgoing, prevId, nextId);
diff --git a/src/main/java/org/neo4j/batchimport/importer/RowData.java b/src/main/java/org/neo4j/batchimport/importer/RowData.java
index 13bab4e..7aa3503 100644
--- a/src/main/java/org/neo4j/batchimport/importer/RowData.java
+++ b/src/main/java/org/neo4j/batchimport/importer/RowData.java
@@ -104,7 +104,7 @@ public Map<String,Object> updateMap(String line, Object... header) {
 
     public Object[] updateArray(String line, Object... header) {
         process(line);
-        if (header.length > 0) {
+        if (header!=null && header.length > 0) {
             System.arraycopy(lineData, 0, header, 0, header.length);
         }
         return data;
diff --git a/src/main/java/org/neo4j/batchimport/structs/NodeStruct.java b/src/main/java/org/neo4j/batchimport/structs/NodeStruct.java
index 4378989..e1e9f35 100644
--- a/src/main/java/org/neo4j/batchimport/structs/NodeStruct.java
+++ b/src/main/java/org/neo4j/batchimport/structs/NodeStruct.java
@@ -1,5 +1,6 @@
 package org.neo4j.batchimport.structs;
 
+import org.neo4j.batchimport.collections.CompactLongRecord;
 import org.neo4j.kernel.impl.nioneo.store.Record;
 
 import java.util.ArrayList;
@@ -20,8 +21,7 @@ public class NodeStruct extends PropertyHolder {
 
     public volatile long lastPropertyId;
     public volatile long maxRelationshipId;
-    public volatile long[] outgoingRelationshipsToUpdate;
-    public volatile long[] incomingRelationshipsToUpdate;
+    public volatile CompactLongRecord relationshipsToUpdate;
     private static int avgRelCount;
     private static int relPropertyCount;
 
diff --git a/src/test/java/org/neo4j/batchimport/DisruptorBatchInserterTest.java b/src/test/java/org/neo4j/batchimport/DisruptorBatchInserterTest.java
index 924acdb..2a8db4d 100644
--- a/src/test/java/org/neo4j/batchimport/DisruptorBatchInserterTest.java
+++ b/src/test/java/org/neo4j/batchimport/DisruptorBatchInserterTest.java
@@ -18,7 +18,7 @@ public class DisruptorBatchInserterTest {
     public void testSelfRelationship() throws Exception {
         final NodeStruct struct = new NodeStruct(0);
         struct.addRel(0, true, 0);
-        new RelationshipIdHandler(1).onEvent(struct,0,false);
+        new RelationshipIdHandler().onEvent(struct,0,false);
         //new RelationshipWriteHandler(new RelationshipRecordWriter(neoStore.getRelationshipStore())).onEvent(struct,0,false);
     }
 }
diff --git a/src/test/java/org/neo4j/batchimport/DisruptorTest.java b/src/test/java/org/neo4j/batchimport/DisruptorTest.java
index ef16895..acc91e1 100644
--- a/src/test/java/org/neo4j/batchimport/DisruptorTest.java
+++ b/src/test/java/org/neo4j/batchimport/DisruptorTest.java
@@ -45,8 +45,8 @@ public class DisruptorTest {
     private final static Logger log = Logger.getLogger(DisruptorBatchInserter.class);
 
     public static final String STORE_DIR = ""target/test-db2"";
-    public static final int NODES_TO_CREATE = 1 * 1000 * 1000;
-    private static final boolean RUN_CHECK = true;
+    public static final int NODES_TO_CREATE = 100 * 1000 ;
+    private static final boolean RUN_CHECK = false;
 
     @SuppressWarnings(""unchecked"")
     public static void main(String[] args) throws Exception {
diff --git a/src/test/java/org/neo4j/batchimport/TestDataGenerator.java b/src/test/java/org/neo4j/batchimport/TestDataGenerator.java
index fc9e342..2449311 100644
--- a/src/test/java/org/neo4j/batchimport/TestDataGenerator.java
+++ b/src/test/java/org/neo4j/batchimport/TestDataGenerator.java
@@ -14,7 +14,7 @@
 @Ignore
 public class TestDataGenerator {
 
-    private static int NODES = 100 * 1000  * 1000; // * 1000;
+    private static int NODES = 1000  * 1000; // * 1000;
     private static final int RELS_PER_NODE = 50;
     private static final String[] TYPES = {""ONE"",""TWO"",""THREE"",""FOUR"",""FIVE"",""SIX"",""SEVEN"",""EIGHT"",""NINE"",""TEN""};
     public static final int NUM_TYPES = 10;
diff --git a/src/test/java/org/neo4j/batchimport/collections/CompactLongRecordTest.java b/src/test/java/org/neo4j/batchimport/collections/CompactLongRecordTest.java
new file mode 100644
index 0000000..4bda4f9
--- /dev/null
+++ b/src/test/java/org/neo4j/batchimport/collections/CompactLongRecordTest.java
@@ -0,0 +1,73 @@
+package org.neo4j.batchimport.collections;
+
+import org.junit.Test;
+
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author mh
+ * @since 03.11.12
+ */
+public class CompactLongRecordTest {
+
+    private static final int COUNT = 10000000;
+    private static final int LONGS = 1000;
+    private final CompactLongRecord record = new CompactLongRecord((byte)0);
+
+    @Test
+    public void testAddIntValues() throws Exception {
+        record.add(0, true);
+        record.add(Integer.MAX_VALUE, true);
+        long[] ids = record.getOutgoing();
+        assertEquals(2,record.count(true));
+        assertEquals(0,ids[0]);
+        assertEquals(Integer.MAX_VALUE,ids[1]);
+    }
+
+    @Test
+    public void testAddIncomingValues() throws Exception {
+        record.add(0, false);
+        record.add(Integer.MAX_VALUE, false);
+        assertEquals(2,record.count(false));
+        long[] ids = record.getIncoming();
+        assertEquals(0,ids[0]);
+        assertEquals(Integer.MAX_VALUE,ids[1]);
+    }
+
+    @Test
+    public void testAddLongValues() throws Exception {
+        record.add(1L << 32, true);
+        record.add(1L << 33, true);
+        long[] ids = record.getOutgoing();
+        assertEquals(2,record.count(true));
+        assertEquals(1L << 32,ids[0]);
+        assertEquals(1L << 33,ids[1]);
+    }
+
+    @Test
+    public void testPerformance() throws Exception {
+        long[] input = generateLongs(LONGS);
+
+        long free = Runtime.getRuntime().freeMemory();
+        long time = System.currentTimeMillis();
+
+        for (int i=0;i< COUNT;i++) {
+            record.add(input[i % LONGS],true);
+        }
+
+        final long usedMemory = free - Runtime.getRuntime().freeMemory();
+        System.out.println(""took ""+(System.currentTimeMillis()-time)+ "" ms, used ""+ usedMemory / 1024/1024+ "" MB"");
+        assertEquals(COUNT,record.count(true));
+    }
+
+    private long[] generateLongs(int count) {
+        final Random rnd = new Random();
+        final long[] result = new long[count];
+        for (int i = 0; i < count; i++) {
+            result[i] = rnd.nextLong() & 0x7FFFFFFFFL;
+        }
+        return result;
+    }
+}
diff --git a/src/test/java/org/neo4j/batchimport/collections/IntArrayTest.java b/src/test/java/org/neo4j/batchimport/collections/IntArrayTest.java
new file mode 100644
index 0000000..f4a0d5c
--- /dev/null
+++ b/src/test/java/org/neo4j/batchimport/collections/IntArrayTest.java
@@ -0,0 +1,63 @@
+package org.neo4j.batchimport.collections;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author mh
+ * @since 03.11.12
+ */
+public class IntArrayTest {
+
+    private final IntArray array = new IntArray();
+
+    @Test
+    public void testAdd() throws Exception {
+        array.add(42);
+        assertEquals(1, array.count);
+        assertEquals(42, array.data[0]);
+    }
+
+    @Test
+    public void testEmptyArray() throws Exception {
+        assertEquals(false,array.hasData());
+        assertEquals(false,array.hasPositive());
+        assertEquals(false,array.hasNegative());
+    }
+
+    @Test
+    public void testHasPositive() throws Exception {
+        array.add(42);
+        assertEquals(true,array.hasData());
+        assertEquals(true,array.hasPositive());
+        assertEquals(false,array.hasNegative());
+    }
+    @Test
+    public void testHasNegative() throws Exception {
+        array.add(-1);
+        assertEquals(true,array.hasData());
+        assertEquals(false,array.hasPositive());
+        assertEquals(true, array.hasNegative());
+    }
+
+    @Test
+    public void testPositiveLast() throws Exception {
+        array.add(-1);
+        array.add(42);
+        assertEquals(2, array.count);
+        assertEquals(true, array.hasPositive());
+        assertEquals(true, array.hasNegative());
+        assertEquals(42, array.firstPositive());
+        assertEquals(-1, array.firstNegative());
+    }
+
+    @Test
+    public void testPositiveFirst() throws Exception {
+        array.add(42);
+        array.add(-1);
+        assertEquals(2, array.count);
+        assertEquals(42, array.firstPositive());
+        assertEquals(-1, array.firstNegative());
+    }
+}"
9f3095892e2f404db70063380a02f78e41271a7c,Delta Spike,"CDI-279 add a unit test for our JSF-2-CDI scope mapping
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
new file mode 100644
index 000000000..7da680f79
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
@@ -0,0 +1,83 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.deltaspike.test.jsf.impl.scope.mapped;
+
+
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.scope.mapped.beans.JsfApplicationScopedBackingBean;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+
+/**
+ * Test for the DeltaSpike ViewScoped context
+ */
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class MappedJsfContextTest
+{
+    @Drone
+    private WebDriver driver;
+
+    @ArquillianResource
+    private URL contextPath;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        return ShrinkWrap
+                .create(WebArchive.class, ""mappedJsfContetxtTest.war"")
+                .addPackage(JsfApplicationScopedBackingBean.class.getPackage())
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+                .addAsWebInfResource(""default/WEB-INF/web.xml"", ""web.xml"")
+                .addAsWebResource(""mappedJsfContextTest/page.xhtml"", ""page.xhtml"")
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ""beans.xml"");
+    }
+
+
+    @Test
+    @RunAsClient
+    public void testViewScopedContext() throws Exception
+    {
+        driver.get(new URL(contextPath, ""page.xhtml?req=47&sess=48&app=49"").toString());
+
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""test:reqValue""), ""47"").apply(driver));
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""test:sessValue""), ""48"").apply(driver));
+        Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id(""test:appValue""), ""49"").apply(driver));
+    }
+
+}
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfApplicationScopedBackingBean.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfApplicationScopedBackingBean.java
new file mode 100644
index 000000000..d2ab01a9d
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfApplicationScopedBackingBean.java
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.deltaspike.test.jsf.impl.scope.mapped.beans;
+
+import javax.faces.bean.ApplicationScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+
+/**
+ * JSF ApplicationScoped sample backing bean.
+ * This Bean will get mapped to it's corresponding CDI scope
+ * via our {@link org.apache.deltaspike.jsf.impl.scope.mapped.MappedJsf2ScopeExtension}
+ */
+@ApplicationScoped
+@Named
+public class JsfApplicationScopedBackingBean implements Serializable
+{
+    private int i = 0;
+
+    public int getI()
+    {
+        return i;
+    }
+
+    public void setI(int i)
+    {
+        this.i = i;
+    }
+}
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfRequestScopedBackingBean.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfRequestScopedBackingBean.java
new file mode 100644
index 000000000..de75dc8f8
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfRequestScopedBackingBean.java
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.deltaspike.test.jsf.impl.scope.mapped.beans;
+
+import javax.faces.bean.RequestScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+
+/**
+ * JSF RequestScoped sample backing bean.
+ * This Bean will get mapped to it's corresponding CDI scope
+ * via our {@link org.apache.deltaspike.jsf.impl.scope.mapped.MappedJsf2ScopeExtension}
+ */
+@RequestScoped
+@Named
+public class JsfRequestScopedBackingBean implements Serializable
+{
+    private int i = 0;
+
+    public int getI()
+    {
+        return i;
+    }
+
+    public void setI(int i)
+    {
+        this.i = i;
+    }
+}
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfSessionScopedBackingBean.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfSessionScopedBackingBean.java
new file mode 100644
index 000000000..c8db16d73
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfSessionScopedBackingBean.java
@@ -0,0 +1,45 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* ""License""); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.deltaspike.test.jsf.impl.scope.mapped.beans;
+
+import javax.faces.bean.SessionScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+
+/**
+ * JSF SessionScoped sample backing bean.
+ * This Bean will get mapped to it's corresponding CDI scope
+ * via our {@link org.apache.deltaspike.jsf.impl.scope.mapped.MappedJsf2ScopeExtension}
+ */
+@SessionScoped
+@Named
+public class JsfSessionScopedBackingBean implements Serializable
+{
+    private int i = 0;
+
+    public int getI()
+    {
+        return i;
+    }
+
+    public void setI(int i)
+    {
+        this.i = i;
+    }
+}
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/mappedJsfContextTest/page.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/mappedJsfContextTest/page.xhtml
new file mode 100644
index 000000000..bfde13c9a
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/resources/mappedJsfContextTest/page.xhtml
@@ -0,0 +1,43 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    ""License""); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!DOCTYPE html PUBLIC ""-//W3C//DTD XHTML 1.0 Strict//EN"" ""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"">
+<html xmlns=""http://www.w3.org/1999/xhtml""
+      xmlns:h=""http://java.sun.com/jsf/html""
+      xmlns:f=""http://java.sun.com/jsf/core"">
+
+<body>
+<f:view>
+    <f:metadata>
+        <f:viewParam name=""req"" id=""req"" value=""#{jsfRequestScopedBackingBean.i}""/>
+        <f:viewParam name=""sess"" id=""sess"" value=""#{jsfSessionScopedBackingBean.i}""/>
+        <f:viewParam name=""app"" id=""app"" value=""#{jsfApplicationScopedBackingBean.i}""/>
+    </f:metadata>
+    <div>
+
+    <h:form id=""test"">
+        <h:outputText id=""reqValue"" value=""#{jsfRequestScopedBackingBean.i}""/><br/>
+        <h:outputText id=""sessValue"" value=""#{jsfSessionScopedBackingBean.i}""/><br/>
+        <h:outputText id=""appValue"" value=""#{jsfApplicationScopedBackingBean.i}""/><br/>
+    </h:form>
+    </div>
+</f:view>
+</body>
+</html>"
7aea840155ec68cb9386b415ca59cfd1c76a62fe,Delta Spike,"DELTASPIKE-355 add Alternative MessageInterpolator using MessageFormatter

Simple add an <alternative> to your beans.xml where you gonna like to use it.
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java
new file mode 100644
index 000000000..4230d4e31
--- /dev/null
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.message;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
+import java.io.Serializable;
+import java.util.Locale;
+import java.text.MessageFormat;
+
+import org.apache.deltaspike.core.api.message.MessageInterpolator;
+
+/**
+ * This is an Alternative implementation of a {@link MessageInterpolator} which
+ * uses java.text.MessageFormat for formatting.
+ *
+ * Please note that for some EE containers you might need to add this &lt;alternative&gt>
+ * to all JARs and classpath entries beanx.xml files.
+ *
+ * {@inheritDoc}
+ */
+@ApplicationScoped
+@Alternative
+public class MessageFormatMessageInterpolator implements MessageInterpolator, Serializable
+{
+    private static final long serialVersionUID = -8854087197813424812L;
+
+    @Override
+    public String interpolate(String messageTemplate, Serializable[] arguments, Locale locale)
+    {
+        MessageFormat messageFormat = new MessageFormat(messageTemplate, locale);
+        return messageFormat.format(arguments);
+    }
+}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessage.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessage.java
new file mode 100644
index 000000000..caf90acdc
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessage.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.core.api.message;
+
+import org.apache.deltaspike.core.api.message.MessageBundle;
+
+/**
+ * This is a test {@link MessageBundle} which uses the
+ * Alternative {@link org.apache.deltaspike.core.impl.message.MessageFormatMessageInterpolator}
+ * for formatting
+ */
+@MessageBundle
+public interface MessageFormattedMessage
+{
+
+    String welcomeTo(String name);
+
+    String incomeSinceDays(int days, float income);
+}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java
new file mode 100644
index 000000000..be3e69afc
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.core.api.message;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+import org.apache.deltaspike.core.impl.message.MessageBundleExtension;
+import org.apache.deltaspike.core.impl.message.MessageFormatMessageInterpolator;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test for {@link MessageFormatMessageInterpolator}
+ * formatted messages.
+ */
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class MessageFormattedMessageTest
+{
+    @Inject
+    private MessageFormattedMessage message;
+
+
+    /**
+     * X TODO creating a WebArchive is only a workaround because JavaArchive
+     * cannot contain other archives.
+     */
+    @Deployment
+    public static WebArchive deploy()
+    {
+        Asset beansXml = new StringAsset(
+                ""<beans><alternatives>"" +
+                        ""<class>"" + MessageFormatMessageInterpolator.class.getName() + ""</class>"" +
+                        ""</alternatives></beans>""
+        );
+        JavaArchive testJar = ShrinkWrap
+                .create(JavaArchive.class, ""messageFormattedMessageTest.jar"")
+                .addPackage(MessageFormattedMessageTest.class.getPackage())
+                .addAsManifestResource(beansXml, ""beans.xml"");
+
+        return ShrinkWrap
+                .create(WebArchive.class, ""messageFormattedMessageTest.war"")
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
+                .addAsLibraries(testJar)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ""beans.xml"")
+                .addAsServiceProvider(Extension.class,
+                        MessageBundleExtension.class);
+    }
+
+    @Test
+    public void testSimpleMessage()
+    {
+        assertEquals(""Welcome to DeltaSpike"", message.welcomeTo(""DeltaSpike""));
+        assertEquals(""The income since 42 days is 12.34"", message.incomeSinceDays(42, 12.34f));
+    }
+
+    @Test
+    public void testNullMessage()
+    {
+        assertEquals(""Welcome to 'null'"", message.welcomeTo(null));
+    }
+}
diff --git a/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/MessageFormattedMessage.properties b/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/MessageFormattedMessage.properties
new file mode 100644
index 000000000..b6cfa6676
--- /dev/null
+++ b/deltaspike/core/impl/src/test/resources/org/apache/deltaspike/test/core/api/message/MessageFormattedMessage.properties
@@ -0,0 +1,19 @@
+#Licensed to the Apache Software Foundation (ASF) under one
+#or more contributor license agreements.  See the NOTICE file
+#distributed with this work for additional information
+#regarding copyright ownership.  The ASF licenses this file
+#to you under the Apache License, Version 2.0 (the
+#""License""); you may not use this file except in compliance
+#with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing,
+#software distributed under the License is distributed on an
+#""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#KIND, either express or implied.  See the License for the
+#specific language governing permissions and limitations
+#under the License.
+
+welcomeTo = Welcome to {0}
+incomeSinceDays = The income since {0} days is {1}"
73ea4cb8ebbefe934d9f088e99903b15772fa445,orientdb,Implemented self-repair in case the security is- broken. This new method in the ODatabaseListener interface will allow to- handle corruptions in better way.--Console now displays a message and after a user input fix it. Cool!-,a,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseListener.java b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseListener.java
index 5a420c50066..a8490605974 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseListener.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseListener.java
@@ -40,4 +40,15 @@ public interface ODatabaseListener {
 	public void onAfterTxCommit(final ODatabase iDatabase);
 
 	public void onClose(final ODatabase iDatabase);
+
+	/**
+	 * Callback to decide if repair the database upon corruption.
+	 * 
+	 * @param iDatabase
+	 *          Target database
+	 * @param iReason
+	 *          Reason of corruption
+	 * @return true if repair must be done, otherwise false
+	 */
+	public boolean onCorruptionRepairDatabase(final ODatabase iDatabase, final String iReason);
 }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
index 37d180e65b8..895012330bf 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
@@ -31,6 +31,7 @@
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
 import com.orientechnologies.orient.core.db.ODatabase;
 import com.orientechnologies.orient.core.db.ODatabaseComplex;
+import com.orientechnologies.orient.core.db.ODatabaseListener;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.ODatabaseWrapperAbstract;
 import com.orientechnologies.orient.core.db.raw.ODatabaseRaw;
@@ -108,6 +109,18 @@ public <DB extends ODatabase> DB open(final String iUserName, final String iUser
 
 			if (getStorage() instanceof OStorageEmbedded) {
 				user = getMetadata().getSecurity().authenticate(iUserName, iUserPassword);
+				final Set<ORole> roles = user.getRoles();
+				if (roles == null || roles.isEmpty() || roles.iterator().next() == null) {
+					// SEEMS CORRUPTED: INSTALL DEFAULT ROLE
+					for (ODatabaseListener l : underlying.getListeners()) {
+						if (l.onCorruptionRepairDatabase(this, ""security metadata are corrupted: current user '"" + user.getName()
+								+ ""' has no roles defined"")) {
+							user = null;
+							user = metadata.getSecurity().repair();
+							break;
+						}
+					}
+				}
 				registerHook(new OUserTrigger());
 				registerHook(new OClassIndexManager());
 			} else
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java
index e80e4654b67..10207f34f7e 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexMVRBTreeAbstract.java
@@ -698,6 +698,10 @@ public void onBeforeTxBegin(final ODatabase iDatabase) {
 	public void onBeforeTxRollback(final ODatabase iDatabase) {
 	}
 
+	public boolean onCorruptionRepairDatabase(final ODatabase iDatabase, final String iReason) {
+		return false;
+	}
+
 	public void onAfterTxRollback(final ODatabase iDatabase) {
 
 		acquireExclusiveLock();
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurity.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurity.java
index bec469d398c..4bb12c949d4 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurity.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurity.java
@@ -46,5 +46,7 @@ public interface OSecurity {
 
 	public List<ODocument> getRoles();
 
+	public OUser repair();
+
 	public void close();
 }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityNull.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityNull.java
index 7e084c73d7f..cd3aee0abe9 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityNull.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityNull.java
@@ -68,4 +68,8 @@ public OUser authenticate(String iUsername, String iUserPassword) {
 
 	public void close() {
 	}
+
+	public OUser repair() {
+		return null;
+	}
 }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityProxy.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityProxy.java
index bfc5c9212c6..f9c14268cf2 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityProxy.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityProxy.java
@@ -28,8 +28,8 @@
  * @author Luca Garulli
  * 
  */
-public class OSecurityProxy extends OProxedResource<OSecurityShared> implements OSecurity {
-	public OSecurityProxy(final OSecurityShared iDelegate, final ODatabaseRecord iDatabase) {
+public class OSecurityProxy extends OProxedResource<OSecurity> implements OSecurity {
+	public OSecurityProxy(final OSecurity iDelegate, final ODatabaseRecord iDatabase) {
 		super(iDelegate, iDatabase);
 	}
 
@@ -80,4 +80,8 @@ public List<ODocument> getRoles() {
 	public String toString() {
 		return delegate.toString();
 	}
+
+	public OUser repair() {
+		return delegate.repair();
+	}
 }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityShared.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityShared.java
index 9469ead306a..c028166aef9 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityShared.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityShared.java
@@ -168,25 +168,10 @@ public OUser create() {
 		acquireExclusiveLock();
 		try {
 
-			final ODatabaseRecord database = getDatabase();
-
-			if (!database.getMetadata().getSchema().getClasses().isEmpty())
+			if (!getDatabase().getMetadata().getSchema().getClasses().isEmpty())
 				throw new OSecurityException(""Default users and roles already installed"");
 
-			// CREATE ROLE AND USER SCHEMA CLASSES
-			final OClass roleClass = database.getMetadata().getSchema().createClass(""ORole"");
-			roleClass.createProperty(""name"", OType.STRING).setMandatory(true).setNotNull(true);
-			roleClass.createProperty(""mode"", OType.BYTE);
-			roleClass.createProperty(""rules"", OType.EMBEDDEDMAP, OType.BYTE);
-
-			final OClass userClass = database.getMetadata().getSchema().createClass(""OUser"");
-			userClass.createProperty(""name"", OType.STRING).setMandatory(true).setNotNull(true);
-			userClass.createProperty(""password"", OType.STRING).setMandatory(true).setNotNull(true);
-			userClass.createProperty(""roles"", OType.LINKSET, roleClass);
-
-			// CREATE ROLES AND USERS
-			final ORole adminRole = createRole(ORole.ADMIN, ORole.ALLOW_MODES.ALLOW_ALL_BUT);
-			final OUser adminUser = createUser(OUser.ADMIN, OUser.ADMIN, new String[] { adminRole.getName() });
+			final OUser adminUser = createMetadata();
 
 			final ORole readerRole = createRole(""reader"", ORole.ALLOW_MODES.DENY_ALL_BUT);
 			readerRole.addRule(ODatabaseSecurityResources.DATABASE, ORole.PERMISSION_READ);
@@ -222,6 +207,57 @@ public OUser create() {
 		}
 	}
 
+	/**
+	 * Repairs the security structure if broken by creating the ADMIN role and user with default password.
+	 * 
+	 * @return
+	 */
+	public OUser repair() {
+		acquireExclusiveLock();
+		try {
+
+			return createMetadata();
+
+		} finally {
+			releaseExclusiveLock();
+		}
+	}
+
+	protected OUser createMetadata() {
+		final ODatabaseRecord database = getDatabase();
+
+		OClass roleClass = database.getMetadata().getSchema().getClass(""ORole"");
+		if (roleClass == null)
+			roleClass = database.getMetadata().getSchema().createClass(""ORole"");
+		if (!roleClass.existsProperty(""name""))
+			roleClass.createProperty(""name"", OType.STRING).setMandatory(true).setNotNull(true);
+		if (!roleClass.existsProperty(""mode""))
+			roleClass.createProperty(""mode"", OType.BYTE);
+		if (!roleClass.existsProperty(""rules""))
+			roleClass.createProperty(""rules"", OType.EMBEDDEDMAP, OType.BYTE);
+
+		OClass userClass = database.getMetadata().getSchema().getClass(""OUser"");
+		if (userClass == null)
+			userClass = database.getMetadata().getSchema().createClass(""OUser"");
+		if (!userClass.existsProperty(""name""))
+			userClass.createProperty(""name"", OType.STRING).setMandatory(true).setNotNull(true);
+		if (!userClass.existsProperty(""password""))
+			userClass.createProperty(""password"", OType.STRING).setMandatory(true).setNotNull(true);
+		if (!userClass.existsProperty(""roles""))
+			userClass.createProperty(""roles"", OType.LINKSET, roleClass);
+
+		// CREATE ROLES AND USERS
+		ORole adminRole = getRole(ORole.ADMIN);
+		if (adminRole == null)
+			adminRole = createRole(ORole.ADMIN, ORole.ALLOW_MODES.ALLOW_ALL_BUT);
+
+		OUser adminUser = getUser(OUser.ADMIN);
+		if (adminUser == null)
+			adminUser = createUser(OUser.ADMIN, OUser.ADMIN, new String[] { adminRole.getName() });
+
+		return adminUser;
+	}
+
 	public void close() {
 	}
 
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DbListenerTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DbListenerTest.java
index d40f050f987..297035367a8 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DbListenerTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/DbListenerTest.java
@@ -51,6 +51,7 @@ public class DbListenerTest {
 	protected int									onCreate											= 0;
 	protected int									onDelete											= 0;
 	protected int									onOpen												= 0;
+	protected int									onCorruption									= 0;
 
 	protected int									onRecordPulled								= 0;
 	protected int									onClusterConfigurationChange	= 0;
@@ -92,6 +93,11 @@ public void onDelete(ODatabase iDatabase) {
 		public void onOpen(ODatabase iDatabase) {
 			onOpen++;
 		}
+
+		public boolean onCorruptionRepairDatabase(ODatabase iDatabase, final String iReason) {
+			onCorruption++;
+			return true;
+		}
 	}
 
 	@Parameters(value = ""url"")
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java
index 186e7488884..72accc88b11 100644
--- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java
+++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TransactionAtomicTest.java
@@ -126,6 +126,10 @@ public void onDelete(ODatabase iDatabase) {
 
 			public void onOpen(ODatabase iDatabase) {
 			}
+
+			public boolean onCorruptionRepairDatabase(ODatabase iDatabase, final String iReason) {
+				return true;
+			}
 		});
 
 		db.commit();
diff --git a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
index c8c614531fd..2b07332f920 100644
--- a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
+++ b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Scanner;
 import java.util.Set;
 
 import com.orientechnologies.common.console.TTYConsoleReader;
@@ -169,6 +170,8 @@ public void connect(
 			currentDatabase = new ODatabaseDocumentTx(iURL);
 			if (currentDatabase == null)
 				throw new OException(""Database "" + iURL + "" not found"");
+
+			currentDatabase.registerListener(new OConsoleDatabaseListener(this));
 			currentDatabase.open(iUserName, iUserPassword);
 
 			currentDatabaseName = currentDatabase.getName();
@@ -1430,7 +1433,15 @@ private void dumpRecordDetails() {
 		out.println();
 	}
 
-	public void onMessage(String iText) {
+	public String ask(final String iText) {
+		out.print(iText);
+		final Scanner scanner = new Scanner(in);
+		final String answer = scanner.nextLine();
+		scanner.close();
+		return answer;
+	}
+
+	public void onMessage(final String iText) {
 		out.print(iText);
 	}
 
diff --git a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseListener.java b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseListener.java
new file mode 100644
index 00000000000..64e1fbcf6a4
--- /dev/null
+++ b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseListener.java
@@ -0,0 +1,45 @@
+package com.orientechnologies.orient.console;
+
+import com.orientechnologies.orient.core.db.ODatabase;
+import com.orientechnologies.orient.core.db.ODatabaseListener;
+
+public class OConsoleDatabaseListener implements ODatabaseListener {
+	OConsoleDatabaseApp	console;
+
+	public OConsoleDatabaseListener(OConsoleDatabaseApp console) {
+		this.console = console;
+	}
+
+	public void onCreate(ODatabase iDatabase) {
+	}
+
+	public void onDelete(ODatabase iDatabase) {
+	}
+
+	public void onOpen(ODatabase iDatabase) {
+	}
+
+	public void onBeforeTxBegin(ODatabase iDatabase) {
+	}
+
+	public void onBeforeTxRollback(ODatabase iDatabase) {
+	}
+
+	public void onAfterTxRollback(ODatabase iDatabase) {
+	}
+
+	public void onBeforeTxCommit(ODatabase iDatabase) {
+	}
+
+	public void onAfterTxCommit(ODatabase iDatabase) {
+	}
+
+	public void onClose(ODatabase iDatabase) {
+	}
+
+	public boolean onCorruptionRepairDatabase(ODatabase iDatabase, final String iReason) {
+		final String answer = console
+				.ask(""\nDatabase seems corrupted. The cause is "" + iReason + "".\nDo you want to repair it (Y/n)? "");
+		return answer.length() == 0 || answer.equalsIgnoreCase(""Y"") || answer.equalsIgnoreCase(""Yes"");
+	}
+}"
62add03a15bb9ba9eeb58c1de8a5c1a421ff068c,Vala,"sqlite3: add binding for user defined function API
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/sqlite3.vapi b/vapi/sqlite3.vapi
index b592527065..1e725e09d0 100644
--- a/vapi/sqlite3.vapi
+++ b/vapi/sqlite3.vapi
@@ -49,6 +49,8 @@ namespace Sqlite {
 		public void progress_handler (int n_opcodes, Sqlite.ProgressCallback? progress_handler);
 		public void commit_hook (CommitCallback? commit_hook);
 		public void rollback_hook (RollbackCallback? rollback_hook);
+		[CCode (simple_generics = true)]
+		public int create_function (string zFunctionName, int nArg, int eTextRep, void * user_data, UserFuncCallback? xFunc, UserFuncCallback? xStep, UserFuncFinishCallback? xFinal);
 	}
 
 	[CCode (instance_pos = 0)]
@@ -58,6 +60,10 @@ namespace Sqlite {
 	public delegate int ProgressCallback ();
 	public delegate int CommitCallback ();
 	public delegate void RollbackCallback ();
+	[CCode (has_target = false)]
+	public delegate void UserFuncCallback (Sqlite.Context context, [CCode (array_length_pos = 1.1)] Sqlite.Value[] values);
+	[CCode (has_target = false)]
+	public delegate void UserFuncFinishCallback (Sqlite.Context context);
 
 	/* Dynamically Typed Value Object */
 	[Compact]
@@ -162,6 +168,36 @@ namespace Sqlite {
 	public const int MUTEX_FAST;
 	[CCode (cname = ""SQLITE_MUTEX_RECURSIVE"")]
 	public const int MUTEX_RECURSIVE;
+	[CCode (cname = ""SQLITE_UTF8"")]
+	public const int UTF8;
+	[CCode (cname = ""SQLITE_UTF16LE"")]
+	public const int UTF16LE;
+	[CCode (cname = ""SQLITE_UTF16BE"")]
+	public const int UTF16BE;
+	[CCode (cname = ""SQLITE_UTF16"")]
+	public const int UTF16;
+	[CCode (cname = ""SQLITE_ANY"")]
+	public const int ANY;
+	[CCode (cname = ""SQLITE_UTF16_ALIGNED"")]
+	public const int UTF16_ALIGNED;
+
+	[CCode (cname = ""int"", cprefix = ""SQLITE_STATUS_"")]
+	public enum Status {
+		MEMORY_USED,
+		PAGECACHE_USED,
+		PAGECACHE_OVERFLOW,
+		SCRATCH_USED,
+		SCRATCH_OVERFLOW,
+		MALLOC_SIZE,
+		PARSER_STACK,
+		PAGECACHE_SIZE,
+		SCRATCH_SIZE,
+
+		[CCode (cname = ""SQLITE_STMTSTATUS_FULLSCAN_STEP"")]
+		STMT_FULLSCAN_STEP,
+		[CCode (cname = ""SQLITE_STMTSTATUS_SORT"")]
+		STMT_SORT
+	}
 
 	/* SQL Statement Object */
 	[Compact]
@@ -175,6 +211,8 @@ namespace Sqlite {
 		public int data_count ();
 		public unowned Database db_handle ();
 		public int reset ();
+		[CCode (cname = ""sqlite3_stmt_status"")]
+		public int status (Sqlite.Status op, int resetFlg);
 		public int step ();
 		public int bind_blob (int index, void* value, int n, GLib.DestroyNotify destroy_notify);
 		public int bind_double (int index, double value);
@@ -205,5 +243,32 @@ namespace Sqlite {
 		public int @try ();
 		public void leave ();
 	}
+
+	[Compact, CCode (cname = ""sqlite3_context"", cprefix = ""sqlite3_"")]
+	public class Context {
+		public void result_blob (uint8[] data, GLib.DestroyNotify? destroy_notify = GLib.g_free);
+		public void result_double (double value);
+		public void result_error (string value, int error_code);
+		public void result_error_toobig ();
+		public void result_error_nomem ();
+		public void result_error_code (int error_code);
+		public void result_int (int value);
+		public void result_int64 (int64 value);
+		public void result_null ();
+		public void result_text (string value, int length = -1, GLib.DestroyNotify? destroy_notify = GLib.g_free);
+		public void result_value (Sqlite.Value value);
+		public void result_zeroblob (int n);
+
+		[CCode (simple_generics = true)]
+		public unowned T user_data<T> ();
+		[CCode (simple_generics = true)]
+		public void set_auxdata<T> (int N, owned T data);
+		[CCode (simple_generics = true)]
+		public unowned T get_auxdata<T> (int N);
+		[CCode (cname = ""sqlite3_context_db_handle"")]
+		public unowned Database db_handle ();
+		[CCode (cname = ""sqlite3_aggregate_context"")]
+		public void * aggregate (int n_bytes);
+	}
 }"
100f571c9a2835d5a30a55374b9be74c147e031f,ReactiveX-RxJava,forEach with Action1 but not Observer--I re-read the MSDN docs and found the previous implementation wasn't complying with the contract.--http://msdn.microsoft.com/en-us/library/hh211815(v=vs.103).aspx--I believe this now does.-,c,https://github.com/ReactiveX/RxJava,"diff --git a/language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/ObservableTests.groovy b/language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/ObservableTests.groovy
index 7f62af5724..967c096691 100644
--- a/language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/ObservableTests.groovy
+++ b/language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/ObservableTests.groovy
@@ -22,6 +22,7 @@ import java.util.Arrays;
 
 import org.junit.Before;
 import org.junit.Test;
+import static org.junit.Assert.*;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -222,33 +223,17 @@ def class ObservableTests {
         verify(a, times(1)).received(3);
     }
 
-    @Test
-    public void testForEachWithComplete() {
-        Observable.create(new AsyncObservable()).forEach({ result -> a.received(result)}, {}, {a.received('done')});
-        verify(a, times(1)).received(1);
-        verify(a, times(1)).received(2);
-        verify(a, times(1)).received(3);
-        verify(a, times(1)).received(""done"");
-    }
-
     @Test
     public void testForEachWithError() {
-        Observable.create(new AsyncObservable()).forEach({ result -> throw new RuntimeException('err')}, {err -> a.received(err.message)});
-        verify(a, times(0)).received(1);
-        verify(a, times(0)).received(2);
-        verify(a, times(0)).received(3);
-        verify(a, times(1)).received(""err"");
-        verify(a, times(0)).received(""done"");
-    }
-
-    @Test
-    public void testForEachWithCompleteAndError() {
-        Observable.create(new AsyncObservable()).forEach({ result -> throw new RuntimeException('err')}, {err -> a.received(err.message)}, {a.received('done')},);
+        try {
+            Observable.create(new AsyncObservable()).forEach({ result -> throw new RuntimeException('err')});
+            fail(""we expect an exception to be thrown"");
+        }catch(Exception e) {
+        
+        }
         verify(a, times(0)).received(1);
         verify(a, times(0)).received(2);
         verify(a, times(0)).received(3);
-        verify(a, times(1)).received(""err"");
-        verify(a, times(0)).received(""done"");
     }
 
     def class AsyncObservable implements Func1<Observer<Integer>, Subscription> {
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
index 86e85be0f5..ba9cc6827b 100644
--- a/rxjava-core/src/main/java/rx/Observable.java
+++ b/rxjava-core/src/main/java/rx/Observable.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -334,33 +335,39 @@ public void onNext(T args) {
     }
 
     /**
-     * Blocking version of {@link #subscribe(Observer)}.
+     * Invokes an action for each element in the observable sequence, and blocks until the sequence is terminated.
      * <p>
      * NOTE: This will block even if the Observable is asynchronous.
+     * <p>
+     * This is similar to {@link #subscribe(Observer)} but blocks. Because it blocks it does not need the {@link Observer#onCompleted()} or {@link Observer#onError(Exception)} methods.
      * 
-     * @param observer
+     * @param onNext
+     *            {@link Action1}
+     * @throws RuntimeException
+     *             if error occurs
      */
-    public void forEach(final Observer<T> observer) {
+    public void forEach(final Action1<T> onNext) {
         final CountDownLatch latch = new CountDownLatch(1);
+        final AtomicReference<Exception> exceptionFromOnError = new AtomicReference<Exception>();
+
         subscribe(new Observer<T>() {
             public void onCompleted() {
-                try {
-                    observer.onCompleted();
-                } finally {
-                    latch.countDown();
-                }
+                latch.countDown();
             }
 
             public void onError(Exception e) {
-                try {
-                    observer.onError(e);
-                } finally {
-                    latch.countDown();
-                }
+                /*
+                 * If we receive an onError event we set the reference on the outer thread
+                 * so we can git it and throw after the latch.await().
+                 * 
+                 * We do this instead of throwing directly since this may be on a different thread and the latch is still waiting.
+                 */
+                exceptionFromOnError.set(e);
+                latch.countDown();
             }
 
             public void onNext(T args) {
-                observer.onNext(args);
+                onNext.call(args);
             }
         });
         // block until the subscription completes and then return
@@ -369,46 +376,21 @@ public void onNext(T args) {
         } catch (InterruptedException e) {
             throw new RuntimeException(""Interrupted while waiting for subscription to complete."", e);
         }
-    }
-
-    @SuppressWarnings({ ""rawtypes"", ""unchecked"" })
-    public void forEach(final Map<String, Object> callbacks) {
-        // lookup and memoize onNext
-        Object _onNext = callbacks.get(""onNext"");
-        if (_onNext == null) {
-            throw new RuntimeException(""onNext must be implemented"");
-        }
-        final FuncN onNext = Functions.from(_onNext);
-
-        forEach(new Observer() {
-
-            public void onCompleted() {
-                Object onComplete = callbacks.get(""onCompleted"");
-                if (onComplete != null) {
-                    Functions.from(onComplete).call();
-                }
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                Object onError = callbacks.get(""onError"");
-                if (onError != null) {
-                    Functions.from(onError).call(e);
-                }
-            }
 
-            public void onNext(Object args) {
-                onNext.call(args);
+        if (exceptionFromOnError.get() != null) {
+            if (exceptionFromOnError.get() instanceof RuntimeException) {
+                throw (RuntimeException) exceptionFromOnError.get();
+            } else {
+                throw new RuntimeException(exceptionFromOnError.get());
             }
-
-        });
+        }
     }
 
     @SuppressWarnings({ ""rawtypes"", ""unchecked"" })
     public void forEach(final Object o) {
-        if (o instanceof Observer) {
-            // in case a dynamic language is not correctly handling the overloaded methods and we receive an Observer just forward to the correct method.
-            forEach((Observer) o);
+        if (o instanceof Action1) {
+            // in case a dynamic language is not correctly handling the overloaded methods and we receive an Action1 just forward to the correct method.
+            forEach((Action1) o);
         }
 
         // lookup and memoize onNext
@@ -417,156 +399,15 @@ public void forEach(final Object o) {
         }
         final FuncN onNext = Functions.from(o);
 
-        forEach(new Observer() {
-
-            public void onCompleted() {
-                // do nothing
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                // no callback defined
-            }
-
-            public void onNext(Object args) {
-                onNext.call(args);
-            }
-
-        });
-    }
-
-    public void forEach(final Action1<T> onNext) {
-
-        forEach(new Observer<T>() {
-
-            public void onCompleted() {
-                // do nothing
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                // no callback defined
-            }
-
-            public void onNext(T args) {
-                if (onNext == null) {
-                    throw new RuntimeException(""onNext must be implemented"");
-                }
-                onNext.call(args);
-            }
-
-        });
-    }
-
-    @SuppressWarnings({ ""rawtypes"", ""unchecked"" })
-    public void forEach(final Object onNext, final Object onError) {
-        // lookup and memoize onNext
-        if (onNext == null) {
-            throw new RuntimeException(""onNext must be implemented"");
-        }
-        final FuncN onNextFunction = Functions.from(onNext);
-
-        forEach(new Observer() {
+        forEach(new Action1() {
 
-            public void onCompleted() {
-                // do nothing
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                if (onError != null) {
-                    Functions.from(onError).call(e);
-                }
-            }
-
-            public void onNext(Object args) {
-                onNextFunction.call(args);
-            }
-
-        });
-    }
-
-    public void forEach(final Action1<T> onNext, final Action1<Exception> onError) {
-
-        forEach(new Observer<T>() {
-
-            public void onCompleted() {
-                // do nothing
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                if (onError != null) {
-                    onError.call(e);
-                }
-            }
-
-            public void onNext(T args) {
-                if (onNext == null) {
-                    throw new RuntimeException(""onNext must be implemented"");
-                }
+            public void call(Object args) {
                 onNext.call(args);
             }
 
         });
     }
 
-    @SuppressWarnings({ ""rawtypes"", ""unchecked"" })
-    public void forEach(final Object onNext, final Object onError, final Object onComplete) {
-        // lookup and memoize onNext
-        if (onNext == null) {
-            throw new RuntimeException(""onNext must be implemented"");
-        }
-        final FuncN onNextFunction = Functions.from(onNext);
-
-        forEach(new Observer() {
-
-            public void onCompleted() {
-                if (onComplete != null) {
-                    Functions.from(onComplete).call();
-                }
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                if (onError != null) {
-                    Functions.from(onError).call(e);
-                }
-            }
-
-            public void onNext(Object args) {
-                onNextFunction.call(args);
-            }
-
-        });
-    }
-
-    public void forEach(final Action1<T> onNext, final Action1<Exception> onError, final Action0 onComplete) {
-
-        forEach(new Observer<T>() {
-
-            public void onCompleted() {
-                onComplete.call();
-            }
-
-            public void onError(Exception e) {
-                handleError(e);
-                if (onError != null) {
-                    onError.call(e);
-                }
-            }
-
-            public void onNext(T args) {
-                if (onNext == null) {
-                    throw new RuntimeException(""onNext must be implemented"");
-                }
-                onNext.call(args);
-            }
-
-        });
-    }
-
-
     /**
      * Allow the {@link RxJavaErrorHandler} to receive the exception from onError.
      *"
4399428cdc7b00fb60da7dcc1fdcf8c8ace049ed,Delta Spike,"add DOAP file for DeltaSpike
",p,https://github.com/apache/deltaspike,"diff --git a/doap_DeltaSpike.rdf b/doap_DeltaSpike.rdf
new file mode 100644
index 000000000..0691c8e53
--- /dev/null
+++ b/doap_DeltaSpike.rdf
@@ -0,0 +1,54 @@
+<?xml version=""1.0""?>
+<?xml-stylesheet type=""text/xsl""?>
+<rdf:RDF xml:lang=""en""
+         xmlns=""http://usefulinc.com/ns/doap#"" 
+         xmlns:rdf=""http://www.w3.org/1999/02/22-rdf-syntax-ns#"" 
+         xmlns:asfext=""http://projects.apache.org/ns/asfext#""
+         xmlns:foaf=""http://xmlns.com/foaf/0.1/"">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the ""License""); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+         http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an ""AS IS"" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <Project rdf:about=""http://deltaspike.apache.org"">
+    <created>2014-04-11</created>
+    <license rdf:resource=""http://usefulinc.com/doap/licenses/asl20"" />
+    <name>Apache DeltaSpike</name>
+    <homepage rdf:resource=""http://deltaspike.apache.org"" />
+    <asfext:pmc rdf:resource=""http://deltaspike.apache.org"" />
+    <shortdesc>DeltaSpike is a collection of portable Extensions for CDI Containers</shortdesc>
+    <description>Apache DeltaSpike is a portable JSR-299 CDI (Contexts and Dependency Injection for Java) Extension library which contains lots of useful tools and helpers which are missing in the CDI core spec.
+
+DeltaSpike is not a CDI-container itself, but a portable
+Extension library which can run on all CDI-containers!
+
+DeltaSpike is tested and runs on many Java EE Servers like Apache TomEE, Red Hat JBoss Application Server, JBoss Wildfly, Oracle WebLogic, Oracle Glassfish, IBM WebSphere, and also on simple Servlet containers like Apache Tomcat or Jetty in combination with either JBoss Weld or Apache OpenWebBeans.</description>
+    <bug-database rdf:resource=""https://issues.apache.org/jira/browse/DELTASPIKE"" />
+    <mailing-list rdf:resource=""http://deltaspike.apache.org/community.html#mailing-lists"" />
+    <programming-language>Java</programming-language>
+    <category rdf:resource=""http://projects.apache.org/category/javaee"" />
+    <repository>
+      <SVNRepository>
+        <location rdf:resource=""https://git-wip-us.apache.org/repos/asf/deltaspike.git""/>
+        <browse rdf:resource=""https://git-wip-us.apache.org/repos/asf?p=deltaspike.git""/>
+      </SVNRepository>
+    </repository>
+    <maintainer>
+      <foaf:Person>
+        <foaf:name>Mark Struberg</foaf:name>
+          <foaf:mbox rdf:resource=""mailto:struberg@apache.org""/>
+      </foaf:Person>
+    </maintainer>
+  </Project>
+</rdf:RDF>"
d4ffca41d7ef1d04ab3d4a1580817adace72a5da,hadoop,YARN-3108. ApplicationHistoryServer doesn't process- -D arguments (Chang Li via jeagles)--(cherry picked from commit 30a8778c632c0f57cdd005080a470065a60756a8)-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ed6642cfa97c0..37d9a1cbbb510 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -185,6 +185,9 @@ Release 2.7.0 - UNRELEASED
     scheduler web UI and queue initialize/refresh logging. 
     (Eric Payne via wangda)
 
+    YARN-3108. ApplicationHistoryServer doesn't process -D arguments (Chang Li
+    via jeagles)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 352460558c380..0bafd3695eedd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -33,6 +33,7 @@
 import org.apache.hadoop.service.CompositeService;
 import org.apache.hadoop.service.Service;
 import org.apache.hadoop.util.ExitUtil;
+import org.apache.hadoop.util.GenericOptionsParser;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.hadoop.util.StringUtils;
@@ -153,6 +154,7 @@ static ApplicationHistoryServer launchAppHistoryServer(String[] args) {
         new CompositeServiceShutdownHook(appHistoryServer),
         SHUTDOWN_HOOK_PRIORITY);
       YarnConfiguration conf = new YarnConfiguration();
+      new GenericOptionsParser(conf, args);
       appHistoryServer.init(conf);
       appHistoryServer.start();
     } catch (Throwable t) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
index cf85ff7dd426d..a7e7daa1c58ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
@@ -106,6 +106,32 @@ public void testLaunch() throws Exception {
     }
   }
 
+ //test launch method with -D arguments
+ @Test(timeout = 60000)
+ public void testLaunchWithArguments() throws Exception {
+   ExitUtil.disableSystemExit();
+   ApplicationHistoryServer historyServer = null;
+   try {
+     // Not able to modify the config of this test case,
+     // but others have been customized to avoid conflicts
+     String[] args = new String[2];
+     args[0]=""-D"" + YarnConfiguration.TIMELINE_SERVICE_LEVELDB_TTL_INTERVAL_MS + ""=4000"";
+     args[1]=""-D"" + YarnConfiguration.TIMELINE_SERVICE_TTL_MS + ""=200"";
+     historyServer =
+         ApplicationHistoryServer.launchAppHistoryServer(args);
+     Configuration conf = historyServer.getConfig();
+     assertEquals(""4000"", conf.get(YarnConfiguration.TIMELINE_SERVICE_LEVELDB_TTL_INTERVAL_MS));
+     assertEquals(""200"", conf.get(YarnConfiguration.TIMELINE_SERVICE_TTL_MS));
+   } catch (ExitUtil.ExitException e) {
+     assertEquals(0, e.status);
+     ExitUtil.resetFirstExitException();
+     fail();
+   } finally {
+     if (historyServer != null) {
+       historyServer.stop();
+     }
+   }
+ }
   @Test(timeout = 240000)
   public void testFilterOverrides() throws Exception {"
2b0f0fa30f2ed20965abbf0caf4b1e00d57b4f37,Delta Spike,"DELTASPIKE-348 prepare for more ClientWindow samples
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/examples/jsf-examples/pom.xml b/deltaspike/examples/jsf-examples/pom.xml
index d205ff16e..0a709df2b 100644
--- a/deltaspike/examples/jsf-examples/pom.xml
+++ b/deltaspike/examples/jsf-examples/pom.xml
@@ -55,7 +55,11 @@
                     <plugin>
                         <groupId>org.apache.openejb.maven</groupId>
                         <artifactId>tomee-maven-plugin</artifactId>
-                        <version>${tomee.version}</version>
+                        <version>1.0.1</version>
+                        <configuration>
+                            <tomeeVersion>${tomee.version}</tomeeVersion>
+                        </configuration>
+
                     </plugin>
                 </plugins>
             </build>"
02e52f66e05400002b043794d7fcd9d165239c2a,tapiji,"increases generation performace of auto-complete proposals.

Fixes Issue 62.

",p,https://github.com/tapiji/tapiji,"diff --git a/org.eclipse.babel.tapiji.tools.java/src/org/eclipse/babel/tapiji/tools/java/ui/MessageCompletionProposalComputer.java b/org.eclipse.babel.tapiji.tools.java/src/org/eclipse/babel/tapiji/tools/java/ui/MessageCompletionProposalComputer.java
index 9b481e7c..5a4eecb4 100644
--- a/org.eclipse.babel.tapiji.tools.java/src/org/eclipse/babel/tapiji/tools/java/ui/MessageCompletionProposalComputer.java
+++ b/org.eclipse.babel.tapiji.tools.java/src/org/eclipse/babel/tapiji/tools/java/ui/MessageCompletionProposalComputer.java
@@ -28,6 +28,11 @@
 public class MessageCompletionProposalComputer implements
 	IJavaCompletionProposalComputer {
 
+    private ResourceAuditVisitor csav;
+    private IResource resource;
+    private CompilationUnit cu;
+    private ResourceBundleManager manager;
+
     public MessageCompletionProposalComputer() {
 
     }
@@ -37,7 +42,6 @@ public List<ICompletionProposal> computeCompletionProposals(
 	    ContentAssistInvocationContext context, IProgressMonitor monitor) {
 
 	List<ICompletionProposal> completions = new ArrayList<ICompletionProposal>();
-	ResourceAuditVisitor csav;
 
 	if (!InternationalizationNature
 		.hasNature(((JavaContentAssistInvocationContext) context)
@@ -75,17 +79,19 @@ public List<ICompletionProposal> computeCompletionProposals(
 
 	    // Check if the string literal is up to be written within the
 	    // context of a resource-bundle accessor method
-	    ResourceBundleManager manager = ResourceBundleManager
-		    .getManager(javaContext.getCompilationUnit().getResource()
-			    .getProject());
 
-	    IResource resource = javaContext.getCompilationUnit().getResource();
+	    if (cu == null) {
+		manager = ResourceBundleManager.getManager(javaContext
+			.getCompilationUnit().getResource().getProject());
+
+		resource = javaContext.getCompilationUnit().getResource();
 
-	    csav = new ResourceAuditVisitor(null, manager);
+		csav = new ResourceAuditVisitor(null, manager);
 
-	    CompilationUnit cu = ASTutils.getCompilationUnit(resource);
+		cu = ASTutils.getCompilationUnit(resource);
 
-	    cu.accept(csav);
+		cu.accept(csav);
+	    }
 
 	    if (csav.getKeyAt(new Long(tokenOffset)) != null && isStringLiteral) {
 		completions.addAll(getResourceBundleCompletionProposals(
@@ -216,7 +222,10 @@ public String getErrorMessage() {
 
     @Override
     public void sessionEnded() {
-
+	cu = null;
+	csav = null;
+	resource = null;
+	manager = null;
     }
 
     @Override"
91517fad3eae6b93ded1cb16a518b1a37ec06e5c,restlet-framework-java,Fixed potential NPE when the product name is null.- Reported by Vincent Ricard.--,c,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/com.noelios.restlet/src/com/noelios/restlet/Engine.java b/modules/com.noelios.restlet/src/com/noelios/restlet/Engine.java
index 99e1c21761..7dbcab4ed7 100644
--- a/modules/com.noelios.restlet/src/com/noelios/restlet/Engine.java
+++ b/modules/com.noelios.restlet/src/com/noelios/restlet/Engine.java
@@ -582,7 +582,7 @@ public String formatUserAgent(List<Product> products)
                 .hasNext();) {
             final Product product = iterator.next();
             if ((product.getName() == null)
-                    && (product.getName().length() == 0)) {
+                    || (product.getName().length() == 0)) {
                 throw new IllegalArgumentException(
                         ""Product name cannot be null."");
             }
diff --git a/modules/org.restlet.gwt/src/org/restlet/gwt/internal/Engine.java b/modules/org.restlet.gwt/src/org/restlet/gwt/internal/Engine.java
index b52fa867bb..df932134a8 100644
--- a/modules/org.restlet.gwt/src/org/restlet/gwt/internal/Engine.java
+++ b/modules/org.restlet.gwt/src/org/restlet/gwt/internal/Engine.java
@@ -208,7 +208,7 @@ public String formatUserAgent(List<Product> products)
                 .hasNext();) {
             final Product product = iterator.next();
             if ((product.getName() == null)
-                    && (product.getName().length() == 0)) {
+                    || (product.getName().length() == 0)) {
                 throw new IllegalArgumentException(
                         ""Product name cannot be null."");
             }"
726d32238c7ff6958664bb766cbb5d78c283024a,Valadoc,"libvaladoc: gir-importer, c-resolver : various improvements
",a,https://github.com/GNOME/vala/,"diff --git a/src/driver/0.10.x/treebuilder.vala b/src/driver/0.10.x/treebuilder.vala
index 6bc66b4aa8..2f1cd7c99c 100644
--- a/src/driver/0.10.x/treebuilder.vala
+++ b/src/driver/0.10.x/treebuilder.vala
@@ -776,7 +776,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_class == null && element.name == ""string"";
 
-		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, element.get_cname (), Vala.GDBusModule.get_dbus_name (element), element.get_param_spec_function (), element.get_type_id (), element.get_ref_function (), element.get_unref_function (), element.get_take_value_function (), element.get_get_value_function (), element.get_set_value_function (), element.is_fundamental (), element.is_abstract, is_basic_type, element);
+		Class node = new Class (parent, file, element.name, get_access_modifier (element), comment, element.get_cname (), Vala.GDBusModule.get_dbus_name (element), element.get_type_id (), element.get_param_spec_function (), element.get_ref_function (), element.get_unref_function (), element.get_take_value_function (), element.get_get_value_function (), element.get_set_value_function (), element.is_fundamental (), element.is_abstract, is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
@@ -836,7 +836,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_type == null && (element.is_boolean_type () || element.is_floating_type () || element.is_integer_type ());
 
-		Struct node = new Struct (parent, file, element.name, get_access_modifier(element), comment, element.get_cname(), element.get_dup_function (), element.get_free_function (), is_basic_type, element);
+		Struct node = new Struct (parent, file, element.name, get_access_modifier (element), comment, element.get_cname(), element.get_type_id (), element.get_dup_function (), element.get_free_function (), is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
diff --git a/src/driver/0.13.x/treebuilder.vala b/src/driver/0.13.x/treebuilder.vala
index 9cfac52589..d898cee2b1 100644
--- a/src/driver/0.13.x/treebuilder.vala
+++ b/src/driver/0.13.x/treebuilder.vala
@@ -233,11 +233,17 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		}
 	}
 
-	private string get_ccode_type_id (Vala.Class node) {
+	private string? get_ccode_type_id (Vala.CodeNode node) {
 #if VALA_0_13_X
 		return Vala.CCodeBaseModule.get_ccode_type_id (node);
 #else
-		return node.get_type_id ();
+		if (node is Vala.Class) {
+			return ((Vala.Class) node).get_type_id ();
+		} else (node is Vala.Struct) {
+			return ((Vala.Struct) node).get_type_id ();
+		}
+
+		return null;
 #endif
 	}
 
@@ -874,7 +880,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_class == null && element.name == ""string"";
 
-		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, get_cname (element), Vala.GDBusModule.get_dbus_name (element), get_param_spec_function (element), get_ccode_type_id (element), get_ref_function (element), get_unref_function (element), get_take_value_function (element), get_get_value_function (element), get_set_value_function (element), element.is_fundamental (), element.is_abstract, is_basic_type, element);
+		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, get_cname (element), Vala.GDBusModule.get_dbus_name (element), get_ccode_type_id (element), get_param_spec_function (element), get_ref_function (element), get_unref_function (element), get_take_value_function (element), get_get_value_function (element), get_set_value_function (element), element.is_fundamental (), element.is_abstract, is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
@@ -934,7 +940,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_type == null && (element.is_boolean_type () || element.is_floating_type () || element.is_integer_type ());
 
-		Struct node = new Struct (parent, file, element.name, get_access_modifier(element), comment, get_cname(element), get_dup_function (element), get_free_function (element), is_basic_type, element);
+		Struct node = new Struct (parent, file, element.name, get_access_modifier (element), comment, get_cname (element), get_ccode_type_id (element), get_dup_function (element), get_free_function (element), is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
diff --git a/src/driver/0.14.x/treebuilder.vala b/src/driver/0.14.x/treebuilder.vala
index daff9b2538..f61b08f24d 100644
--- a/src/driver/0.14.x/treebuilder.vala
+++ b/src/driver/0.14.x/treebuilder.vala
@@ -233,7 +233,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		}
 	}
 
-	private string get_ccode_type_id (Vala.Class node) {
+	private string get_ccode_type_id (Vala.CodeNode node) {
 		return Vala.CCodeBaseModule.get_ccode_type_id (node);
 	}
 
@@ -808,7 +808,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_class == null && element.name == ""string"";
 
-		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, get_cname (element), Vala.GDBusModule.get_dbus_name (element), get_param_spec_function (element), get_ccode_type_id (element), get_ref_function (element), get_unref_function (element), get_take_value_function (element), get_get_value_function (element), get_set_value_function (element), element.is_fundamental (), element.is_abstract, is_basic_type, element);
+		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, get_cname (element), Vala.GDBusModule.get_dbus_name (element), get_ccode_type_id (element), get_param_spec_function (element), get_ref_function (element), get_unref_function (element), get_take_value_function (element), get_get_value_function (element), get_set_value_function (element), element.is_fundamental (), element.is_abstract, is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
@@ -868,7 +868,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_type == null && (element.is_boolean_type () || element.is_floating_type () || element.is_integer_type ());
 
-		Struct node = new Struct (parent, file, element.name, get_access_modifier(element), comment, get_cname(element), get_dup_function (element), get_free_function (element), is_basic_type, element);
+		Struct node = new Struct (parent, file, element.name, get_access_modifier(element), comment, get_cname(element), get_ccode_type_id (element), get_dup_function (element), get_free_function (element), is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
diff --git a/src/driver/0.16.x/treebuilder.vala b/src/driver/0.16.x/treebuilder.vala
index 512d7b18f9..3687610f28 100644
--- a/src/driver/0.16.x/treebuilder.vala
+++ b/src/driver/0.16.x/treebuilder.vala
@@ -237,7 +237,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		}
 	}
 
-	private string get_ccode_type_id (Vala.Class node) {
+	private string? get_ccode_type_id (Vala.CodeNode node) {
 		return Vala.CCodeBaseModule.get_ccode_type_id (node);
 	}
 
@@ -245,32 +245,32 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		return Vala.CCodeBaseModule.is_reference_counting (sym);
 	}
 
-	private string get_ref_function (Vala.Class sym) {
+	private string? get_ref_function (Vala.Class sym) {
 		return Vala.CCodeBaseModule.get_ccode_ref_function (sym);
 	}
 
-	private string get_unref_function (Vala.Class sym) {
+	private string? get_unref_function (Vala.Class sym) {
 		return Vala.CCodeBaseModule.get_ccode_unref_function (sym);
 	}
 
-	private string get_finish_name (Vala.Method m) {
+	private string? get_finish_name (Vala.Method m) {
 		return Vala.CCodeBaseModule.get_ccode_finish_name (m);
 	}
 
-	private string get_take_value_function (Vala.Class sym) {
+	private string? get_take_value_function (Vala.Class sym) {
 		return Vala.CCodeBaseModule.get_ccode_take_value_function (sym);
 	}
 
-	private string get_get_value_function (Vala.Class sym) {
+	private string? get_get_value_function (Vala.Class sym) {
 		return Vala.CCodeBaseModule.get_ccode_get_value_function (sym);
 	}
 
-	private string get_set_value_function (Vala.Class sym) {
+	private string? get_set_value_function (Vala.Class sym) {
 		return Vala.CCodeBaseModule.get_ccode_set_value_function (sym);
 	}
 
 
-	private string get_param_spec_function (Vala.CodeNode sym) {
+	private string? get_param_spec_function (Vala.CodeNode sym) {
 		return Vala.CCodeBaseModule.get_ccode_param_spec_function (sym);
 	}
 
@@ -278,11 +278,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 		return Vala.CCodeBaseModule.get_ccode_dup_function (sym);
 	}
 
-	private string get_free_function (Vala.TypeSymbol sym) {
+	private string? get_free_function (Vala.TypeSymbol sym) {
 		return Vala.CCodeBaseModule.get_ccode_free_function (sym);
 	}
 
-	private string get_nick (Vala.Property prop) {
+	private string? get_nick (Vala.Property prop) {
 		return Vala.CCodeBaseModule.get_ccode_nick (prop);
 	}
 
@@ -832,7 +832,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_class == null && element.name == ""string"";
 
-		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, get_cname (element), Vala.GDBusModule.get_dbus_name (element), get_param_spec_function (element), get_ccode_type_id (element), get_ref_function (element), get_unref_function (element), get_take_value_function (element), get_get_value_function (element), get_set_value_function (element), element.is_fundamental (), element.is_abstract, is_basic_type, element);
+		Class node = new Class (parent, file, element.name, get_access_modifier(element), comment, get_cname (element), Vala.GDBusModule.get_dbus_name (element), get_ccode_type_id (element), get_param_spec_function (element), get_ref_function (element), get_unref_function (element), get_take_value_function (element), get_get_value_function (element), get_set_value_function (element), element.is_fundamental (), element.is_abstract, is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
@@ -892,7 +892,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
 
 		bool is_basic_type = element.base_type == null && (element.is_boolean_type () || element.is_floating_type () || element.is_integer_type ());
 
-		Struct node = new Struct (parent, file, element.name, get_access_modifier(element), comment, get_cname(element), get_dup_function (element), get_free_function (element), is_basic_type, element);
+		Struct node = new Struct (parent, file, element.name, get_access_modifier (element), comment, get_cname (element), get_ccode_type_id (element), get_dup_function (element), get_free_function (element), is_basic_type, element);
 		symbol_map.set (element, node);
 		parent.add_child (node);
 
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 14a8bfa90e..310a3dbd13 100755
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -41,6 +41,7 @@ libvaladoc_la_VALASOURCES = \
 	importer/documentationimporter.vala \
 	importer/valadocdocumentationimporter.vala \
 	importer/valadocdocumentationimporterscanner.vala \
+	importer/girdocumentationimporter.vala \
 	api/symbolaccessibility.vala \
 	api/sourcecomment.vala \
 	api/girsourcecomment.vala \
diff --git a/src/libvaladoc/api/struct.vala b/src/libvaladoc/api/struct.vala
index d0ebe5b800..58d33f3d1d 100755
--- a/src/libvaladoc/api/struct.vala
+++ b/src/libvaladoc/api/struct.vala
@@ -30,9 +30,10 @@ using Valadoc.Content;
 public class Valadoc.Api.Struct : TypeSymbol {
 	private string? dup_function_cname;
 	private string? free_function_cname;
+	private string? type_id;
 	private string? cname;
 
-	public Struct (Node parent, SourceFile file, string name, SymbolAccessibility accessibility, SourceComment? comment, string? cname, string? dup_function_cname, string? free_function_cname, bool is_basic_type, void* data) {
+	public Struct (Node parent, SourceFile file, string name, SymbolAccessibility accessibility, SourceComment? comment, string? cname, string? type_id, string? dup_function_cname, string? free_function_cname, bool is_basic_type, void* data) {
 		base (parent, file, name, accessibility, comment, is_basic_type, data);
 
 		this.dup_function_cname = dup_function_cname;
@@ -57,6 +58,13 @@ public class Valadoc.Api.Struct : TypeSymbol {
 		return cname;
 	}
 
+	/**
+	 * Returns the C symbol representing the runtime type id for this data type.
+	 */
+	public string? get_type_id () {
+		return type_id;
+	}
+
 	/**
 	 * Returns the C function name that duplicates instances of this data
 	 * type.
diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala
index 1298d06924..0133b0bef8 100755
--- a/src/libvaladoc/api/tree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -156,6 +156,14 @@ public class Valadoc.Api.Tree {
 		return null;
 	}
 
+	public TypeSymbol? search_symbol_type_cstr (string cname) {
+		if (_cresolver == null) {
+			_cresolver = new CTypeResolver (this);
+		}
+
+		return _cresolver.resolve_symbol_type (cname);		
+	}
+
 	public Node? search_symbol_cstr (Node? element, string cname) {
 		if (_cresolver == null) {
 			_cresolver = new CTypeResolver (this);
diff --git a/src/libvaladoc/ctyperesolver.vala b/src/libvaladoc/ctyperesolver.vala
index a7adac8b2f..0467d48c78 100755
--- a/src/libvaladoc/ctyperesolver.vala
+++ b/src/libvaladoc/ctyperesolver.vala
@@ -28,13 +28,15 @@ using Gee;
  * Resolves symbols by C-names
  */
 public class Valadoc.CTypeResolver : Visitor {
+	private Map<string, Api.TypeSymbol> types = new HashMap<string, Api.TypeSymbol> ();
 	private Map<string, Api.Node> nodes = new HashMap<string, Api.Node> ();
+	private Api.Tree tree;
 
 	public CTypeResolver (Api.Tree tree) {
 		tree.accept (this);
+		this.tree = tree;
 	}
 
-
 	private string convert_array_to_camelcase (string[] elements) {
 		StringBuilder builder = new StringBuilder ();
 
@@ -72,10 +74,7 @@ public class Valadoc.CTypeResolver : Visitor {
 		if (is_capitalized_and_underscored (name)) {
 			string[] segments = name.split (""_"");
 			unowned string last_segment = segments[segments.length - 1];
-			if (last_segment == ""ERROR"") {
-			} else if (last_segment == ""TYPE"") {
-				segments.resize (segments.length - 1);
-			} else {
+			if (last_segment != ""ERROR"") {
 				return null;
 			}
 
@@ -92,6 +91,28 @@ public class Valadoc.CTypeResolver : Visitor {
 		return null;
 	}
 
+	public Api.TypeSymbol? resolve_symbol_type (string name) {
+		TypeSymbol? symbol = types.get (name);
+		if (symbol != null) {
+			return symbol;
+		}
+
+		if (is_capitalized_and_underscored (name)) {
+			string[] segments = name.split (""_"");
+
+			if (segments[segments.length - 1] == ""TYPE"") {
+				segments.resize (segments.length - 1);
+				return types.get (convert_array_to_camelcase (segments));
+			} else if (segments.length > 2 && segments[1] == ""TYPE"") {
+				string[] _segments = segments[1:segments.length];
+				_segments[0] = segments[0];
+				return types.get (convert_array_to_camelcase (_segments));
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Resolves symbols by C-names
 	 *
@@ -127,9 +148,29 @@ public class Valadoc.CTypeResolver : Visitor {
 			return nodes.get (alternative);
 		}
 
+		if (element != null && _name.has_prefix ("":"")) {
+			if (element is Class && ((Class) element).get_cname () != null) {
+				return nodes.get (((Class) element).get_cname () + ""."" + _name);
+			} else if (element is Struct && ((Struct) element).get_cname () != null) {
+				return nodes.get (((Struct) element).get_cname () + ""."" + _name);
+			}
+		}
+
+		if (name == ""dgettext"") {
+			return nodes.get (""g_dgettext"");
+		} else if (name == ""printf"") {
+			return this.tree.search_symbol_str (null, ""GLib.FileStream.printf"");
+		}
+
 		return null;
 	}
 
+	private void register_symbol_type (string? name, Api.TypeSymbol symbol) {
+		if (name != null) {
+			types.set (name, symbol);
+		}
+	}
+
 	private void register_symbol (string? name, Api.Node node) {
 		if (name != null) {
 			nodes.set (name.replace (""-"", ""_""), node);
@@ -187,6 +228,7 @@ public class Valadoc.CTypeResolver : Visitor {
 	 * {@inheritDoc}
 	 */
 	public override void visit_class (Class item) {
+		register_symbol_type (item.get_type_id (), item);
 		register_symbol (item.get_cname (), item);
 		item.accept_all_children (this, false);
 	}
@@ -195,6 +237,7 @@ public class Valadoc.CTypeResolver : Visitor {
 	 * {@inheritDoc}
 	 */
 	public override void visit_struct (Struct item) {
+		register_symbol_type (item.get_type_id (), item);
 		register_symbol (item.get_cname (), item);
 		item.accept_all_children (this, false);
 	}
diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index 48e52276b9..e9873e43ff 100644
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -32,6 +32,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 	private Token current;
 
 	private LinkedList<string> stack = new LinkedList<string> ();
+	private LinkedList<LinkedList<Block>> footnotes = new LinkedList<LinkedList<Block>> ();
 
 	private ContentFactory factory;
 	private ErrorReporter reporter;
@@ -47,9 +48,10 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		this.scanner.reset (comment.content);
 		this.show_warnings = !comment.file.package.is_package || settings.verbose;
 		this.comment_lines = null;
+		this.footnotes.clear ();
 		this.comment = comment;
-		current = null;
-		stack.clear ();
+		this.current = null;
+		this.stack.clear ();
 	}
 
 	private void report_unexpected_token (Token got, string expected) {
@@ -100,6 +102,21 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 			comment.taglets.add (taglet);
 		}
 
+		bool first = true;
+		foreach (LinkedList<Block> note in this.footnotes) {
+			if (first == true && note.size > 0) {
+				Paragraph p = note.first () as Paragraph;
+				if (p == null) {
+					p = factory.create_paragraph ();
+					comment.content.add (p);
+				}
+
+				p.content.insert (0, factory.create_text (""\n""));
+			}
+			comment.content.add_all (note);
+			first = false;
+		}
+
 		comment.check (tree, element, reporter, settings);
 		return comment;
 	}
@@ -234,7 +251,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		next ();
 
 		// TODO: check xml
-		while (current.type != TokenType.XML_CLOSE && current.content != tagname && current.type != TokenType.EOF) {
+		while (!(current.type == TokenType.XML_CLOSE && current.content == tagname) && current.type != TokenType.EOF) {
 			if (current.type == TokenType.XML_OPEN) {
 			} else if (current.type == TokenType.XML_CLOSE) {
 			} else if (current.type == TokenType.XML_COMMENT) {
@@ -311,22 +328,26 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		next ();
 	}
 
-	private void parse_xref () {
+	private Run? parse_xref () {
 		if (!check_xml_open_tag (""xref"")) {
 			this.report_unexpected_token (current, ""<xref>"");
-			return;
+			return null;
 		}
 
 		string linkend = current.attributes.get (""linkend"");
 		next ();
 		// TODO register xref
 
+		Run run = factory.create_run (Run.Style.ITALIC);
+		run.content.add (factory.create_text (linkend));
+
 		if (!check_xml_close_tag (""xref"")) {
 			this.report_unexpected_token (current, ""</xref>"");
-			return;
+			return run;
 		}
 
 		next ();
+		return run;
 	}
 
 	private Run? parse_highlighted_template (string tag_name, Run.Style style) {
@@ -674,7 +695,15 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 			parse_docbook_spaces ();
 		}
 
-		append_block_content_not_null (content, parse_docbook_programlisting ());
+		if (current.type == TokenType.XML_OPEN && current.content == ""programlisting"") {
+			append_block_content_not_null (content, parse_docbook_programlisting ());
+		} else if (current.type == TokenType.XML_OPEN && current.content == ""programlisting"") {
+			Embedded? img = parse_docbook_inlinegraphic ();
+			Paragraph p = factory.create_paragraph ();
+			append_block_content_not_null (content, p);
+			p.content.add (img);
+
+		}
 
 		parse_docbook_spaces ();
 
@@ -761,6 +790,58 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		return content;
 	}
 
+	private Run? parse_docbook_footnote () {
+		if (!check_xml_open_tag (""footnote"")) {
+			this.report_unexpected_token (current, ""<footnote>"");
+			return null;
+		}
+		next ();
+
+		int counter = this.footnotes.size + 1;
+		Run? nr = factory.create_run (Run.Style.ITALIC);
+		nr.content.add (factory.create_text (""[%d] "".printf (counter)));
+		LinkedList<Block> content = new LinkedList<Block> ();
+		this.footnotes.add (content);
+
+		Token tmp = null;
+		while (tmp != current) {
+			tmp = current;
+			parse_docbook_spaces ();
+
+			Run? run = parse_inline_content ();
+			if (run != null && run.content.size > 0) {
+				Paragraph p = factory.create_paragraph ();
+				p.content.add (run);
+				content.add (p);
+				continue;
+			}
+
+			LinkedList<Block> lst = parse_block_content ();
+			if (lst != null && run.content.size > 0) {
+				content.add_all (lst);
+				continue;
+			}
+		}
+
+		Paragraph first = content.first () as Paragraph;
+		if (first == null) {
+			first = factory.create_paragraph ();
+			content.insert (0, first);
+		}
+
+		Run entry = factory.create_run (Run.Style.ITALIC);
+		entry.content.add (factory.create_text (counter.to_string () + "": ""));
+		first.content.insert (0, entry);
+
+		if (!check_xml_close_tag (""footnote"")) {
+			this.report_unexpected_token (current, ""</footnote>"");
+			return nr;
+		}
+
+		next ();
+		return nr;
+	}
+
 	private inline void append_block_content_not_null_all (LinkedList<Block> run, LinkedList<Block>? elements) {
 		if (elements != null) {
 			run.add_all (elements);
@@ -781,6 +862,8 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 
 			if (current.type == TokenType.XML_OPEN && current.content == ""itemizedlist"") {
 				this.append_block_content_not_null (content, parse_docbook_itemizedlist ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""programlisting"") {
+				this.append_block_content_not_null (content, parse_docbook_programlisting ());
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""para"") {
 				this.append_block_content_not_null_all (content, parse_docbook_para ());
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""informalexample"") {
@@ -805,6 +888,45 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		return content;
 	}
 
+	private Run? parse_xml_tag () {
+		if (!check_xml_open_tag (""tag"")) {
+			this.report_unexpected_token (current, ""<tag>"");
+			return null;
+		}
+		string? _class = current.attributes.get (""class"");
+		next ();
+
+		parse_docbook_spaces (false);
+
+		if (current.type != TokenType.WORD) {
+			this.report_unexpected_token (current, ""<WORD>"");
+			return null;
+		}
+
+		Run run = factory.create_run (Run.Style.MONOSPACED);
+		if (_class == null || _class == ""starttag"") {
+			run.content.add (factory.create_text (""<"" + current.content + "">""));
+			next ();
+		} else if (_class == ""endtag"") {
+			run.content.add (factory.create_text (""</"" + current.content + "">""));
+			next ();
+		} else {
+			this.report_unexpected_token (current, ""<tag class=\""%s\"">"".printf (_class));
+			return run;
+		}
+
+		parse_docbook_spaces (false);
+
+
+		if (!check_xml_close_tag (""tag"")) {
+			this.report_unexpected_token (current, ""</tag>"");
+			return run;
+		}
+
+		next ();
+		return run;
+	}
+
 	private void append_inline_content_string (Run run, string current) {
 		Text last_as_text = null;
 
@@ -824,7 +946,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 	private Inline create_type_link (string name) {
 		if (name == ""TRUE"" || name == ""FALSE"" || name == ""NULL"") {
 			var monospaced = factory.create_run (Run.Style.MONOSPACED);
-			monospaced.content.add (factory.create_text (name));
+			monospaced.content.add (factory.create_text (name.down ()));
 			return monospaced;
 		} else {
 			Taglets.Link? taglet = factory.create_taglet (""link"") as Taglets.Link;
@@ -846,14 +968,20 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 		while (current.type != TokenType.EOF) {
 			if (current.type == TokenType.XML_OPEN && current.content == ""firstterm"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""firstterm"", Run.Style.ITALIC));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""term"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""term"", Run.Style.ITALIC));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""literal"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""literal"", Run.Style.ITALIC));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""application"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""application"", Run.Style.MONOSPACED));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""emphasis"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""emphasis"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""pre"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""pre"", Run.Style.MONOSPACED));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""code"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""code"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""guimenuitem"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""guimenuitem"", Run.Style.MONOSPACED));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""command"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""command"", Run.Style.MONOSPACED));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""option"") {
@@ -866,8 +994,12 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 				append_inline_content_not_null (run, parse_highlighted_template (""envar"", Run.Style.MONOSPACED));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""filename"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""filename"", Run.Style.MONOSPACED));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""parameter"") {
+				append_inline_content_not_null (run, parse_highlighted_template (""parameter"", Run.Style.MONOSPACED));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""replaceable"") {
 				append_inline_content_not_null (run, parse_highlighted_template (""replaceable"", Run.Style.ITALIC));
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""footnote"") {
+				append_inline_content_not_null (run, parse_docbook_footnote ());
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""type"") {
 				append_inline_content_not_null (run, parse_symbol_link (""type""));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""function"") {
@@ -889,7 +1021,9 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""ulink"") {
 				append_inline_content_not_null (run, parse_docbook_link_tempalte (""ulink""));
 			} else if (current.type == TokenType.XML_OPEN && current.content == ""xref"") {
-				parse_xref ();
+				append_inline_content_not_null (run, parse_xref ());
+			} else if (current.type == TokenType.XML_OPEN && current.content == ""tag"") {
+				append_inline_content_not_null (run, parse_xml_tag ());
 			} else if (current.type == TokenType.GTKDOC_FUNCTION) {
 				run.content.add (this.create_type_link (current.content));
 				next ();
diff --git a/src/libvaladoc/importer/documentationimporter.vala b/src/libvaladoc/importer/documentationimporter.vala
index 85ba188f28..1a0f0bab54 100755
--- a/src/libvaladoc/importer/documentationimporter.vala
+++ b/src/libvaladoc/importer/documentationimporter.vala
@@ -29,13 +29,9 @@ public abstract class Valadoc.Importer.DocumentationImporter : Object, ResourceL
 	protected Settings settings;
 	protected Api.Tree tree;
 
-	protected Content.ContentFactory factory;
-
 	public abstract string file_extension { get; }
 
 	public DocumentationImporter (Api.Tree tree, ModuleLoader modules, Settings settings) {
-		factory = new Content.ContentFactory (settings, this, modules);
-
 		this.settings = settings;
 		this.modules = null;
 		this.tree = tree;
diff --git a/src/libvaladoc/importer/girdocumentationimporter.vala b/src/libvaladoc/importer/girdocumentationimporter.vala
new file mode 100644
index 0000000000..789409b2ed
--- /dev/null
+++ b/src/libvaladoc/importer/girdocumentationimporter.vala
@@ -0,0 +1,635 @@
+/* girdocumentationimporter.vala
+ *
+ * Copyright (C) 2008-2010  Jürg Billeter
+ * Copyright (C) 2011  Luca Bruno
+ * Copyright (C) 2011  Florian Brosch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Jürg Billeter <j@bitron.ch>
+ * 	Luca Bruno <lucabru@src.gnome.org>
+ *  Florian Brosch <flo.brosch@gmail.com>
+ */
+
+
+using Valadoc;
+using GLib;
+
+
+
+public class Valadoc.Importer.GirDocumentationImporter : DocumentationImporter {
+	public override string file_extension { get { return ""gir""; } }
+
+	private MarkupTokenType current_token;
+	private MarkupSourceLocation begin;
+	private MarkupSourceLocation end;
+	private MarkupReader reader;
+
+	private DocumentationParser parser;
+	private ErrorReporter reporter;
+	private Api.SourceFile file;
+
+	private string parent_c_identifier;
+
+	public GirDocumentationImporter (Api.Tree tree, DocumentationParser parser, ModuleLoader modules, Settings settings, ErrorReporter reporter) {
+		base (tree, modules, settings);
+		this.reporter = reporter;
+		this.parser = parser;
+	}
+
+	public override void process (string source_file) {
+		this.file = new Api.SourceFile (new Api.Package (Path.get_basename (source_file), true, null), source_file, null);
+		this.reader = new MarkupReader (source_file, reporter);
+
+		// xml prolog
+		next ();
+		next ();
+
+		next ();
+		parse_repository ();
+
+		reader = null;
+		file = null;
+	}
+
+	private void attach_comment (string cname, Api.GirSourceComment? comment) {
+		if (comment == null) {
+			return ;
+		}
+
+		Api.Node? node = this.tree.search_symbol_cstr (null, cname);
+		if (node == null) {
+			return;
+		}
+
+		Content.Comment? content = this.parser.parse (node, comment);
+		if (content == null) {
+			return;
+		}
+
+		node.documentation = content;
+	}
+
+	private void error (string message) {
+		reporter.error (this.file.relative_path, this.begin.line, this.begin.column, this.end.column, this.reader.get_line_content (this.begin.line), message);
+	}
+
+	private void next () {
+		current_token = reader.read_token (out begin, out end);
+	}
+
+	private void start_element (string name) {
+		if (current_token != MarkupTokenType.START_ELEMENT || reader.name != name) {
+			// error
+			error (""expected start element of `%s'"".printf (name));
+		}
+	}
+
+	private void end_element (string name) {
+		if (current_token != MarkupTokenType.END_ELEMENT || reader.name != name) {
+			// error
+			error (""expected end element of `%s'"".printf (name));
+		}
+		next ();
+	}
+
+	private const string GIR_VERSION = ""1.2"";
+
+	private void parse_repository () {
+		start_element (""repository"");
+		if (reader.get_attribute (""version"") != GIR_VERSION) {
+			error (""unsupported GIR version %s (supported: %s)"".printf (reader.get_attribute (""version""), GIR_VERSION));
+			return;
+		}
+		next ();
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""namespace"") {
+				parse_namespace ();
+			} else if (reader.name == ""include"") {
+				parse_include ();
+			} else if (reader.name == ""package"") {
+				parse_package ();
+			} else if (reader.name == ""c:include"") {
+				parse_c_include ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `repository'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+		end_element (""repository"");
+	}
+
+	private void parse_include () {
+		start_element (""include"");
+		next ();
+
+		end_element (""include"");
+	}
+
+	private void parse_package () {
+		start_element (""package"");
+		next ();
+
+		end_element (""package"");
+	}
+
+	private void parse_c_include () {
+		start_element (""c:include"");
+		next ();
+
+		end_element (""c:include"");
+	}
+
+	private void skip_element () {
+		next ();
+
+		int level = 1;
+		while (level > 0) {
+			if (current_token == MarkupTokenType.START_ELEMENT) {
+				level++;
+			} else if (current_token == MarkupTokenType.END_ELEMENT) {
+				level--;
+			} else if (current_token == MarkupTokenType.EOF) {
+				error (""unexpected end of file"");
+				break;
+			}
+			next ();
+		}
+	}
+
+	private void parse_namespace () {
+		start_element (""namespace"");
+
+		next ();
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""alias"") {
+				parse_alias ();
+			} else if (reader.name == ""enumeration"") {
+				parse_enumeration ();
+			} else if (reader.name == ""bitfield"") {
+				parse_bitfield ();
+			} else if (reader.name == ""function"") {
+				parse_method (""function"");
+			} else if (reader.name == ""callback"") {
+				parse_callback ();
+			} else if (reader.name == ""record"") {
+				parse_record ();
+			} else if (reader.name == ""class"") {
+				parse_class ();
+			} else if (reader.name == ""interface"") {
+				parse_interface ();
+			} else if (reader.name == ""glib:boxed"") {
+				parse_boxed (""glib:boxed"");
+			} else if (reader.name == ""union"") {
+				parse_union ();
+			} else if (reader.name == ""constant"") {
+				parse_constant ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `namespace'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+
+		end_element (""namespace"");
+	}
+
+	private void parse_alias () {
+		start_element (""alias"");
+		string c_identifier = reader.get_attribute (""c:type"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (c_identifier, comment);
+
+		parse_type ();
+
+		end_element (""alias"");
+	}
+
+	private Api.GirSourceComment? parse_symbol_doc () {
+		if (reader.name != ""doc"") {
+			return null;
+		}
+
+		start_element (""doc"");
+		next ();
+
+		Api.GirSourceComment? comment = null;
+
+		if (current_token == MarkupTokenType.TEXT) {
+			comment = new Api.GirSourceComment (reader.content, file, begin.line, begin.column, end.line, end.column);
+			next ();
+		}
+
+		end_element (""doc"");
+		return comment;
+	}
+
+	private Api.SourceComment? parse_doc () {
+		if (reader.name != ""doc"") {
+			return null;
+		}
+
+		start_element (""doc"");
+		next ();
+
+		Api.SourceComment? comment = null;
+
+		if (current_token == MarkupTokenType.TEXT) {
+			comment = new Api.SourceComment (reader.content, file, begin.line, begin.column, end.line, end.column);
+			next ();
+		}
+
+		end_element (""doc"");
+		return comment;
+	}
+
+	private void parse_enumeration (string element_name = ""enumeration"") {
+		start_element (element_name);
+		this.parent_c_identifier = reader.get_attribute (""c:type"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (this.parent_c_identifier, comment);
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""member"") {
+				parse_enumeration_member ();
+			} else if (reader.name == ""function"") {
+				skip_element ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `%s'"".printf (reader.name, element_name));
+				skip_element ();
+			}
+		}
+
+		this.parent_c_identifier = null;
+		end_element (element_name);
+	}
+
+	private void parse_bitfield () {
+		parse_enumeration (""bitfield"");
+	}
+
+	private void parse_enumeration_member () {
+		start_element (""member"");
+		string c_identifier = reader.get_attribute (""c:identifier"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (c_identifier, comment);
+
+		end_element (""member"");
+	}
+
+	private void parse_return_value (out Api.SourceComment? comment = null) {
+		start_element (""return-value"");
+		next ();
+
+		comment = parse_doc ();
+
+		parse_type ();
+
+		end_element (""return-value"");
+	}
+
+	private void parse_parameter (out Api.SourceComment? comment, out string param_name) {
+		start_element (""parameter"");
+		param_name = reader.get_attribute (""name"");
+		next ();
+
+		comment = parse_doc ();
+
+		if (reader.name == ""varargs"") {
+			start_element (""varargs"");
+			param_name = ""..."";
+			next ();
+
+			end_element (""varargs"");
+		} else {
+			parse_type ();
+		}
+
+		end_element (""parameter"");
+	}
+
+	private void parse_type () {
+		skip_element ();
+	}
+
+	private void parse_record () {
+		start_element (""record"");
+		this.parent_c_identifier = reader.get_attribute (""c:type"");
+		if (this.parent_c_identifier.has_suffix (""Private"")) {
+			this.parent_c_identifier = null;
+			skip_element ();
+			return ;
+		}
+
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (this.parent_c_identifier, comment);
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""field"") {
+				parse_field ();
+			} else if (reader.name == ""constructor"") {
+				parse_constructor ();
+			} else if (reader.name == ""method"") {
+				parse_method (""method"");
+			} else if (reader.name == ""function"") {
+				skip_element ();
+			} else if (reader.name == ""union"") {
+				parse_union ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `record'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+
+		this.parent_c_identifier = null;
+		end_element (""record"");
+	}
+
+	private void parse_class () {
+		start_element (""class"");
+		this.parent_c_identifier = reader.get_attribute (""c:type"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (this.parent_c_identifier, comment);
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""implements"") {
+				skip_element ();
+			} else if (reader.name == ""constant"") {
+				parse_constant ();
+			} else if (reader.name == ""field"") {
+				parse_field ();
+			} else if (reader.name == ""property"") {
+				parse_property ();
+			} else if (reader.name == ""constructor"") {
+				parse_constructor ();
+			} else if (reader.name == ""function"") {
+				parse_method (""function"");
+			} else if (reader.name == ""method"") {
+				parse_method (""method"");
+			} else if (reader.name == ""virtual-method"") {
+				parse_method (""virtual-method"");
+			} else if (reader.name == ""union"") {
+				parse_union ();
+			} else if (reader.name == ""glib:signal"") {
+				parse_signal ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `class'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+
+		this.parent_c_identifier = null;
+		end_element (""class"");
+	}
+
+	private void parse_interface () {
+		start_element (""interface"");
+		this.parent_c_identifier = reader.get_attribute (""c:type"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (this.parent_c_identifier, comment);
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""prerequisite"") {
+				skip_element ();
+			} else if (reader.name == ""field"") {
+				parse_field ();
+			} else if (reader.name == ""property"") {
+				parse_property ();
+			} else if (reader.name == ""virtual-method"") {
+				parse_method (""virtual-method"");
+			} else if (reader.name == ""function"") {
+				parse_method (""function"");
+			} else if (reader.name == ""method"") {
+				parse_method (""method"");
+			} else if (reader.name == ""glib:signal"") {
+				parse_signal ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `interface'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+
+		this.parent_c_identifier = null;
+		end_element (""interface"");
+	}
+
+	private void parse_field () {
+		start_element (""field"");
+		string c_identifier = reader.get_attribute (""name"");
+		if (this.parent_c_identifier != null) {
+			c_identifier = this.parent_c_identifier + ""."" + c_identifier;
+		}
+		next ();
+
+		parse_symbol_doc ();
+
+		parse_type ();
+
+		end_element (""field"");
+	}
+
+	private void parse_property () {
+		start_element (""property"");
+		string c_identifier = ""%s:%s"".printf (parent_c_identifier, reader.get_attribute (""name"").replace (""-"", ""_""));
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (c_identifier, comment);
+
+		parse_type ();
+
+		end_element (""property"");
+	}
+
+	private void parse_callback () {
+		skip_element ();
+	}
+
+	private void parse_constructor () {
+		parse_function (""constructor"");
+	}
+
+	private void parse_function (string element_name) {
+		start_element (element_name);
+
+		string? c_identifier = null;
+		switch (element_name) {
+		case ""constructor"":
+		case ""function"":
+		case ""method"":
+			c_identifier = reader.get_attribute (""c:identifier"");
+			break;
+
+		case ""virtual-method"":
+			c_identifier = ""%s->%s"".printf (this.parent_c_identifier, reader.get_attribute (""name"").replace (""-"", ""_""));
+			break;
+
+		case ""glib:signal"":
+			c_identifier = ""%s::%s"".printf (this.parent_c_identifier, reader.get_attribute (""name"").replace (""-"", ""_""));
+			break;
+
+		default:
+			skip_element ();
+			return ;
+		}
+
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+
+		if (current_token == MarkupTokenType.START_ELEMENT && reader.name == ""return-value"") {
+			Api.SourceComment? return_comment;
+			parse_return_value (out return_comment);
+			if (return_comment != null) {
+				if (comment == null) {
+					comment = new Api.GirSourceComment ("""", file, begin.line, begin.column, end.line, end.column);
+				}
+				comment.return_comment = return_comment;
+			}
+		}
+
+
+		if (current_token == MarkupTokenType.START_ELEMENT && reader.name == ""parameters"") {
+			start_element (""parameters"");
+			next ();
+
+			while (current_token == MarkupTokenType.START_ELEMENT) {
+				Api.SourceComment? param_comment;
+				string? param_name;
+
+				parse_parameter (out param_comment, out param_name);
+
+				if (param_comment != null) {
+					if (comment == null) {
+						comment = new Api.GirSourceComment ("""", file, begin.line, begin.column, end.line, end.column);
+					}
+
+					comment.add_parameter_content (param_name, param_comment);
+				}
+			}
+			end_element (""parameters"");
+		}
+
+		attach_comment (c_identifier, comment);
+		end_element (element_name);
+	}
+
+	private void parse_method (string element_name) {
+		parse_function (element_name);
+	}
+
+	private void parse_signal () {
+		parse_function (""glib:signal"");
+	}
+
+	private void parse_boxed (string element_name) {
+		start_element (element_name);
+
+		this.parent_c_identifier = reader.get_attribute (""name"");
+		if (this.parent_c_identifier == null) {
+			this.parent_c_identifier = reader.get_attribute (""glib:name"");
+		}
+
+		next ();
+
+		parse_symbol_doc ();
+
+		// TODO: process comments
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""field"") {
+				parse_field ();
+			} else if (reader.name == ""constructor"") {
+				parse_constructor ();
+			} else if (reader.name == ""method"") {
+				parse_method (""method"");
+			} else if (reader.name == ""function"") {
+				skip_element ();
+			} else if (reader.name == ""union"") {
+				parse_union ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `class'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+
+		this.parent_c_identifier = null;
+		end_element (element_name);
+	}
+
+	private void parse_union () {
+		start_element (""union"");
+		this.parent_c_identifier = reader.get_attribute (""c:type"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (this.parent_c_identifier, comment);
+
+		while (current_token == MarkupTokenType.START_ELEMENT) {
+			if (reader.name == ""field"") {
+				parse_field ();
+			} else if (reader.name == ""constructor"") {
+				parse_constructor ();
+			} else if (reader.name == ""method"") {
+				parse_method (""method"");
+			} else if (reader.name == ""function"") {
+				skip_element ();
+			} else if (reader.name == ""record"") {
+				parse_record ();
+			} else {
+				// error
+				error (""unknown child element `%s' in `union'"".printf (reader.name));
+				skip_element ();
+			}
+		}
+
+		this.parent_c_identifier = null;
+		end_element (""union"");
+	}
+
+	private void parse_constant () {
+		start_element (""constant"");
+		string c_identifier = reader.get_attribute (""c:type"");
+		next ();
+
+		Api.GirSourceComment? comment = parse_symbol_doc ();
+		attach_comment (c_identifier, comment);
+
+		parse_type ();
+
+		end_element (""constant"");
+	}
+}
+
diff --git a/src/libvaladoc/importer/valadocdocumentationimporter.vala b/src/libvaladoc/importer/valadocdocumentationimporter.vala
index 16bb1086d4..2cbedc61da 100755
--- a/src/libvaladoc/importer/valadocdocumentationimporter.vala
+++ b/src/libvaladoc/importer/valadocdocumentationimporter.vala
@@ -37,11 +37,14 @@ public class Valadoc.Importer.ValadocDocumentationImporter : DocumentationImport
 	private string _cname;
 	private StringBuilder _comment;
 	private SourceLocation _comment_location;
+	protected Content.ContentFactory factory;
+
 
 	private ErrorReporter reporter;
 
 	public ValadocDocumentationImporter (Api.Tree tree, DocumentationParser parser, ModuleLoader modules, Settings settings, ErrorReporter reporter) {
 		base (tree, modules, settings);
+		this.factory = new Content.ContentFactory (settings, this, modules);
 		this.reporter = reporter;
 
 		_scanner = new ValadoDocumentationScanner (settings);
diff --git a/src/libvaladoc/markupreader.vala b/src/libvaladoc/markupreader.vala
index 626508e1a2..825b2b2d51 100644
--- a/src/libvaladoc/markupreader.vala
+++ b/src/libvaladoc/markupreader.vala
@@ -46,6 +46,7 @@ public class Valadoc.MarkupReader : Object {
 
 	private MappedFile mapped_file;
 
+	private string[] lines;
 	private char* begin;
 	private char* current;
 	private char* end;
@@ -62,6 +63,7 @@ public class Valadoc.MarkupReader : Object {
 		this.filename = filename;
 		this.reporter = reporter;
 
+		lines = content.split (""\n"");
 		begin = content;
 		end = begin + content.size ();
 		current = begin;
@@ -77,6 +79,7 @@ public class Valadoc.MarkupReader : Object {
 		try {
 			mapped_file = new MappedFile (filename, false);
 			begin = mapped_file.get_contents ();
+			lines = ((string) begin).split (""\n"");
 			end = begin + mapped_file.get_length ();
 
 			current = begin;
@@ -88,6 +91,14 @@ public class Valadoc.MarkupReader : Object {
 		}
 	}
 
+	public string? get_line_content (int line_nr) {
+		if (this.lines.length > line_nr) {
+			return this.lines[line_nr];
+		}
+
+		return null;
+	}
+
 	public string? get_attribute (string attr) {
 		return attributes[attr];
 	}
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 57b14747c5..633fc4184a 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -27,6 +27,12 @@ using Valadoc.Content;
 public class Valadoc.Taglets.Link : InlineTaglet {
 	public string symbol_name { internal set; get; }
 
+	private enum SymbolContext {
+		NORMAL,
+		TYPE
+	}
+
+	private SymbolContext _context = SymbolContext.NORMAL;
 	private Api.Node _symbol;
 
 	public override Rule? get_parser_rule (Rule run_rule) {
@@ -48,8 +54,13 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 		if (symbol_name.has_prefix (""c::"")) {
 			_symbol_name = _symbol_name.substring (3);
 			_symbol = api_root.search_symbol_cstr (container, symbol_name);
+			_context = SymbolContext.NORMAL;
+
 			if (_symbol == null) {
-				
+				_symbol = api_root.search_symbol_type_cstr (symbol_name);
+				if (_symbol != null) {
+					_context = SymbolContext.TYPE;
+				}
 			}
 
 			if (_symbol != null) {
@@ -59,7 +70,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 			_symbol = api_root.search_symbol_str (container, symbol_name);
 		}
 
-		if (_symbol == null) {
+		if (_symbol == null && symbol_name != ""main"") {
 			// TODO use ContentElement's source reference
 			reporter.simple_warning (""%s: %s does not exist"", container.get_full_name (), symbol_name);
 		}
@@ -71,6 +82,22 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 		var link = new Content.SymbolLink ();
 		link.symbol = _symbol;
 		link.label = symbol_name;
-		return link;
+
+		switch (_context) {
+		case SymbolContext.TYPE:
+			Content.Run content = new Content.Run (Run.Style.MONOSPACED);
+
+			Content.Run keyword = new Content.Run (Run.Style.LANG_KEYWORD);
+			keyword.content.add (new Content.Text (""typeof""));
+			content.content.add (keyword);
+
+			content.content.add (new Content.Text ("" (""));
+			content.content.add (link);
+			content.content.add (new Content.Text ("")""));
+			return content;
+
+		default:
+			return link;
+		}
 	}
 }"
e6a03e2fc037b48f3989ef899310e007bb3d16a9,hadoop,Merge r1601491 from trunk. YARN-2030. Augmented- RMStateStore with state machine. Contributed by Binglin Chang--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601492 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 553f378ceee6e..29add5e139352 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -134,6 +134,8 @@ Release 2.5.0 - UNRELEASED
     YARN-2132. ZKRMStateStore.ZKAction#runWithRetries doesn't log the exception
     it encounters. (Vamsee Yarlagadda via kasha)
 
+    YARN-2030. Augmented RMStateStore with state machine. (Binglin Chang via jianhe)
+
   OPTIMIZATIONS
 
   BUG FIXES 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
index 1f6e175ced108..7f4dad83fe92a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
@@ -47,6 +47,8 @@
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationStateDataProto;
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RMStateVersionProto;
 import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMStateVersion;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
@@ -314,7 +316,7 @@ private void loadRMDTSecretManagerState(RMState rmState) throws Exception {
 
   @Override
   public synchronized void storeApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateDataPB) throws Exception {
+      ApplicationStateData appStateDataPB) throws Exception {
     String appIdStr = appId.toString();
     Path appDirPath = getAppDir(rmAppRoot, appIdStr);
     fs.mkdirs(appDirPath);
@@ -334,7 +336,7 @@ public synchronized void storeApplicationStateInternal(ApplicationId appId,
 
   @Override
   public synchronized void updateApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateDataPB) throws Exception {
+      ApplicationStateData appStateDataPB) throws Exception {
     String appIdStr = appId.toString();
     Path appDirPath = getAppDir(rmAppRoot, appIdStr);
     Path nodeCreatePath = getNodePath(appDirPath, appIdStr);
@@ -354,7 +356,7 @@ public synchronized void updateApplicationStateInternal(ApplicationId appId,
   @Override
   public synchronized void storeApplicationAttemptStateInternal(
       ApplicationAttemptId appAttemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateDataPB)
+      ApplicationAttemptStateData attemptStateDataPB)
       throws Exception {
     Path appDirPath =
         getAppDir(rmAppRoot, appAttemptId.getApplicationId().toString());
@@ -375,7 +377,7 @@ public synchronized void storeApplicationAttemptStateInternal(
   @Override
   public synchronized void updateApplicationAttemptStateInternal(
       ApplicationAttemptId appAttemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateDataPB)
+      ApplicationAttemptStateData attemptStateDataPB)
       throws Exception {
     Path appDirPath =
         getAppDir(rmAppRoot, appAttemptId.getApplicationId().toString());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java
index c9f3541f53542..a43b20da39256 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java
@@ -32,9 +32,9 @@
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMStateVersion;
-import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
-import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -80,7 +80,7 @@ protected synchronized void closeInternal() throws Exception {
 
   @Override
   public void storeApplicationStateInternal(ApplicationId appId,
-                                     ApplicationStateDataPBImpl appStateData)
+                                     ApplicationStateData appStateData)
       throws Exception {
     ApplicationState appState =
         new ApplicationState(appStateData.getSubmitTime(),
@@ -92,7 +92,7 @@ public void storeApplicationStateInternal(ApplicationId appId,
 
   @Override
   public void updateApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateData) throws Exception {
+      ApplicationStateData appStateData) throws Exception {
     ApplicationState updatedAppState =
         new ApplicationState(appStateData.getSubmitTime(),
           appStateData.getStartTime(),
@@ -112,7 +112,7 @@ public void updateApplicationStateInternal(ApplicationId appId,
   @Override
   public synchronized void storeApplicationAttemptStateInternal(
       ApplicationAttemptId appAttemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateData)
+      ApplicationAttemptStateData attemptStateData)
       throws Exception {
     Credentials credentials = null;
     if(attemptStateData.getAppAttemptTokens() != null){
@@ -137,7 +137,7 @@ public synchronized void storeApplicationAttemptStateInternal(
   @Override
   public synchronized void updateApplicationAttemptStateInternal(
       ApplicationAttemptId appAttemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateData)
+      ApplicationAttemptStateData attemptStateData)
       throws Exception {
     Credentials credentials = null;
     if (attemptStateData.getAppAttemptTokens() != null) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java
index a12099f46f3e2..6a0426c0e8ca2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/NullRMStateStore.java
@@ -25,9 +25,9 @@
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMStateVersion;
-import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
-import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
 
 @Unstable
 public class NullRMStateStore extends RMStateStore {
@@ -54,13 +54,13 @@ public RMState loadState() throws Exception {
 
   @Override
   protected void storeApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateData) throws Exception {
+      ApplicationStateData appStateData) throws Exception {
     // Do nothing
   }
 
   @Override
   protected void storeApplicationAttemptStateInternal(ApplicationAttemptId attemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateData) throws Exception {
+      ApplicationAttemptStateData attemptStateData) throws Exception {
     // Do nothing
   }
 
@@ -102,13 +102,13 @@ public void removeRMDTMasterKeyState(DelegationKey delegationKey) throws Excepti
 
   @Override
   protected void updateApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateData) throws Exception {
+      ApplicationStateData appStateData) throws Exception {
     // Do nothing 
   }
 
   @Override
   protected void updateApplicationAttemptStateInternal(ApplicationAttemptId attemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateData) throws Exception {
+      ApplicationAttemptStateData attemptStateData) throws Exception {
   }
 
   @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
index fc4537c793f71..affc6f9d86567 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.recovery;
 
-import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -31,7 +30,6 @@
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.Credentials;
 import org.apache.hadoop.security.token.Token;
@@ -50,6 +48,8 @@
 import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
 import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEvent;
 import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEventType;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMStateVersion;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
@@ -61,6 +61,10 @@
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptNewSavedEvent;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptUpdateSavedEvent;
+import org.apache.hadoop.yarn.state.InvalidStateTransitonException;
+import org.apache.hadoop.yarn.state.SingleArcTransition;
+import org.apache.hadoop.yarn.state.StateMachine;
+import org.apache.hadoop.yarn.state.StateMachineFactory;
 
 @Private
 @Unstable
@@ -83,8 +87,163 @@ public abstract class RMStateStore extends AbstractService {
 
   public static final Log LOG = LogFactory.getLog(RMStateStore.class);
 
+  private enum RMStateStoreState {
+    DEFAULT
+  };
+
+  private static final StateMachineFactory<RMStateStore,
+                                           RMStateStoreState,
+                                           RMStateStoreEventType, 
+                                           RMStateStoreEvent>
+      stateMachineFactory = new StateMachineFactory<RMStateStore,
+                                                    RMStateStoreState,
+                                                    RMStateStoreEventType,
+                                                    RMStateStoreEvent>(
+      RMStateStoreState.DEFAULT)
+      .addTransition(RMStateStoreState.DEFAULT, RMStateStoreState.DEFAULT,
+          RMStateStoreEventType.STORE_APP, new StoreAppTransition())
+      .addTransition(RMStateStoreState.DEFAULT, RMStateStoreState.DEFAULT,
+          RMStateStoreEventType.UPDATE_APP, new UpdateAppTransition())
+      .addTransition(RMStateStoreState.DEFAULT, RMStateStoreState.DEFAULT,
+          RMStateStoreEventType.REMOVE_APP, new RemoveAppTransition())
+      .addTransition(RMStateStoreState.DEFAULT, RMStateStoreState.DEFAULT,
+          RMStateStoreEventType.STORE_APP_ATTEMPT, new StoreAppAttemptTransition())
+      .addTransition(RMStateStoreState.DEFAULT, RMStateStoreState.DEFAULT,
+          RMStateStoreEventType.UPDATE_APP_ATTEMPT, new UpdateAppAttemptTransition());
+
+  private final StateMachine<RMStateStoreState,
+                             RMStateStoreEventType,
+                             RMStateStoreEvent> stateMachine;
+
+  private static class StoreAppTransition
+      implements SingleArcTransition<RMStateStore, RMStateStoreEvent> {
+    @Override
+    public void transition(RMStateStore store, RMStateStoreEvent event) {
+      if (!(event instanceof RMStateStoreAppEvent)) {
+        // should never happen
+        LOG.error(""Illegal event type: "" + event.getClass());
+        return;
+      }
+      ApplicationState appState = ((RMStateStoreAppEvent) event).getAppState();
+      ApplicationId appId = appState.getAppId();
+      ApplicationStateData appStateData = ApplicationStateData
+          .newInstance(appState);
+      LOG.info(""Storing info for app: "" + appId);
+      try {
+        store.storeApplicationStateInternal(appId, appStateData);
+        store.notifyDoneStoringApplication(appId, null);
+      } catch (Exception e) {
+        LOG.error(""Error storing app: "" + appId, e);
+        store.notifyStoreOperationFailed(e);
+      }
+    };
+  }
+
+  private static class UpdateAppTransition implements
+      SingleArcTransition<RMStateStore, RMStateStoreEvent> {
+    @Override
+    public void transition(RMStateStore store, RMStateStoreEvent event) {
+      if (!(event instanceof RMStateUpdateAppEvent)) {
+        // should never happen
+        LOG.error(""Illegal event type: "" + event.getClass());
+        return;
+      }
+      ApplicationState appState = ((RMStateUpdateAppEvent) event).getAppState();
+      ApplicationId appId = appState.getAppId();
+      ApplicationStateData appStateData = ApplicationStateData
+          .newInstance(appState);
+      LOG.info(""Updating info for app: "" + appId);
+      try {
+        store.updateApplicationStateInternal(appId, appStateData);
+        store.notifyDoneUpdatingApplication(appId, null);
+      } catch (Exception e) {
+        LOG.error(""Error updating app: "" + appId, e);
+        store.notifyStoreOperationFailed(e);
+      }
+    };
+  }
+
+  private static class RemoveAppTransition implements
+      SingleArcTransition<RMStateStore, RMStateStoreEvent> {
+    @Override
+    public void transition(RMStateStore store, RMStateStoreEvent event) {
+      if (!(event instanceof RMStateStoreRemoveAppEvent)) {
+        // should never happen
+        LOG.error(""Illegal event type: "" + event.getClass());
+        return;
+      }
+      ApplicationState appState = ((RMStateStoreRemoveAppEvent) event)
+          .getAppState();
+      ApplicationId appId = appState.getAppId();
+      LOG.info(""Removing info for app: "" + appId);
+      try {
+        store.removeApplicationStateInternal(appState);
+      } catch (Exception e) {
+        LOG.error(""Error removing app: "" + appId, e);
+        store.notifyStoreOperationFailed(e);
+      }
+    };
+  }
+
+  private static class StoreAppAttemptTransition implements
+      SingleArcTransition<RMStateStore, RMStateStoreEvent> {
+    @Override
+    public void transition(RMStateStore store, RMStateStoreEvent event) {
+      if (!(event instanceof RMStateStoreAppAttemptEvent)) {
+        // should never happen
+        LOG.error(""Illegal event type: "" + event.getClass());
+        return;
+      }
+      ApplicationAttemptState attemptState =
+          ((RMStateStoreAppAttemptEvent) event).getAppAttemptState();
+      try {
+        ApplicationAttemptStateData attemptStateData = 
+            ApplicationAttemptStateData.newInstance(attemptState);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(""Storing info for attempt: "" + attemptState.getAttemptId());
+        }
+        store.storeApplicationAttemptStateInternal(attemptState.getAttemptId(),
+            attemptStateData);
+        store.notifyDoneStoringApplicationAttempt(attemptState.getAttemptId(),
+            null);
+      } catch (Exception e) {
+        LOG.error(""Error storing appAttempt: "" + attemptState.getAttemptId(), e);
+        store.notifyStoreOperationFailed(e);
+      }
+    };
+  }
+
+  private static class UpdateAppAttemptTransition implements
+      SingleArcTransition<RMStateStore, RMStateStoreEvent> {
+    @Override
+    public void transition(RMStateStore store, RMStateStoreEvent event) {
+      if (!(event instanceof RMStateUpdateAppAttemptEvent)) {
+        // should never happen
+        LOG.error(""Illegal event type: "" + event.getClass());
+        return;
+      }
+      ApplicationAttemptState attemptState =
+          ((RMStateUpdateAppAttemptEvent) event).getAppAttemptState();
+      try {
+        ApplicationAttemptStateData attemptStateData = ApplicationAttemptStateData
+            .newInstance(attemptState);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(""Updating info for attempt: "" + attemptState.getAttemptId());
+        }
+        store.updateApplicationAttemptStateInternal(attemptState.getAttemptId(),
+            attemptStateData);
+        store.notifyDoneUpdatingApplicationAttempt(attemptState.getAttemptId(),
+            null);
+      } catch (Exception e) {
+        LOG.error(""Error updating appAttempt: "" + attemptState.getAttemptId(), e);
+        store.notifyStoreOperationFailed(e);
+      }
+    };
+  }
+
   public RMStateStore() {
     super(RMStateStore.class.getName());
+    stateMachine = stateMachineFactory.make(this);
   }
 
   /**
@@ -390,10 +549,10 @@ public synchronized void updateApplicationState(ApplicationState appState) {
    * application.
    */
   protected abstract void storeApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateData) throws Exception;
+      ApplicationStateData appStateData) throws Exception;
 
   protected abstract void updateApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateData) throws Exception;
+      ApplicationStateData appStateData) throws Exception;
   
   @SuppressWarnings(""unchecked"")
   /**
@@ -428,11 +587,11 @@ public synchronized void updateApplicationAttemptState(
    */
   protected abstract void storeApplicationAttemptStateInternal(
       ApplicationAttemptId attemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateData) throws Exception;
+      ApplicationAttemptStateData attemptStateData) throws Exception;
 
   protected abstract void updateApplicationAttemptStateInternal(
       ApplicationAttemptId attemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateData) throws Exception;
+      ApplicationAttemptStateData attemptStateData) throws Exception;
 
   /**
    * RMDTSecretManager call this to store the state of a delegation token
@@ -596,105 +755,10 @@ public Credentials getCredentialsFromAppAttempt(RMAppAttempt appAttempt) {
 
   // Dispatcher related code
   protected void handleStoreEvent(RMStateStoreEvent event) {
-    if (event.getType().equals(RMStateStoreEventType.STORE_APP)
-        || event.getType().equals(RMStateStoreEventType.UPDATE_APP)) {
-      ApplicationState appState = null;
-      if (event.getType().equals(RMStateStoreEventType.STORE_APP)) {
-        appState = ((RMStateStoreAppEvent) event).getAppState();
-      } else {
-        assert event.getType().equals(RMStateStoreEventType.UPDATE_APP);
-        appState = ((RMStateUpdateAppEvent) event).getAppState();
-      }
-
-      Exception storedException = null;
-      ApplicationStateDataPBImpl appStateData =
-          (ApplicationStateDataPBImpl) ApplicationStateDataPBImpl
-            .newApplicationStateData(appState.getSubmitTime(),
-              appState.getStartTime(), appState.getUser(),
-              appState.getApplicationSubmissionContext(), appState.getState(),
-              appState.getDiagnostics(), appState.getFinishTime());
-
-      ApplicationId appId =
-          appState.getApplicationSubmissionContext().getApplicationId();
-
-      LOG.info(""Storing info for app: "" + appId);
-      try {
-        if (event.getType().equals(RMStateStoreEventType.STORE_APP)) {
-          storeApplicationStateInternal(appId, appStateData);
-          notifyDoneStoringApplication(appId, storedException);
-        } else {
-          assert event.getType().equals(RMStateStoreEventType.UPDATE_APP);
-          updateApplicationStateInternal(appId, appStateData);
-          notifyDoneUpdatingApplication(appId, storedException);
-        }
-      } catch (Exception e) {
-        LOG.error(""Error storing/updating app: "" + appId, e);
-        notifyStoreOperationFailed(e);
-      }
-    } else if (event.getType().equals(RMStateStoreEventType.STORE_APP_ATTEMPT)
-        || event.getType().equals(RMStateStoreEventType.UPDATE_APP_ATTEMPT)) {
-
-      ApplicationAttemptState attemptState = null;
-      if (event.getType().equals(RMStateStoreEventType.STORE_APP_ATTEMPT)) {
-        attemptState =
-            ((RMStateStoreAppAttemptEvent) event).getAppAttemptState();
-      } else {
-        assert event.getType().equals(RMStateStoreEventType.UPDATE_APP_ATTEMPT);
-        attemptState =
-            ((RMStateUpdateAppAttemptEvent) event).getAppAttemptState();
-      }
-
-      Exception storedException = null;
-      Credentials credentials = attemptState.getAppAttemptCredentials();
-      ByteBuffer appAttemptTokens = null;
-      try {
-        if (credentials != null) {
-          DataOutputBuffer dob = new DataOutputBuffer();
-          credentials.writeTokenStorageToStream(dob);
-          appAttemptTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
-        }
-        ApplicationAttemptStateDataPBImpl attemptStateData =
-            (ApplicationAttemptStateDataPBImpl) ApplicationAttemptStateDataPBImpl
-              .newApplicationAttemptStateData(attemptState.getAttemptId(),
-                attemptState.getMasterContainer(), appAttemptTokens,
-                attemptState.getStartTime(), attemptState.getState(),
-                attemptState.getFinalTrackingUrl(),
-                attemptState.getDiagnostics(),
-                attemptState.getFinalApplicationStatus());
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(""Storing info for attempt: "" + attemptState.getAttemptId());
-        }
-        if (event.getType().equals(RMStateStoreEventType.STORE_APP_ATTEMPT)) {
-          storeApplicationAttemptStateInternal(attemptState.getAttemptId(),
-              attemptStateData);
-          notifyDoneStoringApplicationAttempt(attemptState.getAttemptId(),
-              storedException);
-        } else {
-          assert event.getType().equals(
-            RMStateStoreEventType.UPDATE_APP_ATTEMPT);
-          updateApplicationAttemptStateInternal(attemptState.getAttemptId(),
-              attemptStateData);
-          notifyDoneUpdatingApplicationAttempt(attemptState.getAttemptId(),
-              storedException);
-        }
-      } catch (Exception e) {
-        LOG.error(
-            ""Error storing/updating appAttempt: "" + attemptState.getAttemptId(), e);
-        notifyStoreOperationFailed(e);
-      }
-    } else if (event.getType().equals(RMStateStoreEventType.REMOVE_APP)) {
-      ApplicationState appState =
-          ((RMStateStoreRemoveAppEvent) event).getAppState();
-      ApplicationId appId = appState.getAppId();
-      LOG.info(""Removing info for app: "" + appId);
-      try {
-        removeApplicationStateInternal(appState);
-      } catch (Exception e) {
-        LOG.error(""Error removing app: "" + appId, e);
-        notifyStoreOperationFailed(e);
-      }
-    } else {
-      LOG.error(""Unknown RMStateStoreEvent type: "" + event.getType());
+    try {
+      this.stateMachine.doTransition(event.getType(), event);
+    } catch (InvalidStateTransitonException e) {
+      LOG.error(""Can't handle this event at current state"", e);
     }
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
index 31c8885d4f2c9..63ae990732c24 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
@@ -49,6 +49,8 @@
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RMStateVersionProto;
 import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
 import org.apache.hadoop.yarn.server.resourcemanager.RMZKUtils;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMStateVersion;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
@@ -551,7 +553,7 @@ private void loadApplicationAttemptState(ApplicationState appState,
 
   @Override
   public synchronized void storeApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateDataPB) throws Exception {
+      ApplicationStateData appStateDataPB) throws Exception {
     String nodeCreatePath = getNodePath(rmAppRoot, appId.toString());
 
     if (LOG.isDebugEnabled()) {
@@ -565,7 +567,7 @@ public synchronized void storeApplicationStateInternal(ApplicationId appId,
 
   @Override
   public synchronized void updateApplicationStateInternal(ApplicationId appId,
-      ApplicationStateDataPBImpl appStateDataPB) throws Exception {
+      ApplicationStateData appStateDataPB) throws Exception {
     String nodeUpdatePath = getNodePath(rmAppRoot, appId.toString());
 
     if (LOG.isDebugEnabled()) {
@@ -587,7 +589,7 @@ public synchronized void updateApplicationStateInternal(ApplicationId appId,
   @Override
   public synchronized void storeApplicationAttemptStateInternal(
       ApplicationAttemptId appAttemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateDataPB)
+      ApplicationAttemptStateData attemptStateDataPB)
       throws Exception {
     String appDirPath = getNodePath(rmAppRoot,
         appAttemptId.getApplicationId().toString());
@@ -605,7 +607,7 @@ public synchronized void storeApplicationAttemptStateInternal(
   @Override
   public synchronized void updateApplicationAttemptStateInternal(
       ApplicationAttemptId appAttemptId,
-      ApplicationAttemptStateDataPBImpl attemptStateDataPB)
+      ApplicationAttemptStateData attemptStateDataPB)
       throws Exception {
     String appIdStr = appAttemptId.getApplicationId().toString();
     String appAttemptIdStr = appAttemptId.toString();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java
index 255800e86b2d9..6af048b2e3d2a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationAttemptStateData.java
@@ -18,31 +18,73 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.recovery.records;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.security.Credentials;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationAttemptStateDataProto;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore.ApplicationAttemptState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
+import org.apache.hadoop.yarn.util.Records;
 
 /*
  * Contains the state data that needs to be persisted for an ApplicationAttempt
  */
 @Public
 @Unstable
-public interface ApplicationAttemptStateData {
-  
+public abstract class ApplicationAttemptStateData {
+  public static ApplicationAttemptStateData newInstance(
+      ApplicationAttemptId attemptId, Container container,
+      ByteBuffer attemptTokens, long startTime, RMAppAttemptState finalState,
+      String finalTrackingUrl, String diagnostics,
+      FinalApplicationStatus amUnregisteredFinalStatus) {
+    ApplicationAttemptStateData attemptStateData =
+        Records.newRecord(ApplicationAttemptStateData.class);
+    attemptStateData.setAttemptId(attemptId);
+    attemptStateData.setMasterContainer(container);
+    attemptStateData.setAppAttemptTokens(attemptTokens);
+    attemptStateData.setState(finalState);
+    attemptStateData.setFinalTrackingUrl(finalTrackingUrl);
+    attemptStateData.setDiagnostics(diagnostics);
+    attemptStateData.setStartTime(startTime);
+    attemptStateData.setFinalApplicationStatus(amUnregisteredFinalStatus);
+    return attemptStateData;
+  }
+
+  public static ApplicationAttemptStateData newInstance(
+      ApplicationAttemptState attemptState) throws IOException {
+    Credentials credentials = attemptState.getAppAttemptCredentials();
+    ByteBuffer appAttemptTokens = null;
+    if (credentials != null) {
+      DataOutputBuffer dob = new DataOutputBuffer();
+      credentials.writeTokenStorageToStream(dob);
+      appAttemptTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+    }
+    return newInstance(attemptState.getAttemptId(),
+        attemptState.getMasterContainer(), appAttemptTokens,
+        attemptState.getStartTime(), attemptState.getState(),
+        attemptState.getFinalTrackingUrl(),
+        attemptState.getDiagnostics(),
+        attemptState.getFinalApplicationStatus());
+  }
+
+  public abstract ApplicationAttemptStateDataProto getProto();
+
   /**
    * The ApplicationAttemptId for the application attempt
    * @return ApplicationAttemptId for the application attempt
    */
   @Public
   @Unstable
-  public ApplicationAttemptId getAttemptId();
+  public abstract ApplicationAttemptId getAttemptId();
   
-  public void setAttemptId(ApplicationAttemptId attemptId);
+  public abstract void setAttemptId(ApplicationAttemptId attemptId);
   
   /*
    * The master container running the application attempt
@@ -50,9 +92,9 @@ public interface ApplicationAttemptStateData {
    */
   @Public
   @Unstable
-  public Container getMasterContainer();
+  public abstract Container getMasterContainer();
   
-  public void setMasterContainer(Container container);
+  public abstract void setMasterContainer(Container container);
 
   /**
    * The application attempt tokens that belong to this attempt
@@ -60,17 +102,17 @@ public interface ApplicationAttemptStateData {
    */
   @Public
   @Unstable
-  public ByteBuffer getAppAttemptTokens();
+  public abstract ByteBuffer getAppAttemptTokens();
 
-  public void setAppAttemptTokens(ByteBuffer attemptTokens);
+  public abstract void setAppAttemptTokens(ByteBuffer attemptTokens);
 
   /**
    * Get the final state of the application attempt.
    * @return the final state of the application attempt.
    */
-  public RMAppAttemptState getState();
+  public abstract RMAppAttemptState getState();
 
-  public void setState(RMAppAttemptState state);
+  public abstract void setState(RMAppAttemptState state);
 
   /**
    * Get the original not-proxied <em>final tracking url</em> for the
@@ -79,34 +121,34 @@ public interface ApplicationAttemptStateData {
    * @return the original not-proxied <em>final tracking url</em> for the
    *         application
    */
-  public String getFinalTrackingUrl();
+  public abstract String getFinalTrackingUrl();
 
   /**
    * Set the final tracking Url of the AM.
    * @param url
    */
-  public void setFinalTrackingUrl(String url);
+  public abstract void setFinalTrackingUrl(String url);
   /**
    * Get the <em>diagnositic information</em> of the attempt 
    * @return <em>diagnositic information</em> of the attempt
    */
-  public String getDiagnostics();
+  public abstract String getDiagnostics();
 
-  public void setDiagnostics(String diagnostics);
+  public abstract void setDiagnostics(String diagnostics);
 
   /**
    * Get the <em>start time</em> of the application.
    * @return <em>start time</em> of the application
    */
-  public long getStartTime();
+  public abstract long getStartTime();
 
-  public void setStartTime(long startTime);
+  public abstract void setStartTime(long startTime);
 
   /**
    * Get the <em>final finish status</em> of the application.
    * @return <em>final finish status</em> of the application
    */
-  public FinalApplicationStatus getFinalApplicationStatus();
+  public abstract FinalApplicationStatus getFinalApplicationStatus();
 
-  public void setFinalApplicationStatus(FinalApplicationStatus finishState);
+  public abstract void setFinalApplicationStatus(FinalApplicationStatus finishState);
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java
index 9fce6cf12d068..55b726ffd0da8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/ApplicationStateData.java
@@ -24,7 +24,10 @@
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationStateDataProto;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore.ApplicationState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
+import org.apache.hadoop.yarn.util.Records;
 
 /**
  * Contains all the state data that needs to be stored persistently 
@@ -32,19 +35,43 @@
  */
 @Public
 @Unstable
-public interface ApplicationStateData {
-  
+public abstract class ApplicationStateData {
+  public static ApplicationStateData newInstance(long submitTime,
+      long startTime, String user,
+      ApplicationSubmissionContext submissionContext,
+      RMAppState state, String diagnostics, long finishTime) {
+    ApplicationStateData appState = Records.newRecord(ApplicationStateData.class);
+    appState.setSubmitTime(submitTime);
+    appState.setStartTime(startTime);
+    appState.setUser(user);
+    appState.setApplicationSubmissionContext(submissionContext);
+    appState.setState(state);
+    appState.setDiagnostics(diagnostics);
+    appState.setFinishTime(finishTime);
+    return appState;
+  }
+
+  public static ApplicationStateData newInstance(
+      ApplicationState appState) {
+    return newInstance(appState.getSubmitTime(), appState.getStartTime(),
+        appState.getUser(), appState.getApplicationSubmissionContext(),
+        appState.getState(), appState.getDiagnostics(),
+        appState.getFinishTime());
+  }
+
+  public abstract ApplicationStateDataProto getProto();
+
   /**
    * The time at which the application was received by the Resource Manager
    * @return submitTime
    */
   @Public
   @Unstable
-  public long getSubmitTime();
+  public abstract long getSubmitTime();
   
   @Public
   @Unstable
-  public void setSubmitTime(long submitTime);
+  public abstract void setSubmitTime(long submitTime);
 
   /**
    * Get the <em>start time</em> of the application.
@@ -63,11 +90,11 @@ public interface ApplicationStateData {
    */
   @Public
   @Unstable
-  public void setUser(String user);
+  public abstract void setUser(String user);
   
   @Public
   @Unstable
-  public String getUser();
+  public abstract String getUser();
   
   /**
    * The {@link ApplicationSubmissionContext} for the application
@@ -76,34 +103,34 @@ public interface ApplicationStateData {
    */
   @Public
   @Unstable
-  public ApplicationSubmissionContext getApplicationSubmissionContext();
+  public abstract ApplicationSubmissionContext getApplicationSubmissionContext();
   
   @Public
   @Unstable
-  public void setApplicationSubmissionContext(
+  public abstract void setApplicationSubmissionContext(
       ApplicationSubmissionContext context);
 
   /**
    * Get the final state of the application.
    * @return the final state of the application.
    */
-  public RMAppState getState();
+  public abstract RMAppState getState();
 
-  public void setState(RMAppState state);
+  public abstract void setState(RMAppState state);
 
   /**
    * Get the diagnostics information for the application master.
    * @return the diagnostics information for the application master.
    */
-  public String getDiagnostics();
+  public abstract String getDiagnostics();
 
-  public void setDiagnostics(String diagnostics);
+  public abstract void setDiagnostics(String diagnostics);
 
   /**
    * The finish time of the application.
    * @return the finish time of the application.,
    */
-  public long getFinishTime();
+  public abstract long getFinishTime();
 
-  public void setFinishTime(long finishTime);
+  public abstract void setFinishTime(long finishTime);
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java
index 75ac2eef9a737..e3ebe5e08936c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java
@@ -25,10 +25,7 @@
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
 import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationAttemptIdPBImpl;
 import org.apache.hadoop.yarn.api.records.impl.pb.ContainerPBImpl;
-import org.apache.hadoop.yarn.api.records.impl.pb.ProtoBase;
 import org.apache.hadoop.yarn.api.records.impl.pb.ProtoUtils;
-import org.apache.hadoop.yarn.factories.RecordFactory;
-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.proto.YarnProtos.FinalApplicationStatusProto;
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationAttemptStateDataProto;
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationAttemptStateDataProtoOrBuilder;
@@ -36,12 +33,10 @@
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 
-public class ApplicationAttemptStateDataPBImpl
-extends ProtoBase<ApplicationAttemptStateDataProto> 
-implements ApplicationAttemptStateData {
-  private static final RecordFactory recordFactory = RecordFactoryProvider
-      .getRecordFactory(null);
+import com.google.protobuf.TextFormat;
 
+public class ApplicationAttemptStateDataPBImpl extends
+    ApplicationAttemptStateData {
   ApplicationAttemptStateDataProto proto = 
       ApplicationAttemptStateDataProto.getDefaultInstance();
   ApplicationAttemptStateDataProto.Builder builder = null;
@@ -60,7 +55,8 @@ public ApplicationAttemptStateDataPBImpl(
     this.proto = proto;
     viaProto = true;
   }
-  
+
+  @Override
   public ApplicationAttemptStateDataProto getProto() {
     mergeLocalToProto();
     proto = viaProto ? proto : builder.build();
@@ -76,7 +72,8 @@ private void mergeLocalToBuilder() {
       builder.setMasterContainer(((ContainerPBImpl)masterContainer).getProto());
     }
     if(this.appAttemptTokens != null) {
-      builder.setAppAttemptTokens(convertToProtoFormat(this.appAttemptTokens));
+      builder.setAppAttemptTokens(ProtoUtils.convertToProtoFormat(
+          this.appAttemptTokens));
     }
   }
 
@@ -148,7 +145,8 @@ public ByteBuffer getAppAttemptTokens() {
     if(!p.hasAppAttemptTokens()) {
       return null;
     }
-    this.appAttemptTokens = convertFromProtoFormat(p.getAppAttemptTokens());
+    this.appAttemptTokens = ProtoUtils.convertFromProtoFormat(
+        p.getAppAttemptTokens());
     return appAttemptTokens;
   }
 
@@ -249,24 +247,26 @@ public void setFinalApplicationStatus(FinalApplicationStatus finishState) {
     builder.setFinalApplicationStatus(convertToProtoFormat(finishState));
   }
 
-  public static ApplicationAttemptStateData newApplicationAttemptStateData(
-      ApplicationAttemptId attemptId, Container container,
-      ByteBuffer attemptTokens, long startTime, RMAppAttemptState finalState,
-      String finalTrackingUrl, String diagnostics,
-      FinalApplicationStatus amUnregisteredFinalStatus) {
-    ApplicationAttemptStateData attemptStateData =
-        recordFactory.newRecordInstance(ApplicationAttemptStateData.class);
-    attemptStateData.setAttemptId(attemptId);
-    attemptStateData.setMasterContainer(container);
-    attemptStateData.setAppAttemptTokens(attemptTokens);
-    attemptStateData.setState(finalState);
-    attemptStateData.setFinalTrackingUrl(finalTrackingUrl);
-    attemptStateData.setDiagnostics(diagnostics);
-    attemptStateData.setStartTime(startTime);
-    attemptStateData.setFinalApplicationStatus(amUnregisteredFinalStatus);
-    return attemptStateData;
+  @Override
+  public int hashCode() {
+    return getProto().hashCode();
   }
 
+  @Override
+  public boolean equals(Object other) {
+    if (other == null)
+      return false;
+    if (other.getClass().isAssignableFrom(this.getClass())) {
+      return this.getProto().equals(this.getClass().cast(other).getProto());
+    }
+    return false;
+  }
+
+  @Override
+  public String toString() {
+    return TextFormat.shortDebugString(getProto());
+  }
+  
   private static String RM_APP_ATTEMPT_PREFIX = ""RMATTEMPT_"";
   public static RMAppAttemptStateProto convertToProtoFormat(RMAppAttemptState e) {
     return RMAppAttemptStateProto.valueOf(RM_APP_ATTEMPT_PREFIX + e.name());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationStateDataPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationStateDataPBImpl.java
index ede8ca7c46155..8aaf1a4a7caf6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationStateDataPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationStateDataPBImpl.java
@@ -20,21 +20,15 @@
 
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationSubmissionContextPBImpl;
-import org.apache.hadoop.yarn.api.records.impl.pb.ProtoBase;
-import org.apache.hadoop.yarn.factories.RecordFactory;
-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationStateDataProto;
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.ApplicationStateDataProtoOrBuilder;
 import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RMAppStateProto;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
 
-public class ApplicationStateDataPBImpl 
-extends ProtoBase<ApplicationStateDataProto> 
-implements ApplicationStateData {
-  private static final RecordFactory recordFactory = RecordFactoryProvider
-      .getRecordFactory(null);
+import com.google.protobuf.TextFormat;
 
+public class ApplicationStateDataPBImpl extends ApplicationStateData {
   ApplicationStateDataProto proto = 
             ApplicationStateDataProto.getDefaultInstance();
   ApplicationStateDataProto.Builder builder = null;
@@ -51,7 +45,8 @@ public ApplicationStateDataPBImpl(
     this.proto = proto;
     viaProto = true;
   }
-  
+
+  @Override
   public ApplicationStateDataProto getProto() {
     mergeLocalToProto();
     proto = viaProto ? proto : builder.build();
@@ -136,7 +131,7 @@ public ApplicationSubmissionContext getApplicationSubmissionContext() {
     }
     applicationSubmissionContext = 
         new ApplicationSubmissionContextPBImpl(
-                                          p.getApplicationSubmissionContext());
+            p.getApplicationSubmissionContext());
     return applicationSubmissionContext;
   }
 
@@ -200,21 +195,24 @@ public void setFinishTime(long finishTime) {
     builder.setFinishTime(finishTime);
   }
 
-  public static ApplicationStateData newApplicationStateData(long submitTime,
-      long startTime, String user,
-      ApplicationSubmissionContext submissionContext, RMAppState state,
-      String diagnostics, long finishTime) {
-
-    ApplicationStateData appState =
-        recordFactory.newRecordInstance(ApplicationStateData.class);
-    appState.setSubmitTime(submitTime);
-    appState.setStartTime(startTime);
-    appState.setUser(user);
-    appState.setApplicationSubmissionContext(submissionContext);
-    appState.setState(state);
-    appState.setDiagnostics(diagnostics);
-    appState.setFinishTime(finishTime);
-    return appState;
+  @Override
+  public int hashCode() {
+    return getProto().hashCode();
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (other == null)
+      return false;
+    if (other.getClass().isAssignableFrom(this.getClass())) {
+      return this.getProto().equals(this.getClass().cast(other).getProto());
+    }
+    return false;
+  }
+
+  @Override
+  public String toString() {
+    return TextFormat.shortDebugString(getProto());
   }
 
   private static String RM_APP_PREFIX = ""RMAPP_"";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
index 3bdb66c4b407c..9c2d87e444250 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
@@ -84,8 +84,8 @@
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore.ApplicationState;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore.RMState;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStoreEvent;
-import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
-import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationAttemptStateData;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
@@ -612,7 +612,7 @@ public void testRMRestartWaitForPreviousSucceededAttempt() throws Exception {
 
       @Override
       public void updateApplicationStateInternal(ApplicationId appId,
-          ApplicationStateDataPBImpl appStateData) throws Exception {
+          ApplicationStateData appStateData) throws Exception {
         if (count == 0) {
           // do nothing; simulate app final state is not saved.
           LOG.info(appId + "" final state is not saved."");
@@ -760,14 +760,14 @@ public void testRMRestartKilledAppWithNoAttempts() throws Exception {
       @Override
       public synchronized void storeApplicationAttemptStateInternal(
           ApplicationAttemptId attemptId,
-          ApplicationAttemptStateDataPBImpl attemptStateData) throws Exception {
+          ApplicationAttemptStateData attemptStateData) throws Exception {
         // ignore attempt saving request.
       }
 
       @Override
       public synchronized void updateApplicationAttemptStateInternal(
           ApplicationAttemptId attemptId,
-          ApplicationAttemptStateDataPBImpl attemptStateData) throws Exception {
+          ApplicationAttemptStateData attemptStateData) throws Exception {
         // ignore attempt saving request.
       }
     };
@@ -1862,7 +1862,7 @@ public class TestMemoryRMStateStore extends MemoryRMStateStore {
 
     @Override
     public void updateApplicationStateInternal(ApplicationId appId,
-        ApplicationStateDataPBImpl appStateData) throws Exception {
+        ApplicationStateData appStateData) throws Exception {
       updateApp = ++count;
       super.updateApplicationStateInternal(appId, appStateData);
     }
@@ -1871,7 +1871,7 @@ public void updateApplicationStateInternal(ApplicationId appId,
     public synchronized void
         updateApplicationAttemptStateInternal(
             ApplicationAttemptId attemptId,
-            ApplicationAttemptStateDataPBImpl attemptStateData)
+            ApplicationAttemptStateData attemptStateData)
             throws Exception {
       updateAttempt = ++count;
       super.updateApplicationAttemptStateInternal(attemptId,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
index 792b73e5a6648..da25c5beda6ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Assert;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -37,6 +36,7 @@
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMStateVersion;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.RMStateVersionPBImpl;
@@ -213,9 +213,8 @@ public void run() {
           try {
             store.storeApplicationStateInternal(
                 ApplicationId.newInstance(100L, 1),
-                (ApplicationStateDataPBImpl) ApplicationStateDataPBImpl
-                    .newApplicationStateData(111, 111, ""user"", null,
-                        RMAppState.ACCEPTED, ""diagnostics"", 333));
+                ApplicationStateData.newInstance(111, 111, ""user"", null,
+                    RMAppState.ACCEPTED, ""diagnostics"", 333));
           } catch (Exception e) {
             // TODO 0 datanode exception will not be retried by dfs client, fix
             // that separately."
a1c7a707cac478b7288dfc34cd2fccecb68d0c35,hadoop,YARN-2502. Changed DistributedShell to support node- labels. Contributed by Wangda Tan (cherry picked from commit- f6b963fdfc517429149165e4bb6fb947be6e3c99)--,a,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b1bd6eb104516..9c08db7de02f2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -374,6 +374,9 @@ Release 2.6.0 - UNRELEASED
     sake of localization and log-aggregation for long-running services. (Jian He
     via vinodkv)
 
+    YARN-2502. Changed DistributedShell to support node labels. (Wangda Tan via
+    jianhe)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
index 2067aca481031..0e9a4e4a495fa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
@@ -115,7 +115,7 @@
 public class Client {
 
   private static final Log LOG = LogFactory.getLog(Client.class);
-
+  
   // Configuration
   private Configuration conf;
   private YarnClient yarnClient;
@@ -152,6 +152,7 @@ public class Client {
   private int containerVirtualCores = 1;
   // No. of containers in which the shell script needs to be executed
   private int numContainers = 1;
+  private String nodeLabelExpression = null;
 
   // log4j.properties file 
   // if available, add to local resources and set into classpath 
@@ -280,7 +281,12 @@ public Client(Configuration conf) throws Exception  {
     opts.addOption(""create"", false, ""Flag to indicate whether to create the ""
         + ""domain specified with -domain."");
     opts.addOption(""help"", false, ""Print usage"");
-
+    opts.addOption(""node_label_expression"", true,
+        ""Node label expression to determine the nodes""
+            + "" where all the containers of this application""
+            + "" will be allocated, \""\"" means containers""
+            + "" can be allocated anywhere, if you don't specify the option,""
+            + "" default node_label_expression of queue will be used."");
   }
 
   /**
@@ -391,6 +397,7 @@ public boolean init(String[] args) throws ParseException {
     containerMemory = Integer.parseInt(cliParser.getOptionValue(""container_memory"", ""10""));
     containerVirtualCores = Integer.parseInt(cliParser.getOptionValue(""container_vcores"", ""1""));
     numContainers = Integer.parseInt(cliParser.getOptionValue(""num_containers"", ""1""));
+    
 
     if (containerMemory < 0 || containerVirtualCores < 0 || numContainers < 1) {
       throw new IllegalArgumentException(""Invalid no. of containers or container memory/vcores specified,""
@@ -399,6 +406,8 @@ public boolean init(String[] args) throws ParseException {
           + "", containerVirtualCores="" + containerVirtualCores
           + "", numContainer="" + numContainers);
     }
+    
+    nodeLabelExpression = cliParser.getOptionValue(""node_label_expression"", null);
 
     clientTimeout = Integer.parseInt(cliParser.getOptionValue(""timeout"", ""600000""));
 
@@ -617,6 +626,9 @@ public boolean run() throws IOException, YarnException {
     vargs.add(""--container_memory "" + String.valueOf(containerMemory));
     vargs.add(""--container_vcores "" + String.valueOf(containerVirtualCores));
     vargs.add(""--num_containers "" + String.valueOf(numContainers));
+    if (null != nodeLabelExpression) {
+      appContext.setNodeLabelExpression(nodeLabelExpression);
+    }
     vargs.add(""--priority "" + String.valueOf(shellCmdPriority));
 
     for (Map.Entry<String, String> entry : shellEnv.entrySet()) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
index 2414d4d3ea964..0ded5bd60c53b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
@@ -30,7 +30,9 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.logging.Log;
@@ -42,6 +44,7 @@
 import org.apache.hadoop.util.JarFinder;
 import org.apache.hadoop.util.Shell;
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
+import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
 import org.apache.hadoop.yarn.api.records.timeline.TimelineDomain;
 import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
@@ -49,40 +52,81 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.MiniYARNCluster;
 import org.apache.hadoop.yarn.server.nodemanager.NodeManager;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.ContainerManagerImpl;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableMap;
+
 public class TestDistributedShell {
 
   private static final Log LOG =
       LogFactory.getLog(TestDistributedShell.class);
 
   protected MiniYARNCluster yarnCluster = null;
-  protected Configuration conf = new YarnConfiguration();
+  private int numNodeManager = 1;
+  
+  private YarnConfiguration conf = null;
 
   protected final static String APPMASTER_JAR =
       JarFinder.getJar(ApplicationMaster.class);
+  
+  private void initializeNodeLabels() throws IOException {
+    RMContext rmContext = yarnCluster.getResourceManager(0).getRMContext();
+
+    // Setup node labels
+    RMNodeLabelsManager labelsMgr = rmContext.getNodeLabelManager();
+    Set<String> labels = new HashSet<String>();
+    labels.add(""x"");
+    labelsMgr.addToCluserNodeLabels(labels);
+
+    // Setup queue access to node labels
+    conf.set(""yarn.scheduler.capacity.root.accessible-node-labels"", ""x"");
+    conf.set(""yarn.scheduler.capacity.root.default.accessible-node-labels"", ""x"");
+    conf.set(
+        ""yarn.scheduler.capacity.root.default.accessible-node-labels.x.capacity"",
+        ""100"");
+
+    rmContext.getScheduler().reinitialize(conf, rmContext);
+
+    // Fetch node-ids from yarn cluster
+    NodeId[] nodeIds = new NodeId[numNodeManager];
+    for (int i = 0; i < numNodeManager; i++) {
+      NodeManager mgr = this.yarnCluster.getNodeManager(i);
+      nodeIds[i] = mgr.getNMContext().getNodeId();
+    }
+
+    // Set label x to NM[1]
+    labelsMgr.addLabelsToNode(ImmutableMap.of(nodeIds[1], labels));
+  }
 
   @Before
   public void setup() throws Exception {
     LOG.info(""Starting up YARN cluster"");
+    
+    conf = new YarnConfiguration();
     conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128);
-    conf.setClass(YarnConfiguration.RM_SCHEDULER, 
-        FifoScheduler.class, ResourceScheduler.class);
     conf.set(""yarn.log.dir"", ""target"");
     conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+    conf.set(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class.getName());
+    numNodeManager = 2;
+    
     if (yarnCluster == null) {
-      yarnCluster = new MiniYARNCluster(
-        TestDistributedShell.class.getSimpleName(), 1, 1, 1, 1, true);
+      yarnCluster =
+          new MiniYARNCluster(TestDistributedShell.class.getSimpleName(), 1,
+              numNodeManager, 1, 1, true);
       yarnCluster.init(conf);
+      
       yarnCluster.start();
-      NodeManager  nm = yarnCluster.getNodeManager(0);
-      waitForNMToRegister(nm);
+      
+      waitForNMsToRegister();
+      
+      // currently only capacity scheduler support node labels,
+      initializeNodeLabels();
       
       URL url = Thread.currentThread().getContextClassLoader().getResource(""yarn-site.xml"");
       if (url == null) {
@@ -757,13 +801,15 @@ public void testDSShellWithInvalidArgs() throws Exception {
     }
   }
 
-  protected static void waitForNMToRegister(NodeManager nm)
-      throws Exception {
-    int attempt = 60;
-    ContainerManagerImpl cm =
-        ((ContainerManagerImpl) nm.getNMContext().getContainerManager());
-    while (cm.getBlockNewContainerRequestsStatus() && attempt-- > 0) {
-      Thread.sleep(2000);
+  protected void waitForNMsToRegister() throws Exception {
+    int sec = 60;
+    while (sec >= 0) {
+      if (yarnCluster.getResourceManager().getRMContext().getRMNodes().size() 
+          >= numNodeManager) {
+        break;
+      }
+      Thread.sleep(1000);
+      sec--;
     }
   }
 
@@ -892,5 +938,88 @@ private int verifyContainerLog(int containerNum,
     }
     return numOfWords;
   }
+  
+  @Test(timeout=90000)
+  public void testDSShellWithNodeLabelExpression() throws Exception {
+    // Start NMContainerMonitor
+    NMContainerMonitor mon = new NMContainerMonitor();
+    Thread t = new Thread(mon);
+    t.start();
+
+    // Submit a job which will sleep for 60 sec
+    String[] args = {
+        ""--jar"",
+        APPMASTER_JAR,
+        ""--num_containers"",
+        ""4"",
+        ""--shell_command"",
+        ""sleep"",
+        ""--shell_args"",
+        ""15"",
+        ""--master_memory"",
+        ""512"",
+        ""--master_vcores"",
+        ""2"",
+        ""--container_memory"",
+        ""128"",
+        ""--container_vcores"",
+        ""1"",
+        ""--node_label_expression"",
+        ""x""
+    };
+
+    LOG.info(""Initializing DS Client"");
+    final Client client =
+        new Client(new Configuration(yarnCluster.getConfig()));
+    boolean initSuccess = client.init(args);
+    Assert.assertTrue(initSuccess);
+    LOG.info(""Running DS Client"");
+    boolean result = client.run();
+    LOG.info(""Client run completed. Result="" + result);
+    
+    t.interrupt();
+    
+    // Check maximum number of containers on each NMs
+    int[] maxRunningContainersOnNMs = mon.getMaxRunningContainersReport();
+    // Check no container allocated on NM[0]
+    Assert.assertEquals(0, maxRunningContainersOnNMs[0]);
+    // Check there're some containers allocated on NM[1]
+    Assert.assertTrue(maxRunningContainersOnNMs[1] > 0);
+  }
+  
+  /**
+   * Monitor containers running on NMs
+   */
+  private class NMContainerMonitor implements Runnable {
+    // The interval of milliseconds of sampling (500ms)
+    final static int SAMPLING_INTERVAL_MS = 500;
+    
+    // The maximum number of containers running on each NMs
+    int[] maxRunningContainersOnNMs = new int[numNodeManager];
+
+    @Override
+    public void run() {
+      while (true) {
+        for (int i = 0; i < numNodeManager; i++) {
+          int nContainers =
+              yarnCluster.getNodeManager(i).getNMContext().getContainers()
+                  .size();
+          if (nContainers > maxRunningContainersOnNMs[i]) {
+            maxRunningContainersOnNMs[i] = nContainers;
+          }
+        }
+        try {
+          Thread.sleep(SAMPLING_INTERVAL_MS);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+          break;
+        }
+      }
+    }
+    
+    public int[] getMaxRunningContainersReport() {
+      return maxRunningContainersOnNMs;
+    }
+  }
 }"
a7e7e662aec3201493c48b78be0ec0a7ef3cfbbe,restlet-framework-java,Added parsing of RDF XML.--,a,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/org.restlet.ext.rdf/src/org/restlet/ext/rdf/internal/xml/RdfXmlParsingContentHandler.java b/modules/org.restlet.ext.rdf/src/org/restlet/ext/rdf/internal/xml/RdfXmlParsingContentHandler.java
index 27c975a8e3..e56a6f7921 100644
--- a/modules/org.restlet.ext.rdf/src/org/restlet/ext/rdf/internal/xml/RdfXmlParsingContentHandler.java
+++ b/modules/org.restlet.ext.rdf/src/org/restlet/ext/rdf/internal/xml/RdfXmlParsingContentHandler.java
@@ -157,16 +157,13 @@ public void endElement(String uri, String localName, String name)
 			if (state == State.SUBJECT) {
 				popSubject();
 			} else if (state == State.PREDICATE) {
-				if (this.builder.length() > 0) {
-					this.graphHandler.link(getCurrentSubject(),
-							this.currentPredicate, getLiteral(builder
-									.toString(), null, this.currentLanguage));
-				}
+				this.graphHandler.link(getCurrentSubject(),
+						this.currentPredicate, getLiteral(builder.toString(),
+								null, this.currentLanguage));
+
 			} else if (state == State.OBJECT) {
-				if (this.builder.length() > 0) {
-					this.currentObject = getLiteral(builder.toString(), null,
-							this.currentLanguage);
-				}
+				this.currentObject = getLiteral(builder.toString(), null,
+						this.currentLanguage);
 			} else if (state == State.LITERAL) {
 				if (nodeDepth == 0) {
 					// End of the XML literal"
e4c27097b8e3b8ba00b731ff4d134e4e4cb71d94,Mylyn Reviews,"ANTLR Dsl Cleanup

Ignore recognition errors from lexer/parser
Prevented NPE
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
index 75b03c6e..45dff368 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
@@ -114,15 +114,15 @@ public void mapResultToTask(
 	public org.eclipse.mylyn.reviews.tasks.core.ReviewResult mapCurrentReviewResult(
 			ITaskProperties taskProperties) {
 		Assert.isNotNull(taskProperties);
-		if (taskProperties.getNewCommentText() == null)
+		if (taskProperties.getNewCommentText() == null || taskProperties.getNewCommentText().isEmpty())
 			return null;
 		ReviewResult result = null;
 		try {
 			ReviewDslResult res = parser.parseReviewResult(taskProperties
 					.getNewCommentText());
-			result = new ReviewResult();
 			if (res == null)
 				return null;
+			result = new ReviewResult();
 			result.setComment(res.getComment());
 			result.setRating(mapRating(res.getRating()));
 			// FIXME filecomment, linecomment
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java
index 69cf5513..6e041e40 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java
@@ -61,6 +61,11 @@ public ReviewDslLexer(CharStream input) {
         super(input);
     }
     public String getGrammarFileName() { return ""ReviewDsl.g""; }
+@Override
+
+	public void reportError(RecognitionException arg0) {
+		/* ignore */
+	}
 
     // $ANTLR start T12
     public final void mT12() throws RecognitionException {
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
index 93fed735..2f111f18 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
@@ -19,14 +19,13 @@
 import org.eclipse.mylyn.reviews.tasks.dsl.IReviewDslMapper;
 import org.eclipse.mylyn.reviews.tasks.dsl.ParseException;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem.Type;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslChangesetScopeItem;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult;
-import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem.Type;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult.FileComment;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult.LineComment;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult.Rating;
 import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScope;
-import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScopeItem;
 import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.attachmentSource_return;
 import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.changesetDef_return;
 import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.fileComment_return;
@@ -39,12 +38,15 @@
 /**
  * 
  * @author mattk
- *
+ * 
  */
 public class ReviewDslMapper implements IReviewDslMapper {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#parseReviewResult(java.lang.String)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#
+	 * parseReviewResult(java.lang.String)
 	 */
 	@Override
 	public ReviewDslResult parseReviewResult(String text) throws ParseException {
@@ -52,25 +54,30 @@ public ReviewDslResult parseReviewResult(String text) throws ParseException {
 		TokenStream input = new CommonTokenStream(lexer);
 		ReviewDslParser parser = new ReviewDslParser(input);
 		try {
-			return mapResult(parser.reviewResult(), parser.getTreeAdaptor());
-		} catch (RecognitionException e) {
+			return mapResult(parser.reviewResult());
+		} catch (Exception e) {
 			throw new ParseException(e.getMessage());
 		}
 
 	}
 
-	private ReviewDslResult mapResult(reviewResult_return reviewResult,
-			TreeAdaptor treeAdaptor) {
-		ReviewDslResult result = new ReviewDslResult();
-
-		result.setRating(Rating.valueOf(reviewResult.result));
-		result.setComment(convertStr(reviewResult.comment));
-		if (reviewResult.fileComments != null) {
-			for (int i = 0; i < reviewResult.fileComments.size(); i++) {
-				fileComment_return fc = (fileComment_return) reviewResult.fileComments
-						.get(i);
-				result.getFileComments().add(map(fc));
+	private ReviewDslResult mapResult(reviewResult_return reviewResult) {
+		ReviewDslResult result = null;
+		try {
+			result = new ReviewDslResult();
+			result.setRating(Rating.valueOf(reviewResult.result));
+			result.setComment(convertStr(reviewResult.comment));
+			if (reviewResult.fileComments != null) {
+				for (int i = 0; i < reviewResult.fileComments.size(); i++) {
+					fileComment_return fc = (fileComment_return) reviewResult.fileComments
+							.get(i);
+					result.getFileComments().add(map(fc));
+				}
+			}
+			if(result.getRating()==null && result.getComment()==null && result.getFileComments().size()==0) {
+				return null;
 			}
+		} catch (Exception ex) {
 		}
 		return result;
 	}
@@ -114,8 +121,11 @@ private String convertStr(String string) {
 		return string.substring(startIdx, endIdx);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#parseReviewScope(java.lang.String)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#
+	 * parseReviewScope(java.lang.String)
 	 */
 	@Override
 	public ReviewDslScope parseReviewScope(String text) throws ParseException {
@@ -161,27 +171,24 @@ private ReviewDslChangesetScopeItem parseChangeSet(changesetDef_return child) {
 
 	private ReviewDslAttachmentScopeItem parseResource(
 			resourceDef_return child, TreeAdaptor treeAdaptor) {
-		AttachmentSource source = parseAttachmentSource(
-				(attachmentSource_return) child.source);
+		AttachmentSource source = parseAttachmentSource((attachmentSource_return) child.source);
 		return new ReviewDslAttachmentScopeItem(Type.RESOURCE, source.fileName,
 				source.author, source.createdDate, source.taskId);
 	}
 
 	private ReviewDslAttachmentScopeItem parsePatch(patchDef_return child,
 			TreeAdaptor treeAdaptor) {
-	
-		AttachmentSource source = parseAttachmentSource(
-				(attachmentSource_return) 	child.source);
+
+		AttachmentSource source = parseAttachmentSource((attachmentSource_return) child.source);
 		return new ReviewDslAttachmentScopeItem(Type.PATCH, source.fileName,
 				source.author, source.createdDate, source.taskId);
 	}
 
-	private AttachmentSource parseAttachmentSource(
-			attachmentSource_return child) {
+	private AttachmentSource parseAttachmentSource(attachmentSource_return child) {
 		AttachmentSource source = new AttachmentSource();
 		source.fileName = convertStr(child.filename);
 		source.author = convertStr(child.author);
-		source.createdDate =convertStr(child.createdDate);
+		source.createdDate = convertStr(child.createdDate);
 		source.taskId = convertStr(child.taskId);
 		return source;
 	}
@@ -193,20 +200,6 @@ private static class AttachmentSource {
 		public String taskId;
 	}
 
-	public static void main(String[] args) throws Exception {
-		// String text = ""Review result: TODO Comment: \""test\"""";
-		String text = ""Review scope: Patch from Attachment \""0001-Extension-point-for-scm-connector-defined-jaxb-model.patch\"" by \""Jane@inso.tuwien.ac.at\"" on \""2010-06-25 17:42:00\"" of task 85"";
-		IReviewDslMapper reviewDslMapper = new ReviewDslMapper();
-		ReviewDslScope parseReviewScope = reviewDslMapper
-				.parseReviewScope(text);
-
-		if (parseReviewScope != null) {
-			for (ReviewDslScopeItem item : parseReviewScope.getItems()) {
-				System.err.println(item);
-			}
-		}
-	}
-
 	@Override
 	public ReviewDslResult parseChangedReviewScope(String text) {
 		// TODO Auto-generated method stub
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java
index 5291ed39..2646a22a 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java
@@ -1151,4 +1151,8 @@ public final taskIdDef_return taskIdDef() throws RecognitionException {
 	public static final BitSet FOLLOW_set_in_taskIdDef0 = new BitSet(
 			new long[] { 0x0000000000000002L });
 
+	@Override
+	public void reportError(RecognitionException arg0) {
+		/* */
+	}
 }
\ No newline at end of file"
62f5e2a99d4f5c8bebf2b7ad581cae83ac437d0b,orientdb,Minor optimization in RidBag--,p,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/embedded/OEmbeddedRidBag.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/embedded/OEmbeddedRidBag.java
index 1de797ed631..a9ec16c94a0 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/embedded/OEmbeddedRidBag.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/embedded/OEmbeddedRidBag.java
@@ -19,9 +19,20 @@
  */
 package com.orientechnologies.orient.core.db.record.ridbag.embedded;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.UUID;
+import java.util.WeakHashMap;
+
 import com.orientechnologies.common.serialization.types.OIntegerSerializer;
 import com.orientechnologies.common.util.OResettable;
 import com.orientechnologies.common.util.OSizeable;
+import com.orientechnologies.orient.core.config.OGlobalConfiguration;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.db.record.OMultiValueChangeEvent;
 import com.orientechnologies.orient.core.db.record.OMultiValueChangeListener;
@@ -30,16 +41,6 @@
 import com.orientechnologies.orient.core.record.ORecord;
 import com.orientechnologies.orient.core.serialization.serializer.binary.impl.OLinkSerializer;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.UUID;
-import java.util.WeakHashMap;
-
 public class OEmbeddedRidBag implements ORidBagDelegate {
   private byte[]                                                       serializedContent = null;
 
@@ -110,9 +111,9 @@ public void remove() {
       size--;
       contentWasChanged = true;
 
-      fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(
-          OMultiValueChangeEvent.OChangeType.REMOVE, nextValue, null, nextValue));
-
+      if (!changeListeners.isEmpty())
+        fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(
+            OMultiValueChangeEvent.OChangeType.REMOVE, nextValue, null, nextValue));
     }
 
     @Override
@@ -168,8 +169,9 @@ public void add(OIdentifiable identifiable) {
     size++;
     contentWasChanged = true;
 
-    fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(OMultiValueChangeEvent.OChangeType.ADD,
-        identifiable, identifiable));
+    if (!changeListeners.isEmpty())
+      fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(OMultiValueChangeEvent.OChangeType.ADD,
+          identifiable, identifiable));
   }
 
   public OEmbeddedRidBag copy() {
@@ -194,8 +196,9 @@ public void remove(OIdentifiable identifiable) {
       size--;
       contentWasChanged = true;
 
-      fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(
-          OMultiValueChangeEvent.OChangeType.REMOVE, identifiable, null, identifiable));
+      if (!changeListeners.isEmpty())
+        fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(
+            OMultiValueChangeEvent.OChangeType.REMOVE, identifiable, null, identifiable));
     }
   }
 
@@ -382,7 +385,9 @@ public int serialize(byte[] stream, int offset, UUID ownerUuid) {
       offset += OIntegerSerializer.INT_SIZE;
     }
 
-    for (Object entry : entries) {
+    final int totEntries = entries.length;
+    for (int i = 0; i < totEntries; ++i) {
+      final Object entry = entries[i];
       if (entry instanceof OIdentifiable) {
         OLinkSerializer.INSTANCE.serialize((OIdentifiable) entry, stream, offset);
         offset += OLinkSerializer.RID_SIZE;
@@ -426,11 +431,12 @@ protected void fireCollectionChangedEvent(final OMultiValueChangeEvent<OIdentifi
     }
   }
 
-  private void addEntry(OIdentifiable identifiable) {
+  private void addEntry(final OIdentifiable identifiable) {
     if (entries.length == entriesLength) {
-      if (entriesLength == 0)
-        entries = new Object[4];
-      else {
+      if (entriesLength == 0) {
+        final int cfgValue = OGlobalConfiguration.RID_BAG_EMBEDDED_TO_SBTREEBONSAI_THRESHOLD.getValueAsInteger();
+        entries = new Object[cfgValue > 0 ? Math.min(cfgValue, 40) : 40];
+      } else {
         final Object[] oldEntries = entries;
         entries = new Object[entries.length << 1];
         System.arraycopy(oldEntries, 0, entries, 0, oldEntries.length);
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/sbtree/OSBTreeRidBag.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/sbtree/OSBTreeRidBag.java
index 7b098fa1a8f..a2d3e1a79fc 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/sbtree/OSBTreeRidBag.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/sbtree/OSBTreeRidBag.java
@@ -367,7 +367,7 @@ public void remove() {
         }
       }
 
-      if (updateOwner)
+      if (updateOwner && !changeListeners.isEmpty())
         fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(
             OMultiValueChangeEvent.OChangeType.REMOVE, currentValue, null, currentValue, false));
       currentRemoved = true;
@@ -614,7 +614,7 @@ public void addAll(Collection<OIdentifiable> values) {
     }
   }
 
-  public void add(OIdentifiable identifiable) {
+  public void add(final OIdentifiable identifiable) {
     if (identifiable.getIdentity().isValid()) {
       Change counter = changes.get(identifiable);
       if (counter == null)
@@ -627,7 +627,7 @@ public void add(OIdentifiable identifiable) {
         counter.increment();
       }
     } else {
-      OModifiableInteger counter = newEntries.get(identifiable);
+      final OModifiableInteger counter = newEntries.get(identifiable);
       if (counter == null)
         newEntries.put(identifiable, new OModifiableInteger(1));
       else
@@ -637,7 +637,7 @@ public void add(OIdentifiable identifiable) {
     if (size >= 0)
       size++;
 
-    if (updateOwner)
+    if (updateOwner && !changeListeners.isEmpty())
       fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(OMultiValueChangeEvent.OChangeType.ADD,
           identifiable, identifiable, null, false));
   }
@@ -667,7 +667,7 @@ public void remove(OIdentifiable identifiable) {
       }
     }
 
-    if (updateOwner)
+    if (updateOwner && !changeListeners.isEmpty())
       fireCollectionChangedEvent(new OMultiValueChangeEvent<OIdentifiable, OIdentifiable>(
           OMultiValueChangeEvent.OChangeType.REMOVE, identifiable, null, identifiable, false));
   }
@@ -868,15 +868,15 @@ public OBonsaiCollectionPointer getCollectionPointer() {
     return collectionPointer;
   }
 
+  public void setCollectionPointer(OBonsaiCollectionPointer collectionPointer) {
+    this.collectionPointer = collectionPointer;
+  }
+
   @Override
   public Set<OMultiValueChangeListener<OIdentifiable, OIdentifiable>> getChangeListeners() {
     return Collections.unmodifiableSet(changeListeners);
   }
 
-  public void setCollectionPointer(OBonsaiCollectionPointer collectionPointer) {
-    this.collectionPointer = collectionPointer;
-  }
-
   protected void fireCollectionChangedEvent(final OMultiValueChangeEvent<OIdentifiable, OIdentifiable> event) {
     for (final OMultiValueChangeListener<OIdentifiable, OIdentifiable> changeListener : changeListeners) {
       if (changeListener != null)"
ffd554b271debbdb29ac9f130ca6797f4859a1f9,hadoop,YARN-1734. Fixed ResourceManager to update the- configurations when it transits from standby to active mode so as to- assimilate any changes that happened while it was in standby mode.- Contributed by Xuan Gong. svn merge --ignore-ancestry -c 1571539 ../../trunk/--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571540 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 7d48a4fe12ac0..e34dbbf3c04a7 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -333,6 +333,10 @@ Release 2.4.0 - UNRELEASED
     re-registration after a RESYNC and thus avoid hanging. (Rohith Sharma via
     vinodkv)
 
+    YARN-1734. Fixed ResourceManager to update the configurations when it
+    transits from standby to active mode so as to assimilate any changes that
+    happened while it was in standby mode. (Xuan Gong via vinodkv)
+
 Release 2.3.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
index 70845c775e481..c53d40f54a1db 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
@@ -250,10 +250,20 @@ public synchronized void monitorHealth()
   @Override
   public synchronized void transitionToActive(
       HAServiceProtocol.StateChangeRequestInfo reqInfo) throws IOException {
+    // call refreshAdminAcls before HA state transition
+    // for the case that adminAcls have been updated in previous active RM
+    try {
+      refreshAdminAcls(false);
+    } catch (YarnException ex) {
+      throw new ServiceFailedException(""Can not execute refreshAdminAcls"", ex);
+    }
+
     UserGroupInformation user = checkAccess(""transitionToActive"");
     checkHaStateChange(reqInfo);
     try {
       rm.transitionToActive();
+      // call all refresh*s for active RM to get the updated configurations.
+      refreshAll();
       RMAuditLogger.logSuccess(user.getShortUserName(),
           ""transitionToActive"", ""RMHAProtocolService"");
     } catch (Exception e) {
@@ -268,6 +278,13 @@ public synchronized void transitionToActive(
   @Override
   public synchronized void transitionToStandby(
       HAServiceProtocol.StateChangeRequestInfo reqInfo) throws IOException {
+    // call refreshAdminAcls before HA state transition
+    // for the case that adminAcls have been updated in previous active RM
+    try {
+      refreshAdminAcls(false);
+    } catch (YarnException ex) {
+      throw new ServiceFailedException(""Can not execute refreshAdminAcls"", ex);
+    }
     UserGroupInformation user = checkAccess(""transitionToStandby"");
     checkHaStateChange(reqInfo);
     try {
@@ -406,10 +423,15 @@ public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
   @Override
   public RefreshAdminAclsResponse refreshAdminAcls(
       RefreshAdminAclsRequest request) throws YarnException, IOException {
+    return refreshAdminAcls(true);
+  }
+
+  private RefreshAdminAclsResponse refreshAdminAcls(boolean checkRMHAState)
+      throws YarnException, IOException {
     String argName = ""refreshAdminAcls"";
     UserGroupInformation user = checkAcls(argName);
-    
-    if (!isRMActive()) {
+
+    if (checkRMHAState && !isRMActive()) {
       RMAuditLogger.logFailure(user.getShortUserName(), argName,
           adminAcl.toString(), ""AdminService"",
           ""ResourceManager is not active. Can not refresh user-groups."");
@@ -521,6 +543,24 @@ private synchronized Configuration getConfiguration(Configuration conf,
     return conf;
   }
 
+  private void refreshAll() throws ServiceFailedException {
+    try {
+      refreshQueues(RefreshQueuesRequest.newInstance());
+      refreshNodes(RefreshNodesRequest.newInstance());
+      refreshSuperUserGroupsConfiguration(
+          RefreshSuperUserGroupsConfigurationRequest.newInstance());
+      refreshUserToGroupsMappings(
+          RefreshUserToGroupsMappingsRequest.newInstance());
+      if (getConfig().getBoolean(
+          CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
+          false)) {
+        refreshServiceAcls(RefreshServiceAclsRequest.newInstance());
+      }
+    } catch (Exception ex) {
+      throw new ServiceFailedException(ex.getMessage());
+    }
+  }
+
   @VisibleForTesting
   public AccessControlList getAccessControlList() {
     return this.adminAcl;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
index e67b81f36f27c..60259cddbd558 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
@@ -34,12 +34,16 @@
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.ha.HAServiceProtocol;
+import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
+import org.apache.hadoop.ha.HAServiceProtocol.StateChangeRequestInfo;
 import org.apache.hadoop.security.GroupMappingServiceProvider;
 import org.apache.hadoop.security.Groups;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.AccessControlList;
 import org.apache.hadoop.security.authorize.ProxyUsers;
 import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
+import org.apache.hadoop.yarn.conf.HAUtil;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
@@ -518,6 +522,94 @@ public void testRefreshNodesWithFileSystemBasedConfigurationProvider()
     Assert.assertTrue(excludeHosts.contains(""0.0.0.0:123""));
   }
 
+  @Test
+  public void testRMHAWithFileSystemBasedConfiguration() throws IOException,
+      YarnException {
+    StateChangeRequestInfo requestInfo = new StateChangeRequestInfo(
+        HAServiceProtocol.RequestSource.REQUEST_BY_USER);
+    configuration.set(YarnConfiguration.RM_CONFIGURATION_PROVIDER_CLASS,
+        ""org.apache.hadoop.yarn.FileSystemBasedConfigurationProvider"");
+    configuration.setBoolean(YarnConfiguration.RM_HA_ENABLED, true);
+    configuration.setBoolean(YarnConfiguration.AUTO_FAILOVER_ENABLED, false);
+    configuration.set(YarnConfiguration.RM_HA_IDS, ""rm1,rm2"");
+    int base = 100;
+    for (String confKey : YarnConfiguration
+        .getServiceAddressConfKeys(configuration)) {
+      configuration.set(HAUtil.addSuffix(confKey, ""rm1""), ""0.0.0.0:""
+          + (base + 20));
+      configuration.set(HAUtil.addSuffix(confKey, ""rm2""), ""0.0.0.0:""
+          + (base + 40));
+      base = base * 2;
+    }
+    Configuration conf1 = new Configuration(configuration);
+    conf1.set(YarnConfiguration.RM_HA_ID, ""rm1"");
+    Configuration conf2 = new Configuration(configuration);
+    conf2.set(YarnConfiguration.RM_HA_ID, ""rm2"");
+
+    // upload default configurations
+    uploadDefaultConfiguration();
+
+    MockRM rm1 = null;
+    MockRM rm2 = null;
+    try {
+      rm1 = new MockRM(conf1);
+      rm1.init(conf1);
+      rm1.start();
+      Assert.assertTrue(rm1.getRMContext().getHAServiceState()
+          == HAServiceState.STANDBY);
+
+      rm2 = new MockRM(conf2);
+      rm2.init(conf1);
+      rm2.start();
+      Assert.assertTrue(rm2.getRMContext().getHAServiceState()
+          == HAServiceState.STANDBY);
+
+      rm1.adminService.transitionToActive(requestInfo);
+      Assert.assertTrue(rm1.getRMContext().getHAServiceState()
+          == HAServiceState.ACTIVE);
+
+      CapacitySchedulerConfiguration csConf =
+          new CapacitySchedulerConfiguration();
+      csConf.set(""yarn.scheduler.capacity.maximum-applications"", ""5000"");
+      uploadConfiguration(csConf, ""capacity-scheduler.xml"");
+
+      rm1.adminService.refreshQueues(RefreshQueuesRequest.newInstance());
+
+      int maxApps =
+          ((CapacityScheduler) rm1.getRMContext().getScheduler())
+              .getConfiguration().getMaximumSystemApplications();
+      Assert.assertEquals(maxApps, 5000);
+
+      // Before failover happens, the maxApps is
+      // still the default value on the standby rm : rm2
+      int maxAppsBeforeFailOver =
+          ((CapacityScheduler) rm2.getRMContext().getScheduler())
+              .getConfiguration().getMaximumSystemApplications();
+      Assert.assertEquals(maxAppsBeforeFailOver, 10000);
+
+      // Do the failover
+      rm1.adminService.transitionToStandby(requestInfo);
+      rm2.adminService.transitionToActive(requestInfo);
+      Assert.assertTrue(rm1.getRMContext().getHAServiceState()
+          == HAServiceState.STANDBY);
+      Assert.assertTrue(rm2.getRMContext().getHAServiceState()
+          == HAServiceState.ACTIVE);
+
+      int maxAppsAfter =
+          ((CapacityScheduler) rm2.getRMContext().getScheduler())
+              .getConfiguration().getMaximumSystemApplications();
+
+      Assert.assertEquals(maxAppsAfter, 5000);
+    } finally {
+      if (rm1 != null) {
+        rm1.stop();
+      }
+      if (rm2 != null) {
+        rm2.stop();
+      }
+    }
+  }
+
   private String writeConfigurationXML(Configuration conf, String confXMLName)
       throws IOException {
     DataOutputStream output = null;"
319e34aa1743781b453df5df51f03183b123560a,restlet-framework-java, - Continued SIP transaction support--,a,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacClientResource.java b/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacClientResource.java
index b5ef0cb714..2c1372424b 100644
--- a/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacClientResource.java
+++ b/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacClientResource.java
@@ -30,11 +30,14 @@
 
 package org.restlet.example.ext.sip;
 
+import java.util.logging.Level;
+
 import org.restlet.Client;
 import org.restlet.Context;
 import org.restlet.data.Protocol;
+import org.restlet.engine.Engine;
+import org.restlet.ext.sip.Address;
 import org.restlet.ext.sip.SipClientResource;
-import org.restlet.resource.ClientResource;
 
 /**
  * Example SIP client resource for the UAC test scenario.
@@ -44,6 +47,7 @@
 public class UacClientResource implements UacResource {
 
     public static void main(String[] args) {
+        Engine.setLogLevel(Level.FINE);
         UacClientResource cr = new UacClientResource(""sip:bob@locahost"");
         cr.start();
         cr.acknowledge();
@@ -54,7 +58,7 @@ public static void main(String[] args) {
     private UacResource proxy;
 
     /** The internal client resource. */
-    private ClientResource clientResource;
+    private SipClientResource clientResource;
 
     /**
      * Constructor.
@@ -64,6 +68,12 @@ public static void main(String[] args) {
      */
     public UacClientResource(String uri) {
         this.clientResource = new SipClientResource(uri);
+        this.clientResource.setCallId(""a84b4c76e66710@pc33.atlanta.com"");
+        this.clientResource.setCommandSequence(""314159"");
+        this.clientResource.setFrom(new Address(""sip:alice@atlanta.com"",
+                ""Alice""));
+        this.clientResource.setTo(new Address(""sip:bob@biloxi.com"", ""Bob""));
+
         Client client = new Client(new Context(), Protocol.SIP);
         client.getContext().getParameters().add(""minThreads"", ""1"");
         client.getContext().getParameters().add(""tracing"", ""true"");
diff --git a/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacServerResource.java b/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacServerResource.java
index f16df34f69..e9be46b75e 100644
--- a/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacServerResource.java
+++ b/modules/org.restlet.example/src/org/restlet/example/ext/sip/UacServerResource.java
@@ -34,10 +34,12 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
 
 import org.restlet.Context;
 import org.restlet.Server;
 import org.restlet.data.Protocol;
+import org.restlet.engine.Engine;
 import org.restlet.ext.sip.SipResponse;
 import org.restlet.ext.sip.SipServerResource;
 import org.restlet.ext.sip.SipStatus;
@@ -54,6 +56,7 @@ public class UacServerResource extends SipServerResource implements UacResource
     private static boolean TRACE;
 
     public static void main(String[] args) throws Exception {
+        Engine.setLogLevel(Level.FINE);
         Server server = null;
 
         if (args.length == 1) {
@@ -161,8 +164,8 @@ private void trace() {
         if (TRACE) {
             System.out.println(""--------------start trace--------------------"");
             System.out.println(""Method: "" + getMethod());
-            System.out.println(""Call ID: "" + getRequestCallId());
-            System.out.println(""Call Sequence: "" + getCallSequence());
+            System.out.println(""Call ID: "" + getCallId());
+            System.out.println(""Call Sequence: "" + getCommandSequence());
             System.out.println(""To: "" + getTo());
             System.out.println(""From: "" + getFrom());
             System.out.println(""Max Forwards: "" + getMaxForwards());
diff --git a/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/Address.java b/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/Address.java
index b0facd0872..78c371d6ab 100644
--- a/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/Address.java
+++ b/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/Address.java
@@ -33,6 +33,7 @@
 import org.restlet.data.Form;
 import org.restlet.data.Parameter;
 import org.restlet.data.Reference;
+import org.restlet.ext.sip.internal.AddressWriter;
 import org.restlet.util.Series;
 
 /**
@@ -41,7 +42,7 @@
  * 
  * @author Thierry Boileau
  */
-public class Address {
+public class Address implements Cloneable {
 
     /** The optional name displayed. */
     private String displayName;
@@ -83,6 +84,34 @@ public Address(Reference reference, String displayName) {
         this.displayName = displayName;
     }
 
+    /**
+     * Constructor.
+     * 
+     * @param reference
+     *            The address reference.
+     * @param displayName
+     *            The name displayed.
+     */
+    public Address(String reference, String displayName) {
+        this(new Reference(reference), displayName);
+    }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        Address result = (Address) super.clone();
+        result.reference = reference.clone();
+
+        if (parameters != null) {
+            result.parameters = new Form();
+
+            for (Parameter param : parameters) {
+                result.parameters.add(param.getName(), param.getValue());
+            }
+        }
+
+        return result;
+    }
+
     /**
      * Returns the optional name displayed.
      * 
@@ -143,4 +172,9 @@ public void setReference(Reference reference) {
         this.reference = reference;
     }
 
+    @Override
+    public String toString() {
+        return AddressWriter.write(this);
+    }
+
 }
diff --git a/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipClientResource.java b/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipClientResource.java
index 9db8b21c57..6347ee1fbf 100644
--- a/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipClientResource.java
+++ b/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipClientResource.java
@@ -565,6 +565,36 @@ public void register(Address to) throws ResourceException {
         handle(SipMethod.REGISTER);
     }
 
+    /**
+     * Sets the identifier of the call.
+     * 
+     * @param callId
+     *            The identifier of the call.
+     */
+    public void setCallId(String callId) {
+        getRequest().setCallId(callId);
+    }
+
+    /**
+     * Sets the identifier of the command.
+     * 
+     * @param commandSequence
+     *            The identifier of the command.
+     */
+    public void setCommandSequence(String commandSequence) {
+        getRequest().setCommandSequence(commandSequence);
+    }
+
+    /**
+     * Sets the description of the request's initiator.
+     * 
+     * @param from
+     *            The description of the request's initiator.
+     */
+    public void setFrom(Address from) {
+        getRequest().setFrom(from);
+    }
+
     @Override
     public void setRequest(Request request) {
         if (request instanceof SipRequest) {
@@ -595,6 +625,16 @@ public void setResponse(Response response) {
         }
     }
 
+    /**
+     * Sets the logical recipient of the request.
+     * 
+     * @param to
+     *            The logical recipient of the request.
+     */
+    public void setTo(Address to) {
+        getRequest().setTo(to);
+    }
+
     /**
      * Requests current state and state updates from a remote node.
      * 
diff --git a/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipServerResource.java b/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipServerResource.java
index cb73dec934..97d72459de 100644
--- a/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipServerResource.java
+++ b/modules/org.restlet.ext.sip/src/org/restlet/ext/sip/SipServerResource.java
@@ -30,8 +30,9 @@
 
 package org.restlet.ext.sip;
 
-import java.util.List;
-
+import org.restlet.Context;
+import org.restlet.Request;
+import org.restlet.Response;
 import org.restlet.resource.ServerResource;
 
 /**
@@ -42,11 +43,20 @@
 public class SipServerResource extends ServerResource {
 
     /**
-     * Returns the request's call sequence.
+     * Returns the request's call ID.
      * 
-     * @return The request's call sequence.
+     * @return The request's call ID.
      */
-    public String getCallSequence() {
+    public String getCallId() {
+        return getRequest().getCallId();
+    }
+
+    /**
+     * Returns the request's command sequence.
+     * 
+     * @return The request's command sequence.
+     */
+    public String getCommandSequence() {
         return getRequest().getCommandSequence();
     }
 
@@ -64,47 +74,11 @@ public SipRequest getRequest() {
         return (SipRequest) super.getRequest();
     }
 
-    /**
-     * Returns the request's call ID.
-     * 
-     * @return The request's call ID.
-     */
-    public String getRequestCallId() {
-        return getRequest().getCallId();
-    }
-
     @Override
     public SipResponse getResponse() {
         return (SipResponse) super.getResponse();
     }
 
-    /**
-     * Returns the response's call ID.
-     * 
-     * @return The response's call ID.
-     */
-    public String getResponseCallId() {
-        return getResponse().getCallId();
-    }
-
-    /**
-     * Returns the request's list of Via entries.
-     * 
-     * @return The request's list of Via entries.
-     */
-    public List<SipRecipientInfo> getSipRequestRecipientsInfo() {
-        return getRequest().getSipRecipientsInfo();
-    }
-
-    /**
-     * Returns the response's list of Via entries.
-     * 
-     * @return The response's list of Via entries.
-     */
-    public List<SipRecipientInfo> getSipResponseRecipientsInfo() {
-        return getResponse().getSipRecipientsInfo();
-    }
-
     /**
      * Returns the request recipient's address.
      * 
@@ -114,13 +88,27 @@ public Address getTo() {
         return getRequest().getTo();
     }
 
-    /**
-     * Sets the response's call ID.
-     * 
-     * @param callId
-     *            The call ID.
-     */
-    public void setResponseCallId(String callId) {
-        getResponse().setCallId(callId);
+    @Override
+    public void init(Context context, Request request, Response response) {
+        try {
+            SipResponse sipResponse = (SipResponse) response;
+            SipRequest sipRequest = (SipRequest) request;
+
+            sipResponse.setCallId(sipRequest.getCallId());
+            sipResponse.setCommandSequence(sipRequest.getCommandSequence());
+
+            if (sipRequest.getFrom() != null) {
+                sipResponse.setFrom((Address) sipRequest.getFrom().clone());
+            }
+
+            if (sipRequest.getTo() != null) {
+                sipResponse.setTo((Address) sipRequest.getTo().clone());
+            }
+        } catch (CloneNotSupportedException e) {
+            doCatch(e);
+        }
+
+        super.init(context, request, response);
     }
+
 }
diff --git a/modules/org.restlet/src/org/restlet/engine/connector/OutboundWay.java b/modules/org.restlet/src/org/restlet/engine/connector/OutboundWay.java
index ee14894ad7..f6da80d9a8 100644
--- a/modules/org.restlet/src/org/restlet/engine/connector/OutboundWay.java
+++ b/modules/org.restlet/src/org/restlet/engine/connector/OutboundWay.java
@@ -470,7 +470,7 @@ protected void writeLine() throws IOException {
         case START:
             if (getHelper().getLogger().isLoggable(Level.FINE)) {
                 getHelper().getLogger().fine(
-                        ""Writing message from ""
+                        ""Writing message to ""
                                 + getConnection().getSocketAddress());
             }
 
diff --git a/modules/org.restlet/src/org/restlet/engine/connector/ServerConnectionController.java b/modules/org.restlet/src/org/restlet/engine/connector/ServerConnectionController.java
index 269c2eabaa..e0d7e94ff2 100644
--- a/modules/org.restlet/src/org/restlet/engine/connector/ServerConnectionController.java
+++ b/modules/org.restlet/src/org/restlet/engine/connector/ServerConnectionController.java
@@ -129,7 +129,7 @@ protected void onSelected(SelectionKey key)
 
                         if (getHelper().getLogger().isLoggable(Level.FINE)) {
                             getHelper().getLogger().fine(
-                                    ""Connection with \""""
+                                    ""Connection from \""""
                                             + connection.getSocketAddress()
                                             + ""\"" accepted. New count: ""
                                             + getHelper().getConnections()
diff --git a/modules/org.restlet/src/org/restlet/engine/io/IoBuffer.java b/modules/org.restlet/src/org/restlet/engine/io/IoBuffer.java
index 9d767d1791..a9e9f660b0 100644
--- a/modules/org.restlet/src/org/restlet/engine/io/IoBuffer.java
+++ b/modules/org.restlet/src/org/restlet/engine/io/IoBuffer.java
@@ -255,7 +255,7 @@ public int refill(ReadableByteChannel sourceChannel) throws IOException {
                 if (result > 0) {
                     getBytes().flip();
                     setState(BufferState.DRAINING);
-                    Context.getCurrentLogger().fine(
+                    Context.getCurrentLogger().finer(
                             ""Refilled buffer with "" + result + "" byte(s)"");
                 }
             }
diff --git a/modules/org.restlet/src/org/restlet/resource/UniformResource.java b/modules/org.restlet/src/org/restlet/resource/UniformResource.java
index 6a05bc85d2..20ce81b96a 100644
--- a/modules/org.restlet/src/org/restlet/resource/UniformResource.java
+++ b/modules/org.restlet/src/org/restlet/resource/UniformResource.java
@@ -605,7 +605,7 @@ public StatusService getStatusService() {
      * @param response
      *            The handled response.
      */
-    public final void init(Context context, Request request, Response response) {
+    public void init(Context context, Request request, Response response) {
         this.context = context;
         this.request = request;
         this.response = response;"
fc21d266c205497596bbc4aecb0a2b62558d0e0d,tapiji,"updated licenses
",p,https://github.com/tapiji/tapiji,"diff --git a/at.ac.tuwien.inso.eclipse.i18n/TapiJI.gif b/at.ac.tuwien.inso.eclipse.i18n/TapiJI.gif
deleted file mode 100644
index 65cb1706..00000000
Binary files a/at.ac.tuwien.inso.eclipse.i18n/TapiJI.gif and /dev/null differ
diff --git a/at.ac.tuwien.inso.eclipse.i18n/TapiJI.png b/at.ac.tuwien.inso.eclipse.i18n/TapiJI.png
new file mode 100644
index 00000000..3984eba6
Binary files /dev/null and b/at.ac.tuwien.inso.eclipse.i18n/TapiJI.png differ
diff --git a/at.ac.tuwien.inso.eclipse.i18n/about.ini b/at.ac.tuwien.inso.eclipse.i18n/about.ini
index f25aaf44..39ee76a2 100644
--- a/at.ac.tuwien.inso.eclipse.i18n/about.ini
+++ b/at.ac.tuwien.inso.eclipse.i18n/about.ini
@@ -1,2 +1,2 @@
 aboutText=%about_text
-featureImage=TapiJI.gif
\ No newline at end of file
+featureImage=TapiJI.png
\ No newline at end of file
diff --git a/at.ac.tuwien.inso.eclipse.i18n/build.properties b/at.ac.tuwien.inso.eclipse.i18n/build.properties
index 74ef3e72..d3d7c2c2 100644
--- a/at.ac.tuwien.inso.eclipse.i18n/build.properties
+++ b/at.ac.tuwien.inso.eclipse.i18n/build.properties
@@ -9,7 +9,7 @@ bin.includes = plugin.xml,\
                about.ini,\
                about.mappings,\
                about.properties,\
-               TapiJI_32.png,\
+               TapiJI.png,\
                Splash.bmp,\
                TapiJI.gif
 bin.excludes = icons/original/,\
@@ -24,6 +24,6 @@ src.includes = src/,\
                about.mappings,\
                about.properties,\
                META-INF/,\
-               TapiJI_32.png,\
+               TapiJI.png,\
                Splash.bmp,\
                TapiJI.gif
diff --git a/at.ac.tuwien.inso.eclipse.i18n/epl-v10.html b/at.ac.tuwien.inso.eclipse.i18n/epl-v10.html
new file mode 100644
index 00000000..ed4b1966
--- /dev/null
+++ b/at.ac.tuwien.inso.eclipse.i18n/epl-v10.html
@@ -0,0 +1,328 @@
+<html xmlns:o=""urn:schemas-microsoft-com:office:office""
+xmlns:w=""urn:schemas-microsoft-com:office:word""
+xmlns=""http://www.w3.org/TR/REC-html40"">
+
+<head>
+<meta http-equiv=Content-Type content=""text/html; charset=windows-1252"">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content=""Microsoft Word 9"">
+<meta name=Originator content=""Microsoft Word 9"">
+<link rel=File-List
+href=""./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"""";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:""Times New Roman"";
+	mso-fareast-font-family:""Times New Roman"";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:""Times New Roman"";
+	mso-fareast-font-family:""Times New Roman"";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:""Balloon Text"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:""Times New Roman"";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file"
9f923255878b7baefd89bc37af8fe3072f163322,elasticsearch,Allow additional settings for the node in- ESSingleNodeTestCase--This change adds a method that extending classes can override to provide additional settings-for the node used in a single node test case.-,a,https://github.com/elastic/elasticsearch,"diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
index 6e16d60eafc01..57dfc10684588 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
@@ -32,7 +32,6 @@
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.Priority;
-import org.elasticsearch.common.lease.Releasables;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.BigArrays;
@@ -160,6 +159,11 @@ protected final Collection<Class<? extends Plugin>> pluginList(Class<? extends P
         return Arrays.asList(plugins);
     }
 
+    /** Additional settings to add when creating the node. Also allows overriding the default settings. */
+    protected Settings nodeSettings() {
+        return Settings.EMPTY;
+    }
+
     private Node newNode() {
         Settings settings = Settings.builder()
             .put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName(""single-node-cluster"", randomLong()))
@@ -177,6 +181,7 @@ private Node newNode() {
             .put(Node.NODE_LOCAL_SETTING.getKey(), true)
             .put(Node.NODE_DATA_SETTING.getKey(), true)
             .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING.getKey(), true) // make sure we get what we set :)
+            .put(nodeSettings()) // allow test cases to provide their own settings or override these
             .build();
         Node build = new MockNode(settings, getVersion(), getPlugins());
         build.start();"
db02e53849878e327f9aa67a9cbe6e919e2b0022,intellij-community,make find toolwindow work in dumb mode and- correctly navigate--,c,https://github.com/JetBrains/intellij-community,"diff --git a/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java b/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java
index 90cc9d7917901..77591d3a6c2fc 100644
--- a/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java
+++ b/UsageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java
@@ -268,7 +268,7 @@ public VirtualFile getFile() {
       return getElement().getContainingFile().getVirtualFile();
     }
     else {
-      return myUsageInfo.getFile().getVirtualFile();
+      return myUsageInfo.getVirtualFile();
     }
   }
 
diff --git a/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java b/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java
index c46e65e5b21a9..a10d988422672 100644
--- a/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -1051,7 +1051,6 @@ private MyPanel(JTree tree) {
       mySupport = new OccurenceNavigatorSupport(tree) {
         protected Navigatable createDescriptorForNode(DefaultMutableTreeNode node) {
           if (node.getChildCount() > 0) return null;
-          if (node instanceof Node && !((Node)node).isValid()) return null;
           return getNavigatableForNode(node);
         }
 
diff --git a/lang-api/src/com/intellij/usageView/UsageInfo.java b/lang-api/src/com/intellij/usageView/UsageInfo.java
index f3d5109c828ea..522fca4a408ad 100644
--- a/lang-api/src/com/intellij/usageView/UsageInfo.java
+++ b/lang-api/src/com/intellij/usageView/UsageInfo.java
@@ -30,6 +30,7 @@ public class UsageInfo {
   public static final UsageInfo[] EMPTY_ARRAY = new UsageInfo[0];
   private static final Logger LOG = Logger.getInstance(""#com.intellij.usageView.UsageInfo"");
   private final SmartPsiElementPointer mySmartPointer;
+  private final VirtualFile myVirtualFile;
   public final int startOffset; // in navigation element
   public final int endOffset; // in navigation element
 
@@ -39,6 +40,7 @@ public UsageInfo(@NotNull PsiElement element, int startOffset, int endOffset, bo
     LOG.assertTrue(element.isValid());
     LOG.assertTrue(element == element.getNavigationElement());
     mySmartPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
+    myVirtualFile = element.getContainingFile().getVirtualFile();
     this.startOffset = startOffset;
     this.endOffset = endOffset;
     this.isNonCodeUsage = isNonCodeUsage;
@@ -48,6 +50,7 @@ public UsageInfo(@NotNull PsiElement element, boolean isNonCodeUsage) {
     LOG.assertTrue(element.isValid());
     element = element.getNavigationElement();
     mySmartPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
+    myVirtualFile = element.getContainingFile().getVirtualFile();
 
     TextRange range = element.getTextRange();
     if (range == null) {
@@ -141,4 +144,8 @@ public int hashCode() {
   public PsiFile getFile() {
     return mySmartPointer.getContainingFile();
   }
+
+  public VirtualFile getVirtualFile() {
+    return myVirtualFile;
+  }
 }
diff --git a/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java b/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
index 6c9817474269f..8f5cd1710e462 100644
--- a/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
+++ b/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
@@ -25,7 +25,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
   public UsageViewManagerImpl(final Project project, final ToolWindowManager toolWindowManager) {
     myToolWindowManager = toolWindowManager;
 
-    ToolWindow toolWindow = myToolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project);
+    ToolWindow toolWindow = myToolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project, true);
     toolWindow.setToHideOnEmptyContent(true);
     toolWindow.setIcon(IconLoader.getIcon(""/general/toolWindowFind.png""));
     myFindContentManager = toolWindow.getContentManager();"
1eac0a7cdb214d084934cbe159af7a1803486f14,Mylyn Reviews,"390767: Create context from changesets

added internal extension point for contributing actions to the
changesets list.
added a new plugin, which contributes an action for populating the
context with the contents of the changeset

Change-Id: Icae78708bac4279563584b8d8aa785975e196fcb
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=390767
",a,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/.classpath b/tbr/org.eclipse.mylyn.versions.context.ui/.classpath
new file mode 100644
index 00000000..ad32c83a
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<classpath>
+	<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""/>
+	<classpathentry kind=""output"" path=""bin""/>
+</classpath>
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/.project b/tbr/org.eclipse.mylyn.versions.context.ui/.project
new file mode 100644
index 00000000..618ff059
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/.project
@@ -0,0 +1,28 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<projectDescription>
+	<name>org.eclipse.mylyn.versions.context.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.versions.context.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..2b84abdb
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Versions-Tasks Context Brige
+Bundle-SymbolicName: org.eclipse.mylyn.versions.context.ui;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.mylyn.versions.core;bundle-version=""1.1.0"",
+ org.eclipse.mylyn.tasks.core;bundle-version=""3.9.0"",
+ org.eclipse.mylyn.context.core;bundle-version=""3.9.0"",
+ org.eclipse.mylyn.monitor.core;bundle-version=""3.9.0"",
+ org.eclipse.ui,
+ org.eclipse.mylyn.versions.tasks.ui;bundle-version=""1.1.0"",
+ org.eclipse.mylyn.monitor.ui;bundle-version=""3.9.0"",
+ org.eclipse.mylyn.versions.tasks.core;bundle-version=""1.1.0"",
+ org.eclipse.mylyn.tasks.ui;bundle-version=""3.9.0""
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/about.html b/tbr/org.eclipse.mylyn.versions.context.ui/about.html
new file mode 100644
index 00000000..d774b07c
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/about.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 4.0//EN"">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content=""text/html; charset=ISO-8859-1"">
+</head>
+<body lang=""EN-US"">
+<h2>About This Content</h2>
+ 
+<p>June 25, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href=""http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href=""/"">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/build.properties b/tbr/org.eclipse.mylyn.versions.context.ui/build.properties
new file mode 100644
index 00000000..786b1df9
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/icon/etool16/context-attach.gif b/tbr/org.eclipse.mylyn.versions.context.ui/icon/etool16/context-attach.gif
new file mode 100644
index 00000000..bee8fc55
Binary files /dev/null and b/tbr/org.eclipse.mylyn.versions.context.ui/icon/etool16/context-attach.gif differ
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/plugin.xml b/tbr/org.eclipse.mylyn.versions.context.ui/plugin.xml
new file mode 100644
index 00000000..d0e54da5
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<?eclipse version=""3.4""?>
+<plugin>
+   <extension
+         point=""org.eclipse.mylyn.versions.tasks.ui.actionContributions"">
+      <actionContribution
+            class=""org.eclipse.mylyn.versions.tasks.context.ImportAsContextAction"">
+      </actionContribution>
+   </extension>
+
+</plugin>
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/pom.xml b/tbr/org.eclipse.mylyn.versions.context.ui/pom.xml
new file mode 100644
index 00000000..1fe36a41
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/pom.xml
@@ -0,0 +1,29 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<project xsi:schemaLocation=""http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"" xmlns=""http://maven.apache.org/POM/4.0.0""
+    xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>mylyn-reviews-tasks-parent</artifactId>
+    <groupId>org.eclipse.mylyn.reviews</groupId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.mylyn.versions.context.ui</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tbr/org.eclipse.mylyn.versions.context.ui/src/org/eclipse/mylyn/versions/tasks/context/ImportAsContextAction.java b/tbr/org.eclipse.mylyn.versions.context.ui/src/org/eclipse/mylyn/versions/tasks/context/ImportAsContextAction.java
new file mode 100644
index 00000000..059158ce
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.context.ui/src/org/eclipse/mylyn/versions/tasks/context/ImportAsContextAction.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.versions.tasks.context;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.mylyn.context.core.ContextCore;
+import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
+import org.eclipse.mylyn.monitor.core.InteractionEvent;
+import org.eclipse.mylyn.monitor.core.InteractionEvent.Kind;
+import org.eclipse.mylyn.tasks.ui.TasksUiImages;
+import org.eclipse.mylyn.versions.core.Change;
+import org.eclipse.mylyn.versions.core.ChangeType;
+import org.eclipse.mylyn.versions.tasks.core.TaskChangeSet;
+import org.eclipse.mylyn.versions.tasks.ui.spi.ITaskVersionsContributionAction;
+import org.eclipse.mylyn.versions.tasks.ui.spi.ITaskVersionsModel;
+import org.eclipse.swt.widgets.Event;
+
+/**
+ *
+ * @author Kilian Matt
+ *
+ */
+public class ImportAsContextAction extends Action implements
+		ITaskVersionsContributionAction {
+
+	private static final String ORIGIN = ""org.eclipse.mylyn.versions.tasks.contextImporter."";
+
+	public ImportAsContextAction() {
+		super(""Convert to Context"", AS_PUSH_BUTTON);
+		setDescription(""Convert to context"");
+		setImageDescriptor(TasksUiImages.CONTEXT_ATTACH);
+		setToolTipText(""Convert to context"");
+	}
+
+	public void run() {
+
+	}
+
+	private String formatHandleString(Change c) {
+		return ""/"" + c.getTarget().getPath();
+	}
+
+	private boolean elementNotDeleted(Change c) {
+		return c.getChangeType() == ChangeType.MODIFIED
+				|| c.getChangeType() == ChangeType.ADDED
+				|| c.getChangeType() == ChangeType.REPLACED;
+	}
+
+	private String formatSourceHandleString(Change c) {
+		return c.getTarget().getProjectName()
+				+ c.getTarget().getProjectRelativePath();
+	}
+
+	public void runWithEvent(Event event) {
+		run();
+	}
+
+	@Override
+	public void run(ITaskVersionsModel model) {
+		for (TaskChangeSet cs : model.getInput()) {
+			for (Change c : cs.getChangeset().getChanges()) {
+
+				if (elementNotDeleted(c)) {
+					InteractionEvent interactionEvent = new InteractionEvent(
+							Kind.SELECTION, null, formatHandleString(c), ORIGIN);
+
+					ContextCore.getContextManager().processInteractionEvent(
+							interactionEvent);
+					MonitorUiPlugin.getDefault().notifyInteractionObserved(
+							interactionEvent);
+				}
+			}
+		}
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/plugin.xml b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/plugin.xml
index 2fc4c213..425c4666 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/plugin.xml
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          id=""org.eclipse.mylyn.versions.tasks.mapper.generic""
          name=""Generic Implementation""
-         point=""org.eclipse.mylyn.versions.tasks.changesetmapping"">
+         point=""org.eclipse.mylyn.versions.tasks.ui.changesetmapping"">
       <changesetMapper
             class=""org.eclipse.mylyn.versions.tasks.mapper.generic.GenericTaskChangesetMapper"">
       </changesetMapper>
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java
index deae9245..673ac262 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java
@@ -55,4 +55,10 @@ public void fetchAllChangesets(IProgressMonitor monitor,
 		}
 
 	}
+	
+	// TODO
+	//notification on new (shared) projects, attn detect overlaps with existing repositories.
+	// registering a listener for detecting new repository changes
+	// 
+	
 }
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.core.runtime.prefs b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 00000000..5a0ad22d
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.core.prefs b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.core.prefs
index 01b20c41..00e3a6f8 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,354 @@
-#Tue Feb 22 18:52:23 PST 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.ui.prefs b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000..e2834b27
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,63 @@
+#Wed Mar 02 16:00:04 PST 2011
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Mylyn based on Eclipse
+formatter_settings_version=12
+internal.default.compliance=default
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\=""1.0"" encoding\=""UTF-8"" standalone\=""no""?><templates><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter method"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created Java files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""false"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for fields"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""false"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment""/><template autoinsert\=""false"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.newtype"" name\=""newtype"">/*******************************************************************************\r\n * Copyright (c) ${year} Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""false"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""false"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created method stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ignore\r\n${body_statement}</template><template autoinsert\=""false"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ignore</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate methods"" enabled\=""true"" id\=""org.eclipse.jdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""gettercomment_context"" deleted\=""false"" description\=""Comment for getter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment"" name\=""gettercomment"">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\=""true"" context\=""settercomment_context"" deleted\=""false"" description\=""Comment for setter function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment"" name\=""settercomment"">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\=""true"" context\=""constructorcomment_context"" deleted\=""false"" description\=""Comment for created constructors"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment"" name\=""constructorcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""filecomment_context"" deleted\=""false"" description\=""Comment for created JavaScript files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment"" name\=""filecomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""typecomment_context"" deleted\=""false"" description\=""Comment for created types"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment"" name\=""typecomment"">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""fieldcomment_context"" deleted\=""false"" description\=""Comment for vars"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment"" name\=""fieldcomment"">/**\r\n * \r\n */</template><template autoinsert\=""true"" context\=""methodcomment_context"" deleted\=""false"" description\=""Comment for non-overriding function"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment"" name\=""methodcomment"">/**\r\n * ${tags}\r\n */</template><template autoinsert\=""true"" context\=""overridecomment_context"" deleted\=""false"" description\=""Comment for overriding functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment"" name\=""overridecomment"">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\=""true"" context\=""delegatecomment_context"" deleted\=""false"" description\=""Comment for delegate functions"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment"" name\=""delegatecomment"">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\=""true"" context\=""newtype_context"" deleted\=""false"" description\=""Newly created files"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.newtype"" name\=""newtype"">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\=""true"" context\=""classbody_context"" deleted\=""false"" description\=""Code in new class type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.classbody"" name\=""classbody"">\r\n</template><template autoinsert\=""true"" context\=""interfacebody_context"" deleted\=""false"" description\=""Code in new interface type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody"" name\=""interfacebody"">\r\n</template><template autoinsert\=""true"" context\=""enumbody_context"" deleted\=""false"" description\=""Code in new enum type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody"" name\=""enumbody"">\r\n</template><template autoinsert\=""true"" context\=""annotationbody_context"" deleted\=""false"" description\=""Code in new annotation type bodies"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody"" name\=""annotationbody"">\r\n</template><template autoinsert\=""true"" context\=""catchblock_context"" deleted\=""false"" description\=""Code in new catch blocks"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock"" name\=""catchblock"">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\=""true"" context\=""methodbody_context"" deleted\=""false"" description\=""Code in created function stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody"" name\=""methodbody"">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\=""true"" context\=""constructorbody_context"" deleted\=""false"" description\=""Code in created constructor stubs"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody"" name\=""constructorbody"">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\=""true"" context\=""getterbody_context"" deleted\=""false"" description\=""Code in created getters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody"" name\=""getterbody"">return ${field};</template><template autoinsert\=""true"" context\=""setterbody_context"" deleted\=""false"" description\=""Code in created setters"" enabled\=""true"" id\=""org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody"" name\=""setterbody"">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 00000000..5e7f2bd4
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Tue Aug 18 22:42:26 PDT 2009
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 00000000..d8c6d26a
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Mon Jun 25 03:02:37 GMT 2007
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.pde.prefs b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.pde.prefs
new file mode 100644
index 00000000..e8f2d562
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,18 @@
+#Tue Apr 15 11:07:59 PDT 2008
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=2
+compilers.p.missing-bundle-classpath-entries=1
+compilers.p.missing-packages=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.versions.tasks.ui/META-INF/MANIFEST.MF
index b32c7fc1..051aff88 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/META-INF/MANIFEST.MF
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/META-INF/MANIFEST.MF
@@ -14,6 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.mylyn.commons.core;bundle-version=""3.8.0""
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.mylyn.versions.tasks.ui;x-internal:=true
+Export-Package: org.eclipse.mylyn.internal.versions.tasks.ui;x-internal:=true,
+ org.eclipse.mylyn.versions.tasks.ui;x-internal:=true,
+ org.eclipse.mylyn.versions.tasks.ui.spi;x-internal:=true
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Activator: org.eclipse.mylyn.versions.tasks.ui.internal.TaskVersionsUiPlugin
+Bundle-Activator: org.eclipse.mylyn.internal.versions.tasks.ui.TaskVersionsUiPlugin
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/plugin.xml b/tbr/org.eclipse.mylyn.versions.tasks.ui/plugin.xml
index 5115a687..3ad6e0d3 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/plugin.xml
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/plugin.xml
@@ -1,11 +1,12 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <?eclipse version=""3.4""?>
 <plugin>
-   <extension-point id=""org.eclipse.mylyn.versions.tasks.changesetmapping"" name=""Task changeset mapping provider"" schema=""schema/org.eclipse.mylyn.versions.tasks.changesetmapping.exsd""/>
+   <extension-point id=""org.eclipse.mylyn.versions.tasks.ui.changesetmapping"" name=""Task changeset mapping provider"" schema=""schema/org.eclipse.mylyn.versions.tasks.changesetmapping.exsd""/>
+   <extension-point id=""org.eclipse.mylyn.versions.tasks.ui.actionContributions"" name=""Version-Tasks Part Action Contributions"" schema=""schema/org.eclipse.mylyn.versions.tasks.ui.actionContributions.exsd""/>
    <extension
          point=""org.eclipse.mylyn.tasks.ui.editors"">
       <pageFactory
-            class=""org.eclipse.mylyn.versions.tasks.ui.ChangeSetPageFactory""
+            class=""org.eclipse.mylyn.internal.versions.tasks.ui.ChangeSetPageFactory""
             id=""org.eclipse.mylyn.versions.tasks.pageFactory1"">
       </pageFactory>
    </extension>
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/schema/org.eclipse.mylyn.versions.tasks.ui.actionContributions.exsd b/tbr/org.eclipse.mylyn.versions.tasks.ui/schema/org.eclipse.mylyn.versions.tasks.ui.actionContributions.exsd
new file mode 100644
index 00000000..a6a3ceac
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/schema/org.eclipse.mylyn.versions.tasks.ui.actionContributions.exsd
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace=""org.eclipse.mylyn.versions.tasks.ui"" xmlns=""http://www.w3.org/2001/XMLSchema"">
+<annotation>
+      <appinfo>
+         <meta.schema plugin=""org.eclipse.mylyn.versions.tasks.ui"" id=""org.eclipse.mylyn.versions.tasks.internal.actionContributions"" name=""Version-Tasks Part Action Contributions""/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name=""extension"">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref=""actionContribution""/>
+         </sequence>
+         <attribute name=""point"" type=""string"" use=""required"">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name=""id"" type=""string"">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name=""name"" type=""string"">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable=""true""/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name=""actionContribution"">
+      <complexType>
+         <attribute name=""class"" type=""string"" use=""required"">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind=""java"" basedOn="":org.eclipse.mylyn.versions.tasks.ui.spi.IVersionTasksContributionAction""/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type=""since""/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type=""examples""/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type=""apiinfo""/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type=""implementation""/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ActionDelegate.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ActionDelegate.java
new file mode 100644
index 00000000..926dc8c9
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ActionDelegate.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.versions.tasks.ui;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuCreator;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.swt.events.HelpListener;
+import org.eclipse.swt.widgets.Event;
+
+/**
+ * Delegates all calls to a delegate IAction.
+ * This allows to override methods.
+ *
+ * @author Kilian Matt
+ *
+ */
+public abstract class ActionDelegate implements IAction {
+	private final IAction delegate;
+
+	public ActionDelegate(IAction delegate) {
+		this.delegate = delegate;
+		Assert.isNotNull(delegate);
+	}
+
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		delegate.addPropertyChangeListener(listener);
+	}
+
+	public int getAccelerator() {
+		return delegate.getAccelerator();
+	}
+
+	public String getActionDefinitionId() {
+		return delegate.getActionDefinitionId();
+	}
+
+	public String getDescription() {
+		return delegate.getDescription();
+	}
+
+	public ImageDescriptor getDisabledImageDescriptor() {
+		return delegate.getDisabledImageDescriptor();
+	}
+
+	public HelpListener getHelpListener() {
+		return delegate.getHelpListener();
+	}
+
+	public ImageDescriptor getHoverImageDescriptor() {
+		return delegate.getHoverImageDescriptor();
+	}
+
+	public String getId() {
+		return delegate.getId();
+	}
+
+	public ImageDescriptor getImageDescriptor() {
+		return delegate.getImageDescriptor();
+	}
+
+	public IMenuCreator getMenuCreator() {
+		return delegate.getMenuCreator();
+	}
+
+	public int getStyle() {
+		return delegate.getStyle();
+	}
+
+	public String getText() {
+		return delegate.getText();
+	}
+
+	public String getToolTipText() {
+		return delegate.getToolTipText();
+	}
+
+	public boolean isChecked() {
+		return delegate.isChecked();
+	}
+
+	public boolean isEnabled() {
+		return delegate.isEnabled();
+	}
+
+	public boolean isHandled() {
+		return delegate.isHandled();
+	}
+
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		delegate.removePropertyChangeListener(listener);
+	}
+
+	public void run() {
+		delegate.run();
+	}
+
+	public void runWithEvent(Event event) {
+		delegate.runWithEvent(event);
+	}
+
+	public void setActionDefinitionId(String id) {
+		delegate.setActionDefinitionId(id);
+	}
+
+	public void setChecked(boolean checked) {
+		delegate.setChecked(checked);
+	}
+
+	public void setDescription(String text) {
+		delegate.setDescription(text);
+	}
+
+	public void setDisabledImageDescriptor(ImageDescriptor newImage) {
+		delegate.setDisabledImageDescriptor(newImage);
+	}
+
+	public void setEnabled(boolean enabled) {
+		delegate.setEnabled(enabled);
+	}
+
+	public void setHelpListener(HelpListener listener) {
+		delegate.setHelpListener(listener);
+
+	}
+
+	public void setHoverImageDescriptor(ImageDescriptor newImage) {
+		delegate.setHoverImageDescriptor(newImage);
+	}
+
+	public void setId(String id) {
+		delegate.setId(id);
+	}
+
+	public void setImageDescriptor(ImageDescriptor newImage) {
+		delegate.setImageDescriptor(newImage);
+	}
+
+	public void setMenuCreator(IMenuCreator creator) {
+		delegate.setMenuCreator(creator);
+	}
+
+	public void setText(String text) {
+		delegate.setText(text);
+	}
+
+	public void setToolTipText(String text) {
+		delegate.setToolTipText(text);
+	}
+
+	public void setAccelerator(int keycode) {
+		delegate.setAccelerator(keycode);
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangeSetPage.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java
similarity index 96%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangeSetPage.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java
index ad70d593..260dc973 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangeSetPage.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui;
+package org.eclipse.mylyn.internal.versions.tasks.ui;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangeSetPageFactory.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPageFactory.java
similarity index 96%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangeSetPageFactory.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPageFactory.java
index 5945a5f6..c940fc2c 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangeSetPageFactory.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPageFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui;
+package org.eclipse.mylyn.internal.versions.tasks.ui;
 
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java
similarity index 84%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java
index 2ca7ca10..49563f3c 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java
@@ -8,33 +8,30 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui;
+package org.eclipse.mylyn.internal.versions.tasks.ui;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.mylyn.internal.tasks.ui.editors.Messages;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.ITaskContainer;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
 import org.eclipse.mylyn.versions.core.ChangeSet;
 import org.eclipse.mylyn.versions.tasks.core.IChangeSetMapping;
 import org.eclipse.mylyn.versions.tasks.core.TaskChangeSet;
-import org.eclipse.mylyn.versions.tasks.ui.internal.IChangesetModel;
-import org.eclipse.mylyn.versions.tasks.ui.internal.IncludeSubTasksAction;
-import org.eclipse.mylyn.versions.tasks.ui.internal.TaskChangesetLabelProvider;
-import org.eclipse.mylyn.versions.tasks.ui.internal.TaskVersionsUiPlugin;
+import org.eclipse.mylyn.versions.tasks.ui.AbstractChangesetMappingProvider;
+import org.eclipse.mylyn.versions.tasks.ui.TaskChangesetUtil;
+import org.eclipse.mylyn.versions.tasks.ui.spi.ITaskVersionsContributionAction;
+import org.eclipse.mylyn.versions.tasks.ui.spi.ITaskVersionsModel;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.layout.FillLayout;
@@ -42,16 +39,15 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
 /**
- * 
+ *
  * @author Kilian Matt
- * 
+ *
  */
 @SuppressWarnings(""restriction"")
 public class ChangesetPart extends AbstractTaskEditorPart {
@@ -110,6 +106,15 @@ private void createTable(Composite composite) {
 	protected void fillToolBar(ToolBarManager toolBarManager) {
 		super.fillToolBar(toolBarManager);
 		toolBarManager.add(new IncludeSubTasksAction(model));
+		List<ITaskVersionsContributionAction> contributions = InternalExtensionPointLoader.loadActionContributions();
+		for(final ITaskVersionsContributionAction action : contributions) {
+			toolBarManager.add(new ActionDelegate(action) {
+			@Override
+			public void runWithEvent(Event event) {
+					action.run(model);
+				}
+			});
+		}
 	}
 
 	private void registerContextMenu(TableViewer table) {
@@ -131,7 +136,7 @@ private void addColumn(TableViewer table, String name) {
 
 	private AbstractChangesetMappingProvider determineBestProvider(
 			final ITask task) {
-		AbstractChangesetMappingProvider bestProvider = null;
+		AbstractChangesetMappingProvider bestProvider = new NullProvider();
 		int score = Integer.MIN_VALUE;
 		for (AbstractChangesetMappingProvider mappingProvider : TaskChangesetUtil
 				.getMappingProviders()) {
@@ -141,6 +146,19 @@ private AbstractChangesetMappingProvider determineBestProvider(
 		}
 		return bestProvider;
 	}
+	private static class NullProvider extends AbstractChangesetMappingProvider{
+
+		@Override
+		public void getChangesetsForTask(IChangeSetMapping mapping,
+				IProgressMonitor monitor) throws CoreException {
+		}
+
+		@Override
+		public int getScoreFor(ITask task) {
+			return 0;
+		}
+
+	}
 
 	private IChangeSetMapping createChangeSetMapping(final ITask task,
 			final List<TaskChangeSet> changesets) {
@@ -160,7 +178,7 @@ private void refreshInput() {
 		table.setInput(model.getInput());
 	}
 
-	private class ChangesetModel implements IChangesetModel {
+	private class ChangesetModel implements ITaskVersionsModel {
 
 		private boolean includeSubTasks;
 
@@ -200,8 +218,7 @@ public List<TaskChangeSet> getInput() {
 				public void run() {
 					try {
 						for (IChangeSetMapping csm : changesetsMapping) {
-							provider.getChangesetsForTask(csm,
-									new NullProgressMonitor());
+							provider.getChangesetsForTask(csm, new NullProgressMonitor());
 						}
 					} catch (CoreException e) {
 						getTaskEditorPage().getTaskEditor().setMessage(""An exception occurred "" + e.getMessage(), IMessageProvider.ERROR);
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/IncludeSubTasksAction.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/IncludeSubTasksAction.java
similarity index 84%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/IncludeSubTasksAction.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/IncludeSubTasksAction.java
index 1ae383c8..93f0f886 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/IncludeSubTasksAction.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/IncludeSubTasksAction.java
@@ -8,19 +8,20 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui.internal;
+package org.eclipse.mylyn.internal.versions.tasks.ui;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.mylyn.tasks.ui.TasksUiImages;
+import org.eclipse.mylyn.versions.tasks.ui.spi.ITaskVersionsModel;
 import org.eclipse.swt.widgets.Event;
 
 /**
  * @author Kilian Matt
  */
 public class IncludeSubTasksAction extends Action {
-	private IChangesetModel model;
+	private ITaskVersionsModel model;
 
-	public IncludeSubTasksAction(IChangesetModel model) {
+	public IncludeSubTasksAction(ITaskVersionsModel model) {
 		super(""Include subtasks"",AS_CHECK_BOX);
 		setImageDescriptor(TasksUiImages.TASK_NEW_SUB);
 		this.model = model;
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/InternalExtensionPointLoader.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/InternalExtensionPointLoader.java
new file mode 100644
index 00000000..a287f72d
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/InternalExtensionPointLoader.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.versions.tasks.ui;
+
+import java.util.List;
+
+import org.eclipse.mylyn.commons.core.ExtensionPointReader;
+import org.eclipse.mylyn.versions.tasks.ui.AbstractChangesetMappingProvider;
+import org.eclipse.mylyn.versions.tasks.ui.spi.ITaskVersionsContributionAction;
+
+/**
+ * @author Kilian Matt
+ */
+public class InternalExtensionPointLoader {
+
+	private static final String MAPPER_EXTENSION_POINT = ""changesetmapping"";
+	private static final String ACTION_CONTRIBUTION_EXTENSION_POINT = ""actionContributions"";
+
+	public static List<ITaskVersionsContributionAction> getActionContributions() {
+		return loadActionContributions();
+	}
+
+	public synchronized static List<AbstractChangesetMappingProvider> loadMappingProviders() {
+		return loadClassExtensions(AbstractChangesetMappingProvider.class,
+				MAPPER_EXTENSION_POINT,""changesetMapper"");
+	}
+
+	public synchronized static List<ITaskVersionsContributionAction> loadActionContributions() {
+		return loadClassExtensions(ITaskVersionsContributionAction.class,
+				ACTION_CONTRIBUTION_EXTENSION_POINT,""actionContribution"");
+	}
+
+	public synchronized static <T> List<T> loadClassExtensions(Class<T> clazz,
+			String extensionPoint, String elementId) {
+		ExtensionPointReader<T> extensionPointReader = new ExtensionPointReader<T>(TaskVersionsUiPlugin.PLUGIN_ID, extensionPoint, elementId, clazz);
+		extensionPointReader.read();
+		return extensionPointReader.getItems();
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/TaskChangesetLabelProvider.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/TaskChangesetLabelProvider.java
similarity index 96%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/TaskChangesetLabelProvider.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/TaskChangesetLabelProvider.java
index 966afc90..1be1722b 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/TaskChangesetLabelProvider.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/TaskChangesetLabelProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui.internal;
+package org.eclipse.mylyn.internal.versions.tasks.ui;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/TaskVersionsUiPlugin.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/TaskVersionsUiPlugin.java
similarity index 84%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/TaskVersionsUiPlugin.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/TaskVersionsUiPlugin.java
index 1946de09..a104af5f 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/TaskVersionsUiPlugin.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/TaskVersionsUiPlugin.java
@@ -8,20 +8,19 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui.internal;
+package org.eclipse.mylyn.internal.versions.tasks.ui;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
 
 /**
- * 
+ *
  * @author Kilian Matt
  *
  */
 public class TaskVersionsUiPlugin extends AbstractUIPlugin {
 	private static TaskVersionsUiPlugin instance;
-	public static final String PLUGIN_ID=""org.eclipse.mylyn.versions.tasks.ui"";
-	
+	public static final String PLUGIN_ID = ""org.eclipse.mylyn.versions.tasks.ui"";
+
 	public TaskVersionsUiPlugin() {
 		instance = this;
 	}
@@ -29,5 +28,5 @@ public TaskVersionsUiPlugin() {
 	public static TaskVersionsUiPlugin getDefault() {
 		return instance;
 	}
-	
+
 }
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/AbstractChangesetMappingProvider.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/AbstractChangesetMappingProvider.java
index 6e971bd3..ced7defe 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/AbstractChangesetMappingProvider.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/AbstractChangesetMappingProvider.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.mylyn.versions.tasks.ui;
 
 import org.eclipse.core.runtime.CoreException;
@@ -5,6 +15,11 @@
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.versions.tasks.core.IChangeSetMapping;
 
+/**
+ *
+ * @author Kilian Matt
+ *
+ */
 public abstract class AbstractChangesetMappingProvider {
 
 	public abstract void getChangesetsForTask(IChangeSetMapping mapping, IProgressMonitor monitor) throws CoreException ;
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/TaskChangesetUtil.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/TaskChangesetUtil.java
index 4ff3bc6c..6991484c 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/TaskChangesetUtil.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/TaskChangesetUtil.java
@@ -1,21 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.mylyn.versions.tasks.ui;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.osgi.util.NLS;
+import org.eclipse.mylyn.internal.versions.tasks.ui.InternalExtensionPointLoader;
 
+/**
+ *
+ * @author Kilian Matt
+ *
+ */
 public class TaskChangesetUtil {
-	private static final String PLUGIN_ID = ""org.eclipse.mylyn.versions.tasks.ui"";
 
 	private static List<AbstractChangesetMappingProvider> providers;
 
@@ -23,54 +27,7 @@ public static List<AbstractChangesetMappingProvider> getMappingProviders() {
 		if (providers != null)
 			return providers;
 
-		return providers = loadMappingProviders();
-	}
-
-	private synchronized static List<AbstractChangesetMappingProvider> loadMappingProviders() {
-		List<AbstractChangesetMappingProvider> providers = new ArrayList<AbstractChangesetMappingProvider>();
-
-		MultiStatus result = new MultiStatus(PLUGIN_ID, 0,
-				""Task Changeset Mapping Provider failed to load"", null); //$NON-NLS-1$
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint connectorsExtensionPoint = registry
-				.getExtensionPoint(""org.eclipse.mylyn.versions.tasks.changesetmapping""); //$NON-NLS-1$
-		IExtension[] extensions = connectorsExtensionPoint.getExtensions();
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension
-					.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
-				try {
-					Object object = element.createExecutableExtension(""class""); //$NON-NLS-1$
-					if (object instanceof AbstractChangesetMappingProvider) {
-						providers
-								.add((AbstractChangesetMappingProvider) object);
-					} else {
-						result.add(new Status(
-								IStatus.ERROR,
-								PLUGIN_ID,
-								// FIXME error message
-								NLS.bind(
-										""Extension ''{0}'' does not extend expected class for extension contributed by {1}"", //$NON-NLS-1$
-										object.getClass().getCanonicalName(),
-										element.getContributor().getName())));
-					}
-				} catch (Throwable e) {
-					result.add(new Status(
-							IStatus.ERROR,
-							PLUGIN_ID,
-							// FIXME error message
-							NLS.bind(
-									""Connector core failed to load for extension contributed by {0}"", element.getContributor().getName()), e)); //$NON-NLS-1$
-				}
-			}
-		}
-
-		if (!result.isOK()) {
-			StatusHandler.log(result);
-		}
-
-		return providers;
+		return providers = InternalExtensionPointLoader.loadMappingProviders();
 	}
 
 }
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/IChangesetModel.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/spi/ITaskVersionsContributionAction.java
similarity index 76%
rename from tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/IChangesetModel.java
rename to tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/spi/ITaskVersionsContributionAction.java
index 8839451c..9def554d 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/internal/IChangesetModel.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/spi/ITaskVersionsContributionAction.java
@@ -8,11 +8,16 @@
  * Contributors:
  *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.versions.tasks.ui.internal;
+package org.eclipse.mylyn.versions.tasks.ui.spi;
+
+import org.eclipse.jface.action.IAction;
 
 /**
+ *
  * @author Kilian Matt
+ *
  */
-public interface IChangesetModel {
-	public void setIncludeSubTasks(boolean includeSubTasks);
-}
\ No newline at end of file
+public interface ITaskVersionsContributionAction extends IAction {
+
+	public void run(ITaskVersionsModel model);
+}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/spi/ITaskVersionsModel.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/spi/ITaskVersionsModel.java
new file mode 100644
index 00000000..88982a23
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/spi/ITaskVersionsModel.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.versions.tasks.ui.spi;
+
+import java.util.List;
+
+import org.eclipse.mylyn.versions.tasks.core.TaskChangeSet;
+
+/**
+ * Model of a list of Task Changesets. Can optionally include sub-tasks
+ *
+ * @author Kilian Matt
+ */
+public interface ITaskVersionsModel {
+
+	/**
+	 * Switch, whether sub-tasks of the task should be include in the task
+	 * changeset mapping.
+	 *
+	 * @param includeSubTasks
+	 */
+	public void setIncludeSubTasks(boolean includeSubTasks);
+
+	/**
+	 * Returns a list of TaskChangeSet objects, for each changeset of the task
+	 * (or a subtask)
+	 *
+	 * @return a non-null List
+	 */
+	public List<TaskChangeSet> getInput();
+}
diff --git a/tbr/pom.xml b/tbr/pom.xml
index 32a899a0..66e8853c 100644
--- a/tbr/pom.xml
+++ b/tbr/pom.xml
@@ -16,6 +16,7 @@
     <module>org.eclipse.mylyn.reviews.tasks.core</module>
     <module>org.eclipse.mylyn.reviews.tasks.dsl</module>
     <module>org.eclipse.mylyn.reviews.tasks.ui</module>
+    <module>org.eclipse.mylyn.versions.context.ui</module>
     <module>org.eclipse.mylyn.versions.tasks.core</module>
     <module>org.eclipse.mylyn.versions.tasks.ui</module>
     <module>org.eclipse.mylyn.versions.tasks.mapper.generic</module>"
acc6c73680f4f2fb0b13c9a4b429d995035a34c7,Delta Spike,"DELTASPIKE-356 fix JsfMessage which I broke with the refactoring
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
index ae84341df..340278728 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
@@ -37,7 +37,10 @@
 import org.apache.deltaspike.core.api.provider.BeanProvider;
 import org.apache.deltaspike.core.util.ClassUtils;
 
-
+/**
+ * This Proxy InvocationHandler implements the handling for all our
+ * {@link org.apache.deltaspike.core.api.message.MessageBundle}s.
+ */
 @Dependent
 public class MessageBundleInvocationHandler implements InvocationHandler, Serializable
 {
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java
index 0be721269..c45a73933 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java
@@ -25,6 +25,7 @@
 import java.lang.reflect.Proxy;
 
 import org.apache.deltaspike.core.api.message.MessageBundle;
+import org.apache.deltaspike.core.impl.message.MessageBundleInvocationHandler;
 import org.apache.deltaspike.core.util.ClassUtils;
 import org.apache.deltaspike.jsf.api.message.JsfMessage;
 
@@ -35,18 +36,20 @@
  */
 public class DefaultJsfMessage<T> implements JsfMessage<T>
 {
-    private String clientId = null;
-    private Class<T> type;
+    private final String clientId;
+    private final Class<T> type;
+    private final MessageBundleInvocationHandler invocationHandler;
 
     /**
      * The Message type
      * @param type
      * @param clientId
      */
-    public DefaultJsfMessage(Class<T> type, String clientId)
+    public DefaultJsfMessage(Class<T> type, String clientId, MessageBundleInvocationHandler invocationHandler)
     {
         this.type = type;
         this.clientId = clientId;
+        this.invocationHandler = invocationHandler;
 
         if (! type.isInterface() || type.getAnnotation(MessageBundle.class) == null)
         {
@@ -58,7 +61,7 @@ public DefaultJsfMessage(Class<T> type, String clientId)
     @Override
     public JsfMessage<T> forClientId(String clientId)
     {
-        return new DefaultJsfMessage<T>(type, clientId);
+        return new DefaultJsfMessage<T>(type, clientId, invocationHandler);
     }
 
     @Override
@@ -100,7 +103,7 @@ public T get()
     private T getMessage(FacesMessage.Severity severity)
     {
         return type.cast(Proxy.newProxyInstance(ClassUtils.getClassLoader(null),
-                new Class<?>[]{type}, new JsfMessageBundleInvocationHandler(severity, clientId)));
+                new Class<?>[]{type}, new JsfMessageBundleInvocationHandler(severity, clientId, invocationHandler)));
     }
 
 }
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
index a75bf8e67..e8915aba9 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
@@ -18,8 +18,10 @@
  */
 package org.apache.deltaspike.jsf.impl.message;
 
+import javax.enterprise.inject.Typed;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
 import org.apache.deltaspike.core.api.message.Message;
@@ -30,20 +32,24 @@
  * This Proxy InvocationHandler automatically registers the
  * returned messages in the FacesContext if a severity is set.
  */
-public class JsfMessageBundleInvocationHandler extends MessageBundleInvocationHandler
+@Typed()
+public class JsfMessageBundleInvocationHandler implements InvocationHandler
 {
-    private FacesMessage.Severity severity;
-    private String clientId;
+    private final FacesMessage.Severity severity;
+    private final String clientId;
+    private final MessageBundleInvocationHandler invocationHandler;
 
-    public JsfMessageBundleInvocationHandler(FacesMessage.Severity severity, String clientId)
+    public JsfMessageBundleInvocationHandler(FacesMessage.Severity severity, String clientId,
+                                             MessageBundleInvocationHandler invocationHandler)
     {
         this.severity = severity;
         this.clientId = clientId;
+        this.invocationHandler = invocationHandler;
     }
 
     public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable
     {
-        Object message = super.invoke(proxy, method, args);
+        Object message = invocationHandler.invoke(proxy, method, args);
 
         if (severity == null)
         {
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
index c035b2353..8751468fe 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
@@ -26,6 +26,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
+import org.apache.deltaspike.core.impl.message.MessageBundleInvocationHandler;
 import org.apache.deltaspike.jsf.api.message.JsfMessage;
 
 /**
@@ -36,7 +37,8 @@ public class JsfMessageProducer
 {
     @Produces
     @Dependent
-    public <M> JsfMessage<M> createJsfMessage(InjectionPoint injectionPoint)
+    public <M> JsfMessage<M> createJsfMessage(InjectionPoint injectionPoint,
+                                              MessageBundleInvocationHandler invocationHandler)
     {
         if (!(injectionPoint.getType() instanceof ParameterizedType))
         {
@@ -52,7 +54,7 @@ public <M> JsfMessage<M> createJsfMessage(InjectionPoint injectionPoint)
         {
             @SuppressWarnings(""unchecked"")
             Class<M> type = (Class<M>) actualTypes[0];
-            return createJsfMessageFor(injectionPoint, type);
+            return createJsfMessageFor(injectionPoint, type, invocationHandler);
         }
         catch (ClassCastException e)
         {
@@ -60,9 +62,10 @@ public <M> JsfMessage<M> createJsfMessage(InjectionPoint injectionPoint)
         }
     }
 
-    private <M> JsfMessage<M> createJsfMessageFor(InjectionPoint injectionPoint, Class<M> rawType)
+    private <M> JsfMessage<M> createJsfMessageFor(InjectionPoint injectionPoint, Class<M> rawType,
+                                                  MessageBundleInvocationHandler invocationHandler)
     {
         // X TODO check if the JsfMessage should get injected into a UIComponent and use #getClientId()
-        return new DefaultJsfMessage<M>(rawType, null);
+        return new DefaultJsfMessage<M>(rawType, null, invocationHandler);
     }
 }"
aa25be6a631c53788feacb19209b12924bd93f51,intellij-community,better messages format--,p,https://github.com/JetBrains/intellij-community,"diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 65bfcf76a392a..fced512e04cf4 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -58,7 +58,6 @@
 public class IncProjectBuilder {
   private static final Logger LOG = Logger.getInstance(""#org.jetbrains.jps.incremental.IncProjectBuilder"");
 
-  public static final String BUILD_NAME = ""EXTERNAL BUILD"";
   private static final String CLASSPATH_INDEX_FINE_NAME = ""classpath.index"";
   private static final boolean GENERATE_CLASSPATH_INDEX = Boolean.parseBoolean(System.getProperty(GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION, ""false""));
   private static final int MAX_BUILDER_THREADS;
@@ -166,7 +165,7 @@ public void run() {
           cause instanceof MappingFailedException ||
           cause instanceof IOException) {
         myMessageDispatcher.processMessage(new CompilerMessage(
-          BUILD_NAME, BuildMessage.Kind.INFO,
+          """", BuildMessage.Kind.INFO,
           ""Internal caches are corrupted or have outdated format, forcing project rebuild: "" +
           e.getMessage())
         );
@@ -183,7 +182,7 @@ public void run() {
         }
         else {
           // the reason for the build stop is unexpected internal error, report it
-          myMessageDispatcher.processMessage(new CompilerMessage(BUILD_NAME, cause));
+          myMessageDispatcher.processMessage(new CompilerMessage("""", cause));
         }
       }
     }
@@ -566,7 +565,7 @@ private boolean runBuildersForChunk(CompileContext context, final BuildTargetChu
         }
         else {
           context.processMessage(new CompilerMessage(
-            BUILD_NAME, BuildMessage.Kind.ERROR, ""Cannot build "" + target.getPresentableName() + "" because it is included into a circular dependency"")
+            """", BuildMessage.Kind.ERROR, ""Cannot build "" + target.getPresentableName() + "" because it is included into a circular dependency"")
           );
           return false;
         }"
7d8aff2ef670306fc01bd2160b1e755196558da1,orientdb,Fix by Andrey on marshalling/unmarshalling of- embedded documents--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerCSVAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerCSVAbstract.java
index 4ff35d1ed82..f188da62984 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerCSVAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerCSVAbstract.java
@@ -51,6 +51,7 @@
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.serialization.serializer.OStringSerializerHelper;
 import com.orientechnologies.orient.core.serialization.serializer.object.OObjectSerializerHelper;
+import com.orientechnologies.orient.core.serialization.serializer.string.OStringSerializerAnyStreamable;
 import com.orientechnologies.orient.core.tx.OTransactionRecordEntry;
 
 @SuppressWarnings(""unchecked"")
@@ -134,7 +135,12 @@ public Object fieldFromStream(final ORecordInternal<?> iSourceRecord, final OTyp
 			if (iValue.length() > 2) {
 				// REMOVE BEGIN & END EMBEDDED CHARACTERS
 				final String value = iValue.substring(1, iValue.length() - 1);
-				return fieldTypeFromStream((ODocument) iSourceRecord, iType, value);
+
+				// RECORD
+				final Object result = OStringSerializerAnyStreamable.INSTANCE.fromStream(iSourceRecord.getDatabase(), value);
+				if (result instanceof ODocument)
+					((ODocument) result).addOwner(iSourceRecord);
+				return result;
 			} else
 				return null;
 
@@ -174,7 +180,7 @@ public Map<String, Object> embeddedMapFromStream(final ODocument iSourceDocument
 					String mapValue = entry.get(1);
 
 					final OType linkedType;
-					
+
 					if (iLinkedType == null)
 						if (mapValue.length() > 0) {
 							linkedType = getType(mapValue);
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
index 4c9c877fdbc..5db718dd9c3 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerSchemaAware2CSV.java
@@ -407,7 +407,7 @@ else if (fieldValue.equals(""true"") || fieldValue.equals(""false""))
 						}
 					}
 
-					if (type == OType.EMBEDDEDLIST || type == OType.EMBEDDEDSET || type == OType.EMBEDDEDMAP)
+					if (type == OType.EMBEDDEDLIST || type == OType.EMBEDDEDSET || type == OType.EMBEDDEDMAP || type == OType.EMBEDDED)
 						// SAVE THE TYPE AS EMBEDDED
 						record.field(fieldName, fieldFromStream(iRecord, type, linkedClass, linkedType, fieldName, fieldValue), type);
 					else"
528826d1103474e73c2ba0d445e78e78c48b34a9,Vala,"gobject-introspection-1.0: regenerate according to vala-girs
",a,https://github.com/GNOME/vala/,"diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi
index c5c6ad9a95..44b5dfa666 100644
--- a/vapi/gobject-introspection-1.0.vapi
+++ b/vapi/gobject-introspection-1.0.vapi
@@ -126,6 +126,7 @@ namespace GI {
 		protected ObjectInfo ();
 		public static GI.FunctionInfo find_method (GI.ObjectInfo info, string name);
 		public static GI.FunctionInfo find_method_using_interfaces (GI.ObjectInfo info, string name, out GI.ObjectInfo implementor);
+		public static GI.SignalInfo find_signal (GI.ObjectInfo info, string name);
 		public static GI.VFuncInfo find_vfunc (GI.ObjectInfo info, string name);
 		public static GI.VFuncInfo find_vfunc_using_interfaces (GI.ObjectInfo info, string name, out GI.ObjectInfo implementor);
 		public static bool get_abstract (GI.ObjectInfo info);
@@ -302,9 +303,6 @@ namespace GI {
 	[CCode (cheader_filename = ""girepository.h"", has_type_id = false)]
 	public struct AttributeIter {
 	}
-	[CCode (cheader_filename = ""girepository.h"", cname = ""_GIBaseInfoStub"", has_type_id = false)]
-	public struct _BaseInfoStub {
-	}
 	[CCode (cheader_filename = ""girepository.h"", cprefix = ""GI_ARRAY_TYPE_"", has_type_id = false)]
 	public enum ArrayType {
 		C,"
c7a5de087b31e9b4e11752818526b45ad3154915,Mylyn Reviews,"331862: Move review parts back to seperate page

-Deleted old advisors
-Changed mylyn.tasks.ui dependency to 3.4
-Added old PageFactories and Pages
-Removed old unnecessary dependency
-Initial import of review dsl
-Cleanup reviews.core
-Removed old reviews model
-Removed old code
-Development, Cleanup
 -Introduced API over most accesses to Mylyn (still not complete yet)
 -Tweaked the dsl
 -Removed unused, old classes
 -Fixed namespace
-Finished namespace renaming
-Review for non-patch attachments
-Moved Review Summary to common review page
 -Removed special summary page for tasks with review sub-tasks
 -Show common review page on all tasks
 -Some cleanup and refactoring
 -Expand summary tree by default
 -Filtering for summary view
 -Uninteresting nodes can be filtered
-Abstraction for TasksUiUtil.openTask for Summary
-Further Cleanup
-Added legal headers
-Removed unused classes
-fixed plugin xml
-Summary: show creator of review
-Enable filtering by default
-Summary: Description for Task nodes
 -The changing artifacts of the task (currently only attachments - patches and other) will be displayed in the table.
-Rebased & squashed so that all files have that legal header
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/tbr/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b93a9fc9..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Reviews Core (Incubation)
-Bundle-SymbolicName: org.eclipse.mylyn.reviews.core;singleton:=true
-Bundle-Version: 0.0.1
-Bundle-Activator: org.eclipse.mylyn.reviews.core.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;bundle-version=""2.5.0"",
- org.eclipse.team.core;bundle-version=""3.5.0"",
- org.eclipse.core.resources;bundle-version=""3.5.1"",
- org.eclipse.mylyn.tasks.core;bundle-version=""3.3.0"",
- org.eclipse.compare;bundle-version=""3.5.0""
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.mylyn.reviews.core,
- org.eclipse.mylyn.reviews.core.model.review,
- org.eclipse.mylyn.reviews.core.model.review.impl,
- org.eclipse.mylyn.reviews.core.model.review.util
diff --git a/tbr/org.eclipse.mylyn.reviews.core/model/review.ecore b/tbr/org.eclipse.mylyn.reviews.core/model/review.ecore
deleted file mode 100644
index f2d227e6..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/model/review.ecore
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version=""1.0"" encoding=""UTF-8""?>
-<ecore:EPackage xmi:version=""2.0""
-    xmlns:xmi=""http://www.omg.org/XMI"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""
-    xmlns:ecore=""http://www.eclipse.org/emf/2002/Ecore"" name=""review""
-    nsURI=""org.eclipse.mylyn.reviews"" nsPrefix="""">
-  <eClassifiers xsi:type=""ecore:EClass"" name=""Review"">
-    <eStructuralFeatures xsi:type=""ecore:EReference"" name=""result"" eType=""#//ReviewResult""/>
-    <eStructuralFeatures xsi:type=""ecore:EReference"" name=""scope"" upperBound=""-1""
-        eType=""#//ScopeItem""/>
-  </eClassifiers>
-  <eClassifiers xsi:type=""ecore:EClass"" name=""ReviewResult"">
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""text"" eType=""ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString""/>
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""rating"" eType=""#//Rating""/>
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""reviewer"" eType=""ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString""/>
-  </eClassifiers>
-  <eClassifiers xsi:type=""ecore:EClass"" name=""Patch"" eSuperTypes=""#//ScopeItem"">
-    <eOperations name=""parse"" upperBound=""-1"" eType=""#//IFilePatch2""/>
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""contents"" eType=""ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString""/>
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""creationDate"" eType=""ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate""/>
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""fileName"" eType=""ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString""/>
-  </eClassifiers>
-  <eClassifiers xsi:type=""ecore:EEnum"" name=""Rating"">
-    <eLiterals name=""NONE""/>
-    <eLiterals name=""PASSED""/>
-    <eLiterals name=""WARNING""/>
-    <eLiterals name=""FAILED""/>
-  </eClassifiers>
-  <eClassifiers xsi:type=""ecore:EDataType"" name=""IFilePatch2"" instanceClassName=""org.eclipse.compare.patch.IFilePatch2""/>
-  <eClassifiers xsi:type=""ecore:EDataType"" name=""IProgressMonitor"" instanceClassName=""org.eclipse.core.runtime.IProgressMonitor""/>
-  <eClassifiers xsi:type=""ecore:EClass"" name=""ScopeItem"">
-    <eStructuralFeatures xsi:type=""ecore:EAttribute"" name=""author"" eType=""ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString""/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/tbr/org.eclipse.mylyn.reviews.core/model/review.genmodel b/tbr/org.eclipse.mylyn.reviews.core/model/review.genmodel
deleted file mode 100644
index c3b7f79e..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/model/review.genmodel
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version=""1.0"" encoding=""UTF-8""?>
-<genmodel:GenModel xmi:version=""2.0""
-    xmlns:xmi=""http://www.omg.org/XMI"" xmlns:ecore=""http://www.eclipse.org/emf/2002/Ecore""
-    xmlns:genmodel=""http://www.eclipse.org/emf/2002/GenModel"" modelDirectory=""/org.eclipse.mylyn.reviews.core/src""
-    modelPluginID=""org.eclipse.mylyn.reviews.core"" modelName=""Review"" importerID=""org.eclipse.emf.importer.ecore""
-    complianceLevel=""5.0"" copyrightFields=""false"">
-  <foreignModel>review.ecore</foreignModel>
-  <genPackages prefix=""Review"" basePackage=""org.eclipse.mylyn.reviews.core.model""
-      disposableProviderFactory=""true"" ecorePackage=""review.ecore#/"">
-    <genEnums typeSafeEnumCompatible=""false"" ecoreEnum=""review.ecore#//Rating"">
-      <genEnumLiterals ecoreEnumLiteral=""review.ecore#//Rating/NONE""/>
-      <genEnumLiterals ecoreEnumLiteral=""review.ecore#//Rating/PASSED""/>
-      <genEnumLiterals ecoreEnumLiteral=""review.ecore#//Rating/WARNING""/>
-      <genEnumLiterals ecoreEnumLiteral=""review.ecore#//Rating/FAILED""/>
-    </genEnums>
-    <genDataTypes ecoreDataType=""review.ecore#//IFilePatch2""/>
-    <genDataTypes ecoreDataType=""review.ecore#//IProgressMonitor""/>
-    <genClasses ecoreClass=""review.ecore#//Review"">
-      <genFeatures notify=""false"" createChild=""false"" propertySortChoices=""true"" ecoreFeature=""ecore:EReference review.ecore#//Review/result""/>
-      <genFeatures notify=""false"" createChild=""false"" propertySortChoices=""true"" ecoreFeature=""ecore:EReference review.ecore#//Review/scope""/>
-    </genClasses>
-    <genClasses ecoreClass=""review.ecore#//ReviewResult"">
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//ReviewResult/text""/>
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//ReviewResult/rating""/>
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//ReviewResult/reviewer""/>
-    </genClasses>
-    <genClasses ecoreClass=""review.ecore#//Patch"">
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//Patch/contents""/>
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//Patch/creationDate""/>
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//Patch/fileName""/>
-      <genOperations ecoreOperation=""review.ecore#//Patch/parse""/>
-    </genClasses>
-    <genClasses ecoreClass=""review.ecore#//ScopeItem"">
-      <genFeatures createChild=""false"" ecoreFeature=""ecore:EAttribute review.ecore#//ScopeItem/author""/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/Activator.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/Activator.java
deleted file mode 100644
index 16999003..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Kilian Matt
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = ""org.eclipse.mylyn.reviews.core""; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java
deleted file mode 100644
index bcf8c548..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.mylyn.reviews.core;
-
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-public class ReviewData {
-	private boolean outgoing;
-	private Review review;
-	private ITask task;
-	private boolean dirty;
-
-	public ReviewData(ITask task, Review review) {
-		this.task=task;
-		this.review = review;
-	}
-
-	public boolean isOutgoing() {
-		return outgoing;
-	}
-
-	public void setOutgoing() {
-		this.outgoing = true;
-	}
-
-	public void setOutgoing(boolean outgoing) {
-		this.outgoing = outgoing;
-	}
-
-	public ITask getTask() {
-		return task;
-	}
-
-	public Review getReview() {
-		return review;
-	}
-
-	public void setDirty(boolean isDirty) {
-		this.dirty=isDirty;
-	}
-
-	public void setDirty() {
-		setDirty(true);
-	}
-	public boolean isDirty() {
-		return this.dirty;
-	}
-	
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewDataManager.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewDataManager.java
deleted file mode 100644
index 13ec95fd..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewDataManager.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.mylyn.reviews.core;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.tasks.core.IRepositoryModel;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.data.ITaskDataManager;
-
-public class ReviewDataManager {
-	private Map<ITask, ReviewData> cached = new HashMap<ITask, ReviewData>();
-	private ReviewDataStore store;
-	private ITaskDataManager taskDataManager;
-	private IRepositoryModel repositoryModel;
-
-	public ReviewDataManager(ReviewDataStore store,
-			ITaskDataManager taskDataManager, IRepositoryModel repositoryModel) {
-		this.store = store;
-		this.taskDataManager = taskDataManager;
-		this.repositoryModel = repositoryModel;
-
-	}
-
-	public void storeOutgoingTask(ITask task, Review review) {
-		ReviewData reviewData = new ReviewData(task, review);
-		reviewData.setOutgoing();
-		cached.put(task, reviewData);
-		store.storeReviewData(task.getRepositoryUrl(), task.getTaskId(),
-				review, ""review"");
-	}
-
-	public ReviewData getReviewData(ITask task) {
-		if (task == null)
-			return null;
-		ReviewData reviewData = cached.get(task);
-		if (reviewData == null) {
-			reviewData = loadFromDiskAddCache(task);
-		}
-		if (reviewData == null) {
-			reviewData = loadFromTask(task);
-		}
-		return reviewData;
-	}
-
-	private ReviewData loadFromTask(ITask task) {
-		try {
-			List<Review> reviews = ReviewsUtil.getReviewAttachmentFromTask(
-					taskDataManager, repositoryModel, task);
-			storeTask(task, reviews.get(reviews.size() - 1));
-
-			return getReviewData(task);
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private ReviewData loadFromDiskAddCache(ITask task) {
-		List<Review> reviews = store.loadReviewData(task.getRepositoryUrl(),
-				task.getTaskId());
-		if (reviews.size() > 0) {
-			Review review = reviews.get(0);
-			storeTask(task, review);
-			return getReviewData(task);
-		}
-		return null;
-	}
-
-	public void storeTask(ITask task, Review review) {
-		final ReviewData reviewData = new ReviewData(task, review);
-		review.eAdapters().add(new AdapterImpl() {
-			public void notifyChanged(Notification notification) {
-				System.err.println(""notification ""+notification);
-				reviewData.setDirty(true);
-			}
-
-			});
-		cached.put(task, reviewData);
-		store.storeReviewData(task.getRepositoryUrl(), task.getTaskId(),
-				review, ""review"");
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewDataStore.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewDataStore.java
deleted file mode 100644
index f24ad5a6..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewDataStore.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.mylyn.reviews.core;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-
-public class ReviewDataStore {
-
-	private String storeRootDir;
-
-	public ReviewDataStore(String storeRootDir) {
-		this.storeRootDir = storeRootDir;
-	}
-
-	public void storeReviewData(String repositoryUrl, String taskId,
-			Review review, String id) {
-		try {
-			
-			File file = getFile(repositoryUrl, taskId);
-			createDirectoriesIfNecessary(file);
-			if (!file.exists()) {
-				file.createNewFile();
-				ZipOutputStream outputStream = new ZipOutputStream(
-						new FileOutputStream(file));
-				ResourceSet resourceSet = new ResourceSetImpl();
-
-				Resource resource = resourceSet.createResource(URI
-						.createFileURI("""")); //$NON-NLS-1$
-
-				resource.getContents().add(review);
-				resource.getContents().add(review.getScope().get(0));
-				if (review.getResult() != null)
-					resource.getContents().add(review.getResult());
-
-				outputStream.putNextEntry(new ZipEntry(id));
-				resource.save(outputStream, null);
-				outputStream.closeEntry();
-				outputStream.close();
-			} else {
-				// TODO append
-
-			}
-		} catch (Exception e) {
-			// TODO: handle exception
-			e.printStackTrace();
-		}
-	}
-
-	private void createDirectoriesIfNecessary(File file) {
-		File parent = file.getParentFile();
-		if(!parent.exists()) {
-			parent.mkdirs();
-		}
-	}
-
-	public List<Review> loadReviewData(String repositoryUrl, String taskId) {
-		List<Review> reviews = new ArrayList<Review>();
-		try {
-
-			File file = getFile(repositoryUrl, taskId);
-			if(!file.exists()) {
-				return reviews;
-			}
-			ZipInputStream inputStream = new ZipInputStream(
-					new FileInputStream(file));
-			inputStream.getNextEntry();
-			ResourceSet resourceSet = new ResourceSetImpl();
-			resourceSet.getPackageRegistry().put(ReviewPackage.eNS_URI,
-					ReviewPackage.eINSTANCE);
-			Resource resource = resourceSet.createResource(URI.createURI(""""));
-			resource.load(inputStream, null);
-			for (EObject item : resource.getContents()) {
-				if (item instanceof Review) {
-					Review review = (Review) item;
-					reviews.add(review);
-				}
-			}
-		} catch (Exception e) {
-			// TODO: handle exception
-			e.printStackTrace();
-		}
-		return reviews;
-	}
-
-	private File getFile(String repositoryUrl, String taskId) {
-		File path = new File(storeRootDir + File.separator + ""reviews""
-				+ File.separator + URLEncoder.encode(repositoryUrl)
-				+ File.separator);
-		return new File(path, taskId);
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewSubTask.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewSubTask.java
deleted file mode 100644
index db2ba150..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewSubTask.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
-
-import java.util.Date;
-
-import org.eclipse.mylyn.reviews.core.model.review.Rating;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * @author Kilian Matt
- */
-public class ReviewSubTask {
-
-	private String comment;
-	private ITask task;
-	private Date creationDate;
-
-	public ReviewSubTask(String patchFile, Date creationDate, String author,
-			String reviewer, Rating result, String comment, ITask task) {
-		super();
-		this.patchFile = patchFile;
-		this.creationDate = new Date(creationDate.getTime());
-		this.author = author;
-		this.reviewer = reviewer;
-		this.result = result;
-		this.comment = comment;
-		this.task = task;
-	}
-
-	private String patchFile;
-	private String author;
-	private String reviewer;
-	private Rating result;
-
-	public String getPatchFile() {
-		return patchFile;
-	}
-
-	public Date getCreationDate() {
-		return creationDate;
-	}
-
-	public String getPatchDescription() {
-		return String.format(""%s %s"", patchFile, creationDate);
-	}
-
-	public String getAuthor() {
-		return author;
-	}
-
-	public String getReviewer() {
-		return reviewer;
-	}
-
-	public Rating getResult() {
-		return result;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public ITask getTask() {
-		return task;
-	}
-
-	@Override
-	public String toString() {
-		return ""Review Subtask "" + patchFile + "" by "" + author + "" revd by ""
-				+ reviewer + "" rated as "" + result;
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
deleted file mode 100644
index 2497d432..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.zip.ZipInputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.mylyn.internal.tasks.core.RepositoryModel;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.Rating;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-import org.eclipse.mylyn.tasks.core.IRepositoryModel;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.mylyn.tasks.core.ITaskContainer;
-import org.eclipse.mylyn.tasks.core.data.ITaskDataManager;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-
-/**
- * @author Kilian Matt
- */
-public class ReviewsUtil {
-
-	public static List<ReviewSubTask> getReviewSubTasksFor(
-			ITaskContainer taskContainer, ITaskDataManager taskDataManager,
-			IRepositoryModel repositoryModel, IProgressMonitor monitor) {
-		List<ReviewSubTask> resultList = new ArrayList<ReviewSubTask>();
-		try {
-			for (ITask subTask : taskContainer.getChildren()) {
-				if (!ReviewsUtil.hasReviewMarker(subTask)) {
-					TaskData taskData = taskDataManager.getTaskData(subTask);
-					if (getReviewAttachments(repositoryModel, taskData).size() > 0) {
-						ReviewsUtil.markAsReview(subTask);
-					}
-				}
-
-				if (ReviewsUtil.isMarkedAsReview(subTask)) {//.getSummary().startsWith(""Review"")) { //$NON-NLS-1$
-					// change to review data manager
-					for (Review review : getReviewAttachmentFromTask(
-							taskDataManager, repositoryModel, subTask)) {
-						// TODO change to latest etc
-						ReviewResult result = review.getResult();
-						if (result == null) {
-							result = ReviewFactory.eINSTANCE
-									.createReviewResult();
-							result.setRating(Rating.NONE);
-							result.setText("""");
-						}
-						resultList.add(new ReviewSubTask(getPatchFile(review
-								.getScope()), getPatchCreationDate(review
-								.getScope()),
-								getAuthorString(review.getScope()), subTask
-										.getOwner(), result.getRating(), result
-										.getText(), subTask));
-
-					}
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return resultList;
-
-	}
-
-	private static String getPatchFile(EList<ScopeItem> scope) {
-		if (scope.size() == 1 && scope.get(0) instanceof Patch) {
-			return ((Patch) scope.get(0)).getFileName();
-		} else {
-			return """";
-		}
-	}
-
-	private static Date getPatchCreationDate(EList<ScopeItem> scope) {
-		if (scope.size() == 1 && scope.get(0) instanceof Patch) {
-			return ((Patch) scope.get(0)).getCreationDate();
-		} else {
-			return null;
-		}
-	}
-
-	private static String getAuthorString(EList<ScopeItem> scope) {
-		if (scope.size() == 0) {
-			return ""none"";
-		} else if (scope.size() == 1) {
-			return scope.get(0).getAuthor();
-		} else if (scope.size() < 3) {
-			StringBuilder sb = new StringBuilder();
-			for (ScopeItem item : scope) {
-				sb.append(item.getAuthor());
-				sb.append("", "");
-			}
-			return sb.substring(0, sb.length() - 2);
-		} else {
-			return ""Multiple Authors"";
-		}
-	}
-
-	static List<Review> parseAttachments(TaskAttribute attribute,
-			IProgressMonitor monitor) {
-		List<Review> reviewList = new ArrayList<Review>();
-		try {
-			URL url = new URL(attribute.getMappedAttribute(
-					TaskAttribute.ATTACHMENT_URL).getValue());
-
-			ZipInputStream stream = new ZipInputStream(url.openStream());
-			while (!stream.getNextEntry().getName()
-					.equals(ReviewConstants.REVIEW_DATA_FILE)) {
-			}
-
-			ResourceSet resourceSet = new ResourceSetImpl();
-			resourceSet.getPackageRegistry().put(ReviewPackage.eNS_URI,
-					ReviewPackage.eINSTANCE);
-			Resource resource = resourceSet.createResource(URI.createURI(""""));
-			resource.load(stream, null);
-			for (EObject item : resource.getContents()) {
-				if (item instanceof Review) {
-					Review review = (Review) item;
-					reviewList.add(review);
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return reviewList;
-	}
-
-	public static List<Review> getReviewAttachmentFromTask(
-			ITaskDataManager taskDataManager, IRepositoryModel repositoryModel,
-			ITask task) throws CoreException {
-
-		List<Review> reviews = new ArrayList<Review>();
-		TaskData taskData = taskDataManager.getTaskData(task);
-		if (taskData != null) {
-			List<TaskAttribute> attributesByType = taskData
-					.getAttributeMapper().getAttributesByType(taskData,
-							TaskAttribute.TYPE_ATTACHMENT);
-			ITaskAttachment lastReview = null;
-
-			for (TaskAttribute attribute : attributesByType) {
-				// TODO move RepositoryModel.createTaskAttachment to interface?
-				ITaskAttachment taskAttachment = ((RepositoryModel) repositoryModel)
-						.createTaskAttachment(attribute);
-				if (taskAttachment != null
-						&& taskAttachment.getFileName().equals(
-								ReviewConstants.REVIEW_DATA_CONTAINER)) {
-
-					if (lastReview == null
-							|| lastReview.getCreationDate().before(
-									taskAttachment.getCreationDate())) {
-						lastReview = taskAttachment;
-					}
-				}
-
-			}
-
-			if (lastReview != null) {
-				reviews.addAll(parseAttachments(lastReview.getTaskAttribute(),
-						new NullProgressMonitor()));
-			}
-
-		}
-		return reviews;
-	}
-
-	public static List<TaskAttribute> getReviewAttachments(
-			IRepositoryModel repositoryModel, TaskData taskData) {
-
-		List<TaskAttribute> matchingAttributes = new ArrayList<TaskAttribute>();
-		List<TaskAttribute> attributesByType = taskData.getAttributeMapper()
-				.getAttributesByType(taskData, TaskAttribute.TYPE_ATTACHMENT);
-		for (TaskAttribute attribute : attributesByType) {
-			// TODO move RepositoryModel.createTaskAttachment to interface?
-			ITaskAttachment taskAttachment = ((RepositoryModel) repositoryModel)
-					.createTaskAttachment(attribute);
-			if (taskAttachment != null
-					&& taskAttachment.getFileName().equals(
-							ReviewConstants.REVIEW_DATA_CONTAINER)) {
-				matchingAttributes.add(attribute);
-			}
-		}
-		return matchingAttributes;
-	}
-
-	private static List<ITargetPathStrategy> strategies;
-	static {
-		strategies = new ArrayList<ITargetPathStrategy>();
-		strategies.add(new SimplePathFindingStrategy());
-		strategies.add(new GitPatchPathFindingStrategy());
-	}
-
-	public static List<? extends ITargetPathStrategy> getPathFindingStrategies() {
-		return strategies;
-	}
-
-	public static boolean isMarkedAsReview(ITask task) {
-		boolean isReview = Boolean.parseBoolean(task
-				.getAttribute(ReviewConstants.ATTR_REVIEW_FLAG));
-		return isReview;
-	}
-
-	public static void markAsReview(ITask task) {
-		task.setAttribute(ReviewConstants.ATTR_REVIEW_FLAG,
-				Boolean.TRUE.toString());
-	}
-
-	public static boolean hasReviewMarker(ITask task) {
-		return task.getAttribute(ReviewConstants.ATTR_REVIEW_FLAG) != null;
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Patch.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Patch.java
deleted file mode 100644
index 7521cb9f..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Patch.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import java.util.Date;
-
-import org.eclipse.compare.patch.IFilePatch2;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Patch</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getContents <em>Contents</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getFileName <em>File Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getPatch()
- * @model
- * @generated
- */
-public interface Patch extends ScopeItem {
-	/**
-	 * Returns the value of the '<em><b>Contents</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contents</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contents</em>' attribute.
-	 * @see #setContents(String)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getPatch_Contents()
-	 * @model
-	 * @generated
-	 */
-	String getContents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getContents <em>Contents</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Contents</em>' attribute.
-	 * @see #getContents()
-	 * @generated
-	 */
-	void setContents(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Date</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Date</em>' attribute.
-	 * @see #setCreationDate(Date)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getPatch_CreationDate()
-	 * @model
-	 * @generated
-	 */
-	Date getCreationDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getCreationDate <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Date</em>' attribute.
-	 * @see #getCreationDate()
-	 * @generated
-	 */
-	void setCreationDate(Date value);
-
-	/**
-	 * Returns the value of the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>File Name</em>' attribute.
-	 * @see #setFileName(String)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getPatch_FileName()
-	 * @model
-	 * @generated
-	 */
-	String getFileName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getFileName <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File Name</em>' attribute.
-	 * @see #getFileName()
-	 * @generated
-	 */
-	void setFileName(String value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model dataType=""org.eclipse.mylyn.reviews.core.model.review.IFilePatch2""
-	 * @generated
-	 */
-	EList<IFilePatch2> parse();
-
-} // Patch
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Rating.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Rating.java
deleted file mode 100644
index c4a04335..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Rating.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Rating</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getRating()
- * @model
- * @generated
- */
-public enum Rating implements Enumerator {
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(0, ""NONE"", ""NONE""),
-
-	/**
-	 * The '<em><b>PASSED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PASSED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PASSED(0, ""PASSED"", ""PASSED""),
-
-	/**
-	 * The '<em><b>WARNING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WARNING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	WARNING(0, ""WARNING"", ""WARNING""),
-
-	/**
-	 * The '<em><b>FAILED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FAILED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FAILED(0, ""FAILED"", ""FAILED"");
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE_VALUE = 0;
-
-	/**
-	 * The '<em><b>PASSED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PASSED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PASSED
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PASSED_VALUE = 0;
-
-	/**
-	 * The '<em><b>WARNING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>WARNING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WARNING
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WARNING_VALUE = 0;
-
-	/**
-	 * The '<em><b>FAILED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FAILED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FAILED
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FAILED_VALUE = 0;
-
-	/**
-	 * An array of all the '<em><b>Rating</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Rating[] VALUES_ARRAY =
-		new Rating[] {
-			NONE,
-			PASSED,
-			WARNING,
-			FAILED,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Rating</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Rating> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Rating</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Rating get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Rating result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Rating</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Rating getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Rating result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Rating</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Rating get(int value) {
-		switch (value) {
-			case NONE_VALUE: return NONE;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Rating(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //Rating
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Review.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Review.java
deleted file mode 100644
index 5d3bf277..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/Review.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Review</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.Review#getResult <em>Result</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.Review#getScope <em>Scope</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReview()
- * @model
- * @generated
- */
-public interface Review extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Result</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Result</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Result</em>' reference.
-	 * @see #setResult(ReviewResult)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReview_Result()
-	 * @model
-	 * @generated
-	 */
-	ReviewResult getResult();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.Review#getResult <em>Result</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Result</em>' reference.
-	 * @see #getResult()
-	 * @generated
-	 */
-	void setResult(ReviewResult value);
-
-	/**
-	 * Returns the value of the '<em><b>Scope</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.mylyn.reviews.core.model.review.ScopeItem}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scope</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Scope</em>' reference list.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReview_Scope()
-	 * @model
-	 * @generated
-	 */
-	EList<ScopeItem> getScope();
-
-} // Review
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewFactory.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewFactory.java
deleted file mode 100644
index 288649cd..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage
- * @generated
- */
-public interface ReviewFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ReviewFactory eINSTANCE = org.eclipse.mylyn.reviews.core.model.review.impl.ReviewFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Review</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Review</em>'.
-	 * @generated
-	 */
-	Review createReview();
-
-	/**
-	 * Returns a new object of class '<em>Result</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Result</em>'.
-	 * @generated
-	 */
-	ReviewResult createReviewResult();
-
-	/**
-	 * Returns a new object of class '<em>Patch</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Patch</em>'.
-	 * @generated
-	 */
-	Patch createPatch();
-
-	/**
-	 * Returns a new object of class '<em>Scope Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Scope Item</em>'.
-	 * @generated
-	 */
-	ScopeItem createScopeItem();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ReviewPackage getReviewPackage();
-
-} //ReviewFactory
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewPackage.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewPackage.java
deleted file mode 100644
index 20ed8ed5..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewPackage.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewFactory
- * @model kind=""package""
- * @generated
- */
-public interface ReviewPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = ""review"";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = ""org.eclipse.mylyn.reviews"";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = """";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ReviewPackage eINSTANCE = org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewImpl <em>Review</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewImpl
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getReview()
-	 * @generated
-	 */
-	int REVIEW = 0;
-
-	/**
-	 * The feature id for the '<em><b>Result</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__RESULT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__SCOPE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Review</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl <em>Result</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getReviewResult()
-	 * @generated
-	 */
-	int REVIEW_RESULT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_RESULT__TEXT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Rating</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_RESULT__RATING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Reviewer</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_RESULT__REVIEWER = 2;
-
-	/**
-	 * The number of structural features of the '<em>Result</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_RESULT_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.ScopeItemImpl <em>Scope Item</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ScopeItemImpl
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getScopeItem()
-	 * @generated
-	 */
-	int SCOPE_ITEM = 3;
-
-	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCOPE_ITEM__AUTHOR = 0;
-
-	/**
-	 * The number of structural features of the '<em>Scope Item</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCOPE_ITEM_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl <em>Patch</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getPatch()
-	 * @generated
-	 */
-	int PATCH = 2;
-
-	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATCH__AUTHOR = SCOPE_ITEM__AUTHOR;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATCH__CONTENTS = SCOPE_ITEM_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATCH__CREATION_DATE = SCOPE_ITEM_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATCH__FILE_NAME = SCOPE_ITEM_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Patch</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATCH_FEATURE_COUNT = SCOPE_ITEM_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.review.Rating <em>Rating</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Rating
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getRating()
-	 * @generated
-	 */
-	int RATING = 4;
-
-	/**
-	 * The meta object id for the '<em>IFile Patch2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.compare.patch.IFilePatch2
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getIFilePatch2()
-	 * @generated
-	 */
-	int IFILE_PATCH2 = 5;
-
-	/**
-	 * The meta object id for the '<em>IProgress Monitor</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.core.runtime.IProgressMonitor
-	 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getIProgressMonitor()
-	 * @generated
-	 */
-	int IPROGRESS_MONITOR = 6;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.core.model.review.Review <em>Review</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Review</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Review
-	 * @generated
-	 */
-	EClass getReview();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.core.model.review.Review#getResult <em>Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Result</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Review#getResult()
-	 * @see #getReview()
-	 * @generated
-	 */
-	EReference getReview_Result();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.mylyn.reviews.core.model.review.Review#getScope <em>Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Scope</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Review#getScope()
-	 * @see #getReview()
-	 * @generated
-	 */
-	EReference getReview_Scope();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult <em>Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Result</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewResult
-	 * @generated
-	 */
-	EClass getReviewResult();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getText <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Text</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getText()
-	 * @see #getReviewResult()
-	 * @generated
-	 */
-	EAttribute getReviewResult_Text();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getRating <em>Rating</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rating</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getRating()
-	 * @see #getReviewResult()
-	 * @generated
-	 */
-	EAttribute getReviewResult_Rating();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getReviewer <em>Reviewer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reviewer</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getReviewer()
-	 * @see #getReviewResult()
-	 * @generated
-	 */
-	EAttribute getReviewResult_Reviewer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.core.model.review.Patch <em>Patch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Patch</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Patch
-	 * @generated
-	 */
-	EClass getPatch();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getContents <em>Contents</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Contents</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Patch#getContents()
-	 * @see #getPatch()
-	 * @generated
-	 */
-	EAttribute getPatch_Contents();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getCreationDate <em>Creation Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Date</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Patch#getCreationDate()
-	 * @see #getPatch()
-	 * @generated
-	 */
-	EAttribute getPatch_CreationDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.Patch#getFileName <em>File Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>File Name</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Patch#getFileName()
-	 * @see #getPatch()
-	 * @generated
-	 */
-	EAttribute getPatch_FileName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.core.model.review.ScopeItem <em>Scope Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Scope Item</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ScopeItem
-	 * @generated
-	 */
-	EClass getScopeItem();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.review.ScopeItem#getAuthor <em>Author</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Author</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ScopeItem#getAuthor()
-	 * @see #getScopeItem()
-	 * @generated
-	 */
-	EAttribute getScopeItem_Author();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.mylyn.reviews.core.model.review.Rating <em>Rating</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Rating</em>'.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Rating
-	 * @generated
-	 */
-	EEnum getRating();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.compare.patch.IFilePatch2 <em>IFile Patch2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>IFile Patch2</em>'.
-	 * @see org.eclipse.compare.patch.IFilePatch2
-	 * @model instanceClass=""org.eclipse.compare.patch.IFilePatch2""
-	 * @generated
-	 */
-	EDataType getIFilePatch2();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.core.runtime.IProgressMonitor <em>IProgress Monitor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>IProgress Monitor</em>'.
-	 * @see org.eclipse.core.runtime.IProgressMonitor
-	 * @model instanceClass=""org.eclipse.core.runtime.IProgressMonitor""
-	 * @generated
-	 */
-	EDataType getIProgressMonitor();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ReviewFactory getReviewFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewImpl <em>Review</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewImpl
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getReview()
-		 * @generated
-		 */
-		EClass REVIEW = eINSTANCE.getReview();
-
-		/**
-		 * The meta object literal for the '<em><b>Result</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW__RESULT = eINSTANCE.getReview_Result();
-
-		/**
-		 * The meta object literal for the '<em><b>Scope</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW__SCOPE = eINSTANCE.getReview_Scope();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl <em>Result</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getReviewResult()
-		 * @generated
-		 */
-		EClass REVIEW_RESULT = eINSTANCE.getReviewResult();
-
-		/**
-		 * The meta object literal for the '<em><b>Text</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REVIEW_RESULT__TEXT = eINSTANCE.getReviewResult_Text();
-
-		/**
-		 * The meta object literal for the '<em><b>Rating</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REVIEW_RESULT__RATING = eINSTANCE.getReviewResult_Rating();
-
-		/**
-		 * The meta object literal for the '<em><b>Reviewer</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REVIEW_RESULT__REVIEWER = eINSTANCE.getReviewResult_Reviewer();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl <em>Patch</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getPatch()
-		 * @generated
-		 */
-		EClass PATCH = eINSTANCE.getPatch();
-
-		/**
-		 * The meta object literal for the '<em><b>Contents</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PATCH__CONTENTS = eINSTANCE.getPatch_Contents();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PATCH__CREATION_DATE = eINSTANCE.getPatch_CreationDate();
-
-		/**
-		 * The meta object literal for the '<em><b>File Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PATCH__FILE_NAME = eINSTANCE.getPatch_FileName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.core.model.review.impl.ScopeItemImpl <em>Scope Item</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ScopeItemImpl
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getScopeItem()
-		 * @generated
-		 */
-		EClass SCOPE_ITEM = eINSTANCE.getScopeItem();
-
-		/**
-		 * The meta object literal for the '<em><b>Author</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SCOPE_ITEM__AUTHOR = eINSTANCE.getScopeItem_Author();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.core.model.review.Rating <em>Rating</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.core.model.review.Rating
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getRating()
-		 * @generated
-		 */
-		EEnum RATING = eINSTANCE.getRating();
-
-		/**
-		 * The meta object literal for the '<em>IFile Patch2</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.compare.patch.IFilePatch2
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getIFilePatch2()
-		 * @generated
-		 */
-		EDataType IFILE_PATCH2 = eINSTANCE.getIFilePatch2();
-
-		/**
-		 * The meta object literal for the '<em>IProgress Monitor</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.core.runtime.IProgressMonitor
-		 * @see org.eclipse.mylyn.reviews.core.model.review.impl.ReviewPackageImpl#getIProgressMonitor()
-		 * @generated
-		 */
-		EDataType IPROGRESS_MONITOR = eINSTANCE.getIProgressMonitor();
-
-	}
-
-} //ReviewPackage
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewResult.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewResult.java
deleted file mode 100644
index 59c089de..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ReviewResult.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Result</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getText <em>Text</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getRating <em>Rating</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getReviewer <em>Reviewer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReviewResult()
- * @model
- * @generated
- */
-public interface ReviewResult extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Text</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Text</em>' attribute.
-	 * @see #setText(String)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReviewResult_Text()
-	 * @model
-	 * @generated
-	 */
-	String getText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getText <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Text</em>' attribute.
-	 * @see #getText()
-	 * @generated
-	 */
-	void setText(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Rating</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.mylyn.reviews.core.model.review.Rating}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Rating</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Rating</em>' attribute.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Rating
-	 * @see #setRating(Rating)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReviewResult_Rating()
-	 * @model
-	 * @generated
-	 */
-	Rating getRating();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getRating <em>Rating</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rating</em>' attribute.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Rating
-	 * @see #getRating()
-	 * @generated
-	 */
-	void setRating(Rating value);
-
-	/**
-	 * Returns the value of the '<em><b>Reviewer</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reviewer</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reviewer</em>' attribute.
-	 * @see #setReviewer(String)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getReviewResult_Reviewer()
-	 * @model
-	 * @generated
-	 */
-	String getReviewer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult#getReviewer <em>Reviewer</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reviewer</em>' attribute.
-	 * @see #getReviewer()
-	 * @generated
-	 */
-	void setReviewer(String value);
-
-} // ReviewResult
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ScopeItem.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ScopeItem.java
deleted file mode 100644
index 252a01a1..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/ScopeItem.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Scope Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.ScopeItem#getAuthor <em>Author</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getScopeItem()
- * @model
- * @generated
- */
-public interface ScopeItem extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Author</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Author</em>' attribute.
-	 * @see #setAuthor(String)
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#getScopeItem_Author()
-	 * @model
-	 * @generated
-	 */
-	String getAuthor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.review.ScopeItem#getAuthor <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Author</em>' attribute.
-	 * @see #getAuthor()
-	 * @generated
-	 */
-	void setAuthor(String value);
-
-} // ScopeItem
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/PatchImpl.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/PatchImpl.java
deleted file mode 100644
index 15f58c54..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/PatchImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Date;
-
-import org.eclipse.compare.patch.IFilePatch2;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.compare.patch.PatchParser;
-import org.eclipse.compare.patch.ReaderCreator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Patch</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl#getContents <em>Contents</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.PatchImpl#getFileName <em>File Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PatchImpl extends ScopeItemImpl implements Patch {
-	/**
-	 * The default value of the '{@link #getContents() <em>Contents</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTENTS_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getContents() <em>Contents</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContents()
-	 * @generated
-	 * @ordered
-	 */
-	protected String contents = CONTENTS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Date CREATION_DATE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Date creationDate = CREATION_DATE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFileName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILE_NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFileName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fileName = FILE_NAME_EDEFAULT;
-
-	/*
-	 * owner* <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PatchImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ReviewPackage.Literals.PATCH;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getContents() {
-		return contents;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContents(String newContents) {
-		String oldContents = contents;
-		contents = newContents;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.PATCH__CONTENTS, oldContents, contents));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date getCreationDate() {
-		return creationDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreationDate(Date newCreationDate) {
-		Date oldCreationDate = creationDate;
-		creationDate = newCreationDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.PATCH__CREATION_DATE, oldCreationDate, creationDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFileName() {
-		return fileName;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFileName(String newFileName) {
-		String oldFileName = fileName;
-		fileName = newFileName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.PATCH__FILE_NAME, oldFileName, fileName));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public EList<IFilePatch2> parse() {
-		try {
-			IFilePatch2[] patches = PatchParser.parsePatch(new ReaderCreator() {
-				@Override
-				public Reader createReader() throws CoreException {
-					return new InputStreamReader(new ByteArrayInputStream(
-							getContents().getBytes()));
-				}
-			});
-
-			EList<IFilePatch2> list = new BasicEList<IFilePatch2>();
-
-			for (IFilePatch2 patch : patches) {
-				list.add(patch);
-			}
-			return list;
-		} catch (Exception ex) {
-			// TODO
-			ex.printStackTrace();
-			throw new RuntimeException(ex);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ReviewPackage.PATCH__CONTENTS:
-				return getContents();
-			case ReviewPackage.PATCH__CREATION_DATE:
-				return getCreationDate();
-			case ReviewPackage.PATCH__FILE_NAME:
-				return getFileName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ReviewPackage.PATCH__CONTENTS:
-				setContents((String)newValue);
-				return;
-			case ReviewPackage.PATCH__CREATION_DATE:
-				setCreationDate((Date)newValue);
-				return;
-			case ReviewPackage.PATCH__FILE_NAME:
-				setFileName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.PATCH__CONTENTS:
-				setContents(CONTENTS_EDEFAULT);
-				return;
-			case ReviewPackage.PATCH__CREATION_DATE:
-				setCreationDate(CREATION_DATE_EDEFAULT);
-				return;
-			case ReviewPackage.PATCH__FILE_NAME:
-				setFileName(FILE_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.PATCH__CONTENTS:
-				return CONTENTS_EDEFAULT == null ? contents != null : !CONTENTS_EDEFAULT.equals(contents);
-			case ReviewPackage.PATCH__CREATION_DATE:
-				return CREATION_DATE_EDEFAULT == null ? creationDate != null : !CREATION_DATE_EDEFAULT.equals(creationDate);
-			case ReviewPackage.PATCH__FILE_NAME:
-				return FILE_NAME_EDEFAULT == null ? fileName != null : !FILE_NAME_EDEFAULT.equals(fileName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append("" (contents: "");
-		result.append(contents);
-		result.append("", creationDate: "");
-		result.append(creationDate);
-		result.append("", fileName: "");
-		result.append(fileName);
-		result.append(')');
-		return result.toString();
-	}
-
-} // PatchImpl
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewFactoryImpl.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewFactoryImpl.java
deleted file mode 100644
index 0ef56ca2..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewFactoryImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.impl;
-
-import org.eclipse.compare.patch.IFilePatch2;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.mylyn.reviews.core.model.review.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReviewFactoryImpl extends EFactoryImpl implements ReviewFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ReviewFactory init() {
-		try {
-			ReviewFactory theReviewFactory = (ReviewFactory)EPackage.Registry.INSTANCE.getEFactory(""org.eclipse.mylyn.reviews""); 
-			if (theReviewFactory != null) {
-				return theReviewFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ReviewFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ReviewPackage.REVIEW: return createReview();
-			case ReviewPackage.REVIEW_RESULT: return createReviewResult();
-			case ReviewPackage.PATCH: return createPatch();
-			case ReviewPackage.SCOPE_ITEM: return createScopeItem();
-			default:
-				throw new IllegalArgumentException(""The class '"" + eClass.getName() + ""' is not a valid classifier"");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case ReviewPackage.RATING:
-				return createRatingFromString(eDataType, initialValue);
-			case ReviewPackage.IFILE_PATCH2:
-				return createIFilePatch2FromString(eDataType, initialValue);
-			case ReviewPackage.IPROGRESS_MONITOR:
-				return createIProgressMonitorFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException(""The datatype '"" + eDataType.getName() + ""' is not a valid classifier"");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case ReviewPackage.RATING:
-				return convertRatingToString(eDataType, instanceValue);
-			case ReviewPackage.IFILE_PATCH2:
-				return convertIFilePatch2ToString(eDataType, instanceValue);
-			case ReviewPackage.IPROGRESS_MONITOR:
-				return convertIProgressMonitorToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException(""The datatype '"" + eDataType.getName() + ""' is not a valid classifier"");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Review createReview() {
-		ReviewImpl review = new ReviewImpl();
-		return review;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewResult createReviewResult() {
-		ReviewResultImpl reviewResult = new ReviewResultImpl();
-		return reviewResult;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Patch createPatch() {
-		PatchImpl patch = new PatchImpl();
-		return patch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScopeItem createScopeItem() {
-		ScopeItemImpl scopeItem = new ScopeItemImpl();
-		return scopeItem;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rating createRatingFromString(EDataType eDataType, String initialValue) {
-		Rating result = Rating.get(initialValue);
-		if (result == null) throw new IllegalArgumentException(""The value '"" + initialValue + ""' is not a valid enumerator of '"" + eDataType.getName() + ""'"");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRatingToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IFilePatch2 createIFilePatch2FromString(EDataType eDataType, String initialValue) {
-		return (IFilePatch2)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertIFilePatch2ToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IProgressMonitor createIProgressMonitorFromString(EDataType eDataType, String initialValue) {
-		return (IProgressMonitor)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertIProgressMonitorToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewPackage getReviewPackage() {
-		return (ReviewPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ReviewPackage getPackage() {
-		return ReviewPackage.eINSTANCE;
-	}
-
-} //ReviewFactoryImpl
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewImpl.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewImpl.java
deleted file mode 100644
index 4cebc515..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.impl;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Review</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewImpl#getResult <em>Result</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewImpl#getScope <em>Scope</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReviewImpl extends EObjectImpl implements Review {
-	/**
-	 * The cached value of the '{@link #getResult() <em>Result</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResult()
-	 * @generated
-	 * @ordered
-	 */
-	protected ReviewResult result;
-	/**
-	 * The cached value of the '{@link #getScope() <em>Scope</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ScopeItem> scope;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReviewImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ReviewPackage.Literals.REVIEW;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewResult getResult() {
-		if (result != null && result.eIsProxy()) {
-			InternalEObject oldResult = (InternalEObject)result;
-			result = (ReviewResult)eResolveProxy(oldResult);
-			if (result != oldResult) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReviewPackage.REVIEW__RESULT, oldResult, result));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewResult basicGetResult() {
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResult(ReviewResult newResult) {
-		ReviewResult oldResult = result;
-		result = newResult;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.REVIEW__RESULT, oldResult, result));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings(""unchecked"")
-	public EList<ScopeItem> getScope() {
-		if (scope == null) {
-			scope = new EObjectResolvingEList<ScopeItem>(ScopeItem.class, this, ReviewPackage.REVIEW__SCOPE);
-		}
-		return scope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW__RESULT:
-				if (resolve) return getResult();
-				return basicGetResult();
-			case ReviewPackage.REVIEW__SCOPE:
-				return getScope();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings(""unchecked"")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW__RESULT:
-				setResult((ReviewResult)newValue);
-				return;
-			case ReviewPackage.REVIEW__SCOPE:
-				getScope().clear();
-				getScope().addAll((Collection<? extends ScopeItem>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW__RESULT:
-				setResult((ReviewResult)null);
-				return;
-			case ReviewPackage.REVIEW__SCOPE:
-				getScope().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW__RESULT:
-				return result != null;
-			case ReviewPackage.REVIEW__SCOPE:
-				return scope != null && !scope.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ReviewImpl
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewPackageImpl.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewPackageImpl.java
deleted file mode 100644
index 0b2e5332..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewPackageImpl.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.impl;
-
-import org.eclipse.compare.patch.IFilePatch2;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.Rating;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReviewPackageImpl extends EPackageImpl implements ReviewPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reviewEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reviewResultEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass patchEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass scopeItemEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum ratingEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType iFilePatch2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType iProgressMonitorEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ReviewPackageImpl() {
-		super(eNS_URI, ReviewFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link ReviewPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ReviewPackage init() {
-		if (isInited) return (ReviewPackage)EPackage.Registry.INSTANCE.getEPackage(ReviewPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ReviewPackageImpl theReviewPackage = (ReviewPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReviewPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ReviewPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theReviewPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theReviewPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theReviewPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ReviewPackage.eNS_URI, theReviewPackage);
-		return theReviewPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReview() {
-		return reviewEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReview_Result() {
-		return (EReference)reviewEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReview_Scope() {
-		return (EReference)reviewEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReviewResult() {
-		return reviewResultEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getReviewResult_Text() {
-		return (EAttribute)reviewResultEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getReviewResult_Rating() {
-		return (EAttribute)reviewResultEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getReviewResult_Reviewer() {
-		return (EAttribute)reviewResultEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPatch() {
-		return patchEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPatch_Contents() {
-		return (EAttribute)patchEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPatch_CreationDate() {
-		return (EAttribute)patchEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPatch_FileName() {
-		return (EAttribute)patchEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getScopeItem() {
-		return scopeItemEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getScopeItem_Author() {
-		return (EAttribute)scopeItemEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getRating() {
-		return ratingEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getIFilePatch2() {
-		return iFilePatch2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getIProgressMonitor() {
-		return iProgressMonitorEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewFactory getReviewFactory() {
-		return (ReviewFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		reviewEClass = createEClass(REVIEW);
-		createEReference(reviewEClass, REVIEW__RESULT);
-		createEReference(reviewEClass, REVIEW__SCOPE);
-
-		reviewResultEClass = createEClass(REVIEW_RESULT);
-		createEAttribute(reviewResultEClass, REVIEW_RESULT__TEXT);
-		createEAttribute(reviewResultEClass, REVIEW_RESULT__RATING);
-		createEAttribute(reviewResultEClass, REVIEW_RESULT__REVIEWER);
-
-		patchEClass = createEClass(PATCH);
-		createEAttribute(patchEClass, PATCH__CONTENTS);
-		createEAttribute(patchEClass, PATCH__CREATION_DATE);
-		createEAttribute(patchEClass, PATCH__FILE_NAME);
-
-		scopeItemEClass = createEClass(SCOPE_ITEM);
-		createEAttribute(scopeItemEClass, SCOPE_ITEM__AUTHOR);
-
-		// Create enums
-		ratingEEnum = createEEnum(RATING);
-
-		// Create data types
-		iFilePatch2EDataType = createEDataType(IFILE_PATCH2);
-		iProgressMonitorEDataType = createEDataType(IPROGRESS_MONITOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		patchEClass.getESuperTypes().add(this.getScopeItem());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(reviewEClass, Review.class, ""Review"", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getReview_Result(), this.getReviewResult(), null, ""result"", null, 0, 1, Review.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getReview_Scope(), this.getScopeItem(), null, ""scope"", null, 0, -1, Review.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(reviewResultEClass, ReviewResult.class, ""ReviewResult"", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getReviewResult_Text(), ecorePackage.getEString(), ""text"", null, 0, 1, ReviewResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getReviewResult_Rating(), this.getRating(), ""rating"", null, 0, 1, ReviewResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getReviewResult_Reviewer(), ecorePackage.getEString(), ""reviewer"", null, 0, 1, ReviewResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(patchEClass, Patch.class, ""Patch"", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPatch_Contents(), ecorePackage.getEString(), ""contents"", null, 0, 1, Patch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPatch_CreationDate(), ecorePackage.getEDate(), ""creationDate"", null, 0, 1, Patch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPatch_FileName(), ecorePackage.getEString(), ""fileName"", null, 0, 1, Patch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(patchEClass, this.getIFilePatch2(), ""parse"", 0, -1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(scopeItemEClass, ScopeItem.class, ""ScopeItem"", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getScopeItem_Author(), ecorePackage.getEString(), ""author"", null, 0, 1, ScopeItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(ratingEEnum, Rating.class, ""Rating"");
-		addEEnumLiteral(ratingEEnum, Rating.NONE);
-		addEEnumLiteral(ratingEEnum, Rating.PASSED);
-		addEEnumLiteral(ratingEEnum, Rating.WARNING);
-		addEEnumLiteral(ratingEEnum, Rating.FAILED);
-
-		// Initialize data types
-		initEDataType(iFilePatch2EDataType, IFilePatch2.class, ""IFilePatch2"", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(iProgressMonitorEDataType, IProgressMonitor.class, ""IProgressMonitor"", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //ReviewPackageImpl
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewResultImpl.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewResultImpl.java
deleted file mode 100644
index 1619866d..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ReviewResultImpl.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.core.model.review.Rating;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Result</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl#getText <em>Text</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl#getRating <em>Rating</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.ReviewResultImpl#getReviewer <em>Reviewer</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReviewResultImpl extends EObjectImpl implements ReviewResult {
-	/**
-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TEXT_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected String text = TEXT_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRating() <em>Rating</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRating()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Rating RATING_EDEFAULT = Rating.NONE;
-	/**
-	 * The cached value of the '{@link #getRating() <em>Rating</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRating()
-	 * @generated
-	 * @ordered
-	 */
-	protected Rating rating = RATING_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getReviewer() <em>Reviewer</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReviewer()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REVIEWER_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getReviewer() <em>Reviewer</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReviewer()
-	 * @generated
-	 * @ordered
-	 */
-	protected String reviewer = REVIEWER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReviewResultImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ReviewPackage.Literals.REVIEW_RESULT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setText(String newText) {
-		String oldText = text;
-		text = newText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.REVIEW_RESULT__TEXT, oldText, text));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rating getRating() {
-		return rating;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRating(Rating newRating) {
-		Rating oldRating = rating;
-		rating = newRating == null ? RATING_EDEFAULT : newRating;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.REVIEW_RESULT__RATING, oldRating, rating));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getReviewer() {
-		return reviewer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReviewer(String newReviewer) {
-		String oldReviewer = reviewer;
-		reviewer = newReviewer;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.REVIEW_RESULT__REVIEWER, oldReviewer, reviewer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW_RESULT__TEXT:
-				return getText();
-			case ReviewPackage.REVIEW_RESULT__RATING:
-				return getRating();
-			case ReviewPackage.REVIEW_RESULT__REVIEWER:
-				return getReviewer();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW_RESULT__TEXT:
-				setText((String)newValue);
-				return;
-			case ReviewPackage.REVIEW_RESULT__RATING:
-				setRating((Rating)newValue);
-				return;
-			case ReviewPackage.REVIEW_RESULT__REVIEWER:
-				setReviewer((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW_RESULT__TEXT:
-				setText(TEXT_EDEFAULT);
-				return;
-			case ReviewPackage.REVIEW_RESULT__RATING:
-				setRating(RATING_EDEFAULT);
-				return;
-			case ReviewPackage.REVIEW_RESULT__REVIEWER:
-				setReviewer(REVIEWER_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.REVIEW_RESULT__TEXT:
-				return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
-			case ReviewPackage.REVIEW_RESULT__RATING:
-				return rating != RATING_EDEFAULT;
-			case ReviewPackage.REVIEW_RESULT__REVIEWER:
-				return REVIEWER_EDEFAULT == null ? reviewer != null : !REVIEWER_EDEFAULT.equals(reviewer);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append("" (text: "");
-		result.append(text);
-		result.append("", rating: "");
-		result.append(rating);
-		result.append("", reviewer: "");
-		result.append(reviewer);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ReviewResultImpl
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ScopeItemImpl.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ScopeItemImpl.java
deleted file mode 100644
index cad5f6f7..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/impl/ScopeItemImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Scope Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.core.model.review.impl.ScopeItemImpl#getAuthor <em>Author</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ScopeItemImpl extends EObjectImpl implements ScopeItem {
-	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHOR_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String author = AUTHOR_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ScopeItemImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ReviewPackage.Literals.SCOPE_ITEM;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthor() {
-		return author;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthor(String newAuthor) {
-		String oldAuthor = author;
-		author = newAuthor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReviewPackage.SCOPE_ITEM__AUTHOR, oldAuthor, author));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ReviewPackage.SCOPE_ITEM__AUTHOR:
-				return getAuthor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ReviewPackage.SCOPE_ITEM__AUTHOR:
-				setAuthor((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.SCOPE_ITEM__AUTHOR:
-				setAuthor(AUTHOR_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ReviewPackage.SCOPE_ITEM__AUTHOR:
-				return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append("" (author: "");
-		result.append(author);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ScopeItemImpl
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/util/ReviewAdapterFactory.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/util/ReviewAdapterFactory.java
deleted file mode 100644
index 73e096eb..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/util/ReviewAdapterFactory.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.mylyn.reviews.core.model.review.*;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-
-/**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
- * an adapter <code>createXXX</code> method for each class of the model. <!--
- * end-user-doc -->
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage
- * @generated
- */
-public class ReviewAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ReviewPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public ReviewAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ReviewPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
-	 * the object is either the model's package or is an instance object of the
-	 * model. <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ReviewSwitch<Adapter> modelSwitch = new ReviewSwitch<Adapter>() {
-			@Override
-			public Adapter caseReview(Review object) {
-				return createReviewAdapter();
-			}
-			@Override
-			public Adapter caseReviewResult(ReviewResult object) {
-				return createReviewResultAdapter();
-			}
-			@Override
-			public Adapter casePatch(Patch object) {
-				return createPatchAdapter();
-			}
-			@Override
-			public Adapter caseScopeItem(ScopeItem object) {
-				return createScopeItemAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.mylyn.reviews.core.model.review.Review
-	 * <em>Review</em>}'. <!-- begin-user-doc --> This default implementation
-	 * returns null so that we can easily ignore cases; it's useful to ignore a
-	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Review
-	 * @generated
-	 */
-	public Adapter createReviewAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.mylyn.reviews.core.model.review.ReviewResult
-	 * <em>Result</em>}'. <!-- begin-user-doc --> This default implementation
-	 * returns null so that we can easily ignore cases; it's useful to ignore a
-	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ReviewResult
-	 * @generated
-	 */
-	public Adapter createReviewResultAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.review.Patch <em>Patch</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so
-	 * that we can easily ignore cases; it's useful to ignore a case when
-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.Patch
-	 * @generated
-	 */
-	public Adapter createPatchAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.review.ScopeItem <em>Scope Item</em>}'.
-	 * <!-- begin-user-doc --> This default
-	 * implementation returns null so that we can easily ignore cases; it's
-	 * useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.core.model.review.ScopeItem
-	 * @generated
-	 */
-	public Adapter createScopeItemAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc --> This
-	 * default implementation returns null. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // ReviewAdapterFactory
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/util/ReviewSwitch.java b/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/util/ReviewSwitch.java
deleted file mode 100644
index 3ab3388d..00000000
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/review/util/ReviewSwitch.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.core.model.review.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.mylyn.reviews.core.model.review.*;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewPackage;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewResult;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object and proceeding up the
- * inheritance hierarchy until a non-null result is returned, which is the
- * result of the switch. <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.core.model.review.ReviewPackage
- * @generated
- */
-public class ReviewSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ReviewPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public ReviewSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ReviewPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ReviewPackage.REVIEW: {
-				Review review = (Review)theEObject;
-				T result = caseReview(review);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReviewPackage.REVIEW_RESULT: {
-				ReviewResult reviewResult = (ReviewResult)theEObject;
-				T result = caseReviewResult(reviewResult);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReviewPackage.PATCH: {
-				Patch patch = (Patch)theEObject;
-				T result = casePatch(patch);
-				if (result == null) result = caseScopeItem(patch);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReviewPackage.SCOPE_ITEM: {
-				ScopeItem scopeItem = (ScopeItem)theEObject;
-				T result = caseScopeItem(scopeItem);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review</em>'.
-	 * <!-- begin-user-doc --> This implementation returns
-	 * null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReview(Review object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Result</em>'.
-	 * <!-- begin-user-doc --> This implementation returns
-	 * null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Result</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReviewResult(ReviewResult object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Patch</em>'.
-	 * <!-- begin-user-doc --> This implementation returns
-	 * null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Patch</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePatch(Patch object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Scope Item</em>'.
-	 * <!-- begin-user-doc --> This implementation returns
-	 * null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Scope Item</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseScopeItem(ScopeItem object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc --> This implementation returns
-	 * null; returning a non-null result will terminate the switch, but this is
-	 * the last case anyway. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // ReviewSwitch
diff --git a/tbr/org.eclipse.mylyn.reviews.core/.classpath b/tbr/org.eclipse.mylyn.reviews.tasks.core/.classpath
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.core/.classpath
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/.classpath
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/.project b/tbr/org.eclipse.mylyn.reviews.tasks.core/.project
similarity index 94%
rename from tbr/org.eclipse.mylyn.reviews.ui/.project
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/.project
index 8d039bc9..d83a9137 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/.project
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/.project
@@ -1,6 +1,6 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <projectDescription>
-	<name>org.eclipse.mylyn.reviews.ui</name>
+	<name>org.eclipse.mylyn.reviews.tasks.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..b177a01b
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Mylyn Reviews Core (Incubation)
+Bundle-SymbolicName: org.eclipse.mylyn.reviews.tasks.core;singleton:=true
+Bundle-Version: 0.0.1.qualifier
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.edit;bundle-version=""2.5.0"",
+ org.eclipse.team.core;bundle-version=""3.5.0"",
+ org.eclipse.core.resources;bundle-version=""3.5.1"",
+ org.eclipse.mylyn.tasks.core;bundle-version=""3.3.0"",
+ org.eclipse.compare;bundle-version=""3.5.0"",
+ org.eclipse.mylyn.reviews.tasks.dsl;bundle-version=""0.0.1"",
+ org.eclipse.xtext;bundle-version=""1.0.1"",
+ org.eclipse.swt;bundle-version=""3.6.1""
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.mylyn.reviews.tasks.core,
+ org.eclipse.mylyn.reviews.tasks.core.internal;x-friends:=""org.eclipse.mylyn.reviews.tasks.ui""
diff --git a/tbr/org.eclipse.mylyn.reviews.core/about.html b/tbr/org.eclipse.mylyn.reviews.tasks.core/about.html
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.core/about.html
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/about.html
diff --git a/tbr/org.eclipse.mylyn.reviews.core/build.properties b/tbr/org.eclipse.mylyn.reviews.tasks.core/build.properties
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.core/build.properties
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/build.properties
diff --git a/tbr/org.eclipse.mylyn.reviews.core/plugin.properties b/tbr/org.eclipse.mylyn.reviews.tasks.core/plugin.properties
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.core/plugin.properties
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/plugin.properties
diff --git a/tbr/org.eclipse.mylyn.reviews.core/plugin.xml b/tbr/org.eclipse.mylyn.reviews.tasks.core/plugin.xml
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.core/plugin.xml
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/plugin.xml
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/Attachment.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/Attachment.java
new file mode 100644
index 00000000..2965605e
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/Attachment.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+/**
+ * 
+ * @author mattk
+ * 
+ */
+public class Attachment {
+
+	private String fileName;
+	private String author;
+	private String date;
+	private String url;
+	private boolean isPatch;
+	private ITaskProperties task;
+
+	public Attachment(ITaskProperties task, String fileName, String author,
+			String date, boolean isPatch, String url) {
+		this.task = task;
+		this.fileName = fileName;
+		this.author = author;
+		this.date = date;
+		this.isPatch = isPatch;
+		this.url = url;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public String getDate() {
+		return date;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public ITaskProperties getTask() {
+		return task;
+	}
+
+	public boolean isPatch() {
+		return isPatch;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/IPatchCreator.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/IReviewFile.java
similarity index 65%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/IPatchCreator.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/IReviewFile.java
index 390692ed..979d531d 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/IPatchCreator.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/IReviewFile.java
@@ -8,24 +8,19 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
+package org.eclipse.mylyn.reviews.tasks.core;
 
-import java.util.Date;
+import org.eclipse.compare.structuremergeviewer.ICompareInput;
 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-
-/*
- * @author Kilian Matt
+/**
+ * @author mattk
+ *
  */
-public interface IPatchCreator {
-
-	public abstract Patch create() throws CoreException;
-
-	public abstract String getFileName();
-
-	public abstract String getAuthor();
+public interface IReviewFile {
 
-	public abstract Date getCreationDate();
+	String getFileName();
+	boolean isNewFile();
+	boolean canReview();
+	ICompareInput getCompareInput();
 
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/IReviewMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/IReviewMapper.java
new file mode 100644
index 00000000..b1b5ff75
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/IReviewMapper.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * 
+ * @author mattk
+ * 
+ */
+public interface IReviewMapper {
+
+	void mapResultToTask(ReviewResult res, ITaskProperties taskProperties);
+
+	void mapScopeToTask(ReviewScope scope, ITaskProperties taskProperties);
+
+	List<ReviewResult> mapTaskToResults(ITaskProperties taskProperties);
+
+	ReviewScope mapTaskToScope(ITaskProperties properties) throws CoreException;
+
+	ReviewResult mapCurrentReviewResult(ITaskProperties taskProperties);
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ITaskProperties.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ITaskProperties.java
new file mode 100644
index 00000000..c8267549
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ITaskProperties.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public interface ITaskProperties {
+
+	String getDescription();
+
+	String getAssignedTo();
+
+	List<TaskComment> getComments();
+
+	List<Attachment> getAttachments();
+
+	ITaskProperties loadFor(String taskId) throws CoreException;
+
+	String getTaskId();
+
+	String getNewCommentText();
+
+	void setNewCommentText(String comment);
+
+	void setDescription(String description);
+
+	void setSummary(String summary);
+
+	void setAssignedTo(String assignee);
+
+	String getRepositoryUrl();
+
+	String getReporter();
+
+}
+
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/PatchScopeItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/PatchScopeItem.java
new file mode 100644
index 00000000..e81f3b41
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/PatchScopeItem.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.compare.patch.IFilePatch2;
+import org.eclipse.compare.patch.PatchParser;
+import org.eclipse.compare.patch.ReaderCreator;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.mylyn.reviews.tasks.core.internal.PatchReviewFile;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewConstants;
+
+/**
+ * 
+ * @author mattk
+ * 
+ */
+public class PatchScopeItem implements ReviewScopeItem {
+
+	private Attachment attachment;
+
+	public PatchScopeItem(Attachment attachment) {
+		this.attachment = attachment;
+	}
+
+	public Attachment getAttachment() {
+		return attachment;
+	}
+
+	private ReaderCreator getPatch() {
+		return new ReaderCreator() {
+
+			@Override
+			public Reader createReader() throws CoreException {
+				try {
+					System.err.println(attachment.getUrl());
+					return new InputStreamReader(
+							new URL(attachment.getUrl()).openStream());
+				} catch (Exception e) {
+					throw new CoreException(new Status(IStatus.ERROR,
+							ReviewConstants.PLUGIN_ID, e.getMessage()));
+				}
+
+			}
+		};
+	}
+
+	@Override
+	public List<IReviewFile> getReviewFiles(
+			NullProgressMonitor nullProgressMonitor) throws CoreException {
+		IFilePatch2[] parsedPatch = PatchParser.parsePatch(getPatch());
+		List<IReviewFile> files = new ArrayList<IReviewFile>();
+		for (IFilePatch2 filePatch : parsedPatch) {
+			files.add(new PatchReviewFile(filePatch));
+		}
+		return files;
+	}
+
+	@Override
+	public String getDescription() {
+		return ""patch"";
+	}
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSubmitHandler.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/Rating.java
similarity index 74%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSubmitHandler.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/Rating.java
index f037b64a..14ba4129 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSubmitHandler.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/Rating.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,13 +8,19 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
+package org.eclipse.mylyn.reviews.tasks.core;
 
-/*
- * @author Kilian Matt
+/**
+ * @author mattk
+ *
  */
-public interface ReviewSubmitHandler {
-
-	void doSubmit(ReviewTaskEditorInput editorInput);
-
+public enum Rating {
+	TODO,
+	PASSED,
+	WARNING,
+	FAIL;
+	
+	public int getPriority() {
+		return this.ordinal();
+	}
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ResourceScopeItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ResourceScopeItem.java
new file mode 100644
index 00000000..55ec2e6a
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ResourceScopeItem.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.compare.IStreamContentAccessor;
+import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.structuremergeviewer.DiffNode;
+import org.eclipse.compare.structuremergeviewer.Differencer;
+import org.eclipse.compare.structuremergeviewer.ICompareInput;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewConstants;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author mattk
+ *
+ */
+public class ResourceScopeItem implements ReviewScopeItem {
+	private Attachment attachment;
+
+	public ResourceScopeItem(Attachment attachment) {
+		this.attachment = attachment;
+	}
+
+	public Attachment getAttachment() {
+		return attachment;
+	}
+
+	@Override
+	public List<IReviewFile> getReviewFiles(NullProgressMonitor monitor)
+			throws CoreException {
+
+		return Arrays.asList((IReviewFile) new ResourceReviewFile(attachment
+				.getFileName(), attachment.getUrl()));
+	}
+
+	private static class ResourceReviewFile implements IReviewFile {
+
+		private ICompareInput compareInput;
+		private String fileName;
+		private String url;
+
+		public ResourceReviewFile(String fileName, String url) {
+			this.fileName = fileName;
+			this.url = url;
+		}
+
+		public ICompareInput getCompareInput() {
+			if (compareInput == null) {
+				ICompareInput ci = new DiffNode(Differencer.CHANGE, null,
+						new CompareItem(fileName) {
+							@Override
+							public InputStream getContents()
+									throws CoreException {
+								return new ByteArrayInputStream(new byte[0]);
+							}
+						}, new CompareItem(fileName) {
+							@Override
+							public InputStream getContents()
+									throws CoreException {
+								try {
+									return new URL(url)
+											.openStream();
+								} catch (Exception e) {
+									throw new CoreException(new Status(
+											IStatus.ERROR,
+											ReviewConstants.PLUGIN_ID, e
+													.getMessage()));
+								}
+							}
+						});
+				compareInput = ci;
+			}
+			return compareInput;
+
+		}
+
+		@Override
+		public String getFileName() {
+			return fileName;
+		}
+
+		@Override
+		public boolean isNewFile() {
+			return true;
+		}
+
+		@Override
+		public boolean canReview() {
+			return true;
+
+		}
+
+		private static abstract class CompareItem implements IStreamContentAccessor,
+				ITypedElement {
+
+			private String filename;
+
+			public CompareItem(String filename) {
+				this.filename = filename;
+			}
+
+			public abstract InputStream getContents() throws CoreException;
+
+			public Image getImage() {
+				return null;
+			}
+
+			public String getName() {
+				return filename;
+			}
+
+			public String getType() {
+				return ITypedElement.TEXT_TYPE;
+			}
+		}
+
+	}
+
+	@Override
+	public String getDescription() {
+		return ""resource"";
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewResult.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewResult.java
new file mode 100644
index 00000000..723bb8e8
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewResult.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Date;
+
+/**
+ * @author mattk
+ *
+ */
+public class ReviewResult {
+	private String reviewer;
+	private Rating rating;
+	private String comment;
+	private Date date;
+	private final PropertyChangeSupport changeSupport = new PropertyChangeSupport(
+			this);
+
+	public void addPropertyChangeListener(String propertyName,
+			PropertyChangeListener listener) {
+		changeSupport.addPropertyChangeListener(propertyName, listener);
+	}
+
+	public void removePropertyChangeListener(String propertyName,
+			PropertyChangeListener listener) {
+		changeSupport.removePropertyChangeListener(propertyName, listener);
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		Date old = this.date;
+		this.date = date;
+		changeSupport.firePropertyChange(""date"", old, date);
+	}
+
+	public String getReviewer() {
+		return reviewer;
+	}
+
+	public void setReviewer(String reviewer) {
+		String old = this.reviewer;
+		this.reviewer = reviewer;
+		changeSupport.firePropertyChange(""reviewer"", old, reviewer);
+	}
+
+	public Rating getRating() {
+		return rating;
+	}
+
+	public void setRating(Rating rating) {
+		Rating old = this.rating;
+		this.rating = rating;
+		changeSupport.firePropertyChange(""rating"", old, rating);
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		String old = this.comment;
+		this.comment = comment;
+		changeSupport.firePropertyChange(""comment"", old, comment);
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewScope.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewScope.java
new file mode 100644
index 00000000..d9a42225
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewScope.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author mattk
+ *
+ */
+public class ReviewScope {
+	private List<ReviewScopeItem> items = new ArrayList<ReviewScopeItem>();
+	private String creator;
+
+	public List<ReviewScopeItem> getItems() {
+		return Collections.unmodifiableList( items );
+	}
+	public void addScope(ReviewScopeItem item)  {
+		this.items.add(item);
+	}
+	public String getCreator() {
+		return creator;
+	}
+	public void setCreator(String creator) {
+		this.creator=creator;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewScopeItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewScopeItem.java
new file mode 100644
index 00000000..62aafced
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/ReviewScopeItem.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+/**
+ * @author mattk
+ *
+ */
+public interface ReviewScopeItem {
+
+	List<IReviewFile> getReviewFiles(NullProgressMonitor monitor)throws CoreException;
+
+	String getDescription();
+	
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/TaskComment.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/TaskComment.java
new file mode 100644
index 00000000..b58b5fcd
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/TaskComment.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author mattk
+ * 
+ */
+public class TaskComment {
+	private String author;
+	private String text;
+	private Date date;
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/AbstractTreeNode.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/AbstractTreeNode.java
new file mode 100644
index 00000000..3d467515
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/AbstractTreeNode.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+
+/**
+ * @author mattk
+ *
+ */
+public abstract class AbstractTreeNode implements ITreeNode {
+	private ITreeNode parent;
+	private List<ITreeNode> children=new ArrayList<ITreeNode>();
+	private ITaskProperties task;
+
+	protected AbstractTreeNode(ITaskProperties task) {
+		this.task=task;
+	}
+
+	@Override
+	public List<ITreeNode> getChildren() {
+		return Collections.unmodifiableList(children);
+	}
+
+	@Override
+	public ITreeNode getParent() {
+		return parent;
+	}
+
+	public void addChildren(ITreeNode child) {
+		this.children.add(child);
+		child.setParent(this);
+	}
+
+	@Override
+	public void setParent(ITreeNode parent) {
+		this.parent = parent;
+	}
+
+	@Override
+	public String getTaskId() {
+		return task!=null? task.getTaskId():null;
+	}
+
+	@Override
+	public ITaskProperties getTask() {
+		return task;
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ITreeNode.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ITreeNode.java
new file mode 100644
index 00000000..b653b810
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ITreeNode.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.Rating;
+
+/**
+ * @author mattk
+ *
+ */
+public interface ITreeNode {
+	List<ITreeNode> getChildren();
+
+	ITreeNode getParent();
+
+	void setParent(ITreeNode parent);
+
+	String getDescription();
+
+	Rating getResult();
+
+	String getTaskId();
+
+	ITaskProperties getTask();
+
+	String getPerson() ;
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CompareItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/PatchCompareItem.java
similarity index 87%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CompareItem.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/PatchCompareItem.java
index 9c50c24c..8a9be0eb 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CompareItem.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/PatchCompareItem.java
@@ -8,7 +8,8 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
+
+package org.eclipse.mylyn.reviews.tasks.core.internal;
 
 import java.io.InputStream;
 
@@ -18,11 +19,10 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.graphics.Image;
 
-// TODO move to core?
-/*
+/**
  * @author Kilian Matt
  */
-public class CompareItem implements IStreamContentAccessor, ITypedElement {
+public class PatchCompareItem implements IStreamContentAccessor, ITypedElement {
 	public enum Kind {
 		ORIGINAL, PATCHED
 	};
@@ -31,7 +31,7 @@ public enum Kind {
 	private Kind kind;
 	private String filename;
 
-	public CompareItem(IFilePatchResult result, Kind kind, String filename) {
+	public PatchCompareItem(IFilePatchResult result, Kind kind, String filename) {
 		this.result = result;
 		this.kind = kind;
 		this.filename = filename;
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewDiffModel.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/PatchReviewFile.java
similarity index 82%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewDiffModel.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/PatchReviewFile.java
index 7626eeb5..6f12ea48 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewDiffModel.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/PatchReviewFile.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
+package org.eclipse.mylyn.reviews.tasks.core.internal;
 
 import java.io.CharArrayReader;
 import java.io.Reader;
@@ -25,42 +25,31 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.reviews.core.ITargetPathStrategy;
-import org.eclipse.mylyn.reviews.core.ReviewsUtil;
-
+import org.eclipse.mylyn.reviews.tasks.core.IReviewFile;
+import org.eclipse.mylyn.reviews.tasks.core.patch.ITargetPathStrategy;
 /**
- * @author Kilian Matt
+ * @author mattk
+ *
  */
-public class ReviewDiffModel {
+public class PatchReviewFile implements IReviewFile {
 
+	private ICompareInput compareInput;
 	private IFilePatch2 patch;
+	private IFilePatchResult compareEditorInput;
 	private PatchConfiguration configuration;
-	private ICompareInput compareInput;
-	private IFilePatchResult compareEditorInput = null;
-
-	public ReviewDiffModel(IFilePatch2 currentPatch,
-			PatchConfiguration configuration) {
-		patch = currentPatch;
-		this.configuration = configuration;
-	}
-
-	@Override
-	public String toString() {
-		return getFileName();
-	}
 
-	public String getFileName() {
-		String string = patch.getTargetPath(configuration).lastSegment();
-		return string;
+	public PatchReviewFile(IFilePatch2 filePatch) {
+		this.patch = filePatch;
+		configuration = new PatchConfiguration();
 	}
 
 	public ICompareInput getCompareInput() {
 		if (compareInput == null) {
 			IFilePatchResult patchResult = getCompareEditorInput();
 			ICompareInput ci = new DiffNode(Differencer.CHANGE, null,
-					new CompareItem(patchResult, CompareItem.Kind.ORIGINAL,
-							toString()), new CompareItem(patchResult,
-							CompareItem.Kind.PATCHED, toString()));
+					new PatchCompareItem(patchResult, PatchCompareItem.Kind.ORIGINAL,
+							toString()), new PatchCompareItem(patchResult,
+							PatchCompareItem.Kind.PATCHED, toString()));
 			compareInput = ci;
 		}
 		return compareInput;
@@ -113,6 +102,22 @@ private boolean patchAddsFile() {
 		return true;
 	}
 
+	@Override
+	public String getFileName() {
+		return patch.getTargetPath(configuration).lastSegment();
+	}
+
+	@Override
+	public boolean isNewFile() {
+		return patchAddsFile();
+	}
+
+	@Override
+	public boolean canReview() {
+		return sourceFileExists() || patchAddsFile();
+
+	}
+
 	public boolean sourceFileExists() {
 		IPath targetPath = patch.getTargetPath(configuration);
 
@@ -125,12 +130,5 @@ public boolean sourceFileExists() {
 		}
 		return false;
 	}
-	public boolean canReview() {
-		return sourceFileExists() || patchAddsFile();
-	}
-
-	public boolean isNewFile() {
-		return patchAddsFile();
-	}
 
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewConstants.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewConstants.java
similarity index 79%
rename from tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewConstants.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewConstants.java
index 704be905..0a0aeca2 100644
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewConstants.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewConstants.java
@@ -8,18 +8,19 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
+package org.eclipse.mylyn.reviews.tasks.core.internal;
 
 /**
  * @author Kilian Matt
  */ 
 public class ReviewConstants {
 
-	public static final String REVIEW_DATA_CONTAINER = ""review-data.zip"";
-
-	public static final String REVIEW_DATA_FILE = ""reviews-data.xml"";
-
 	public static final String ATTR_CACHED_REVIEW = ""review"";
 	
 	public static final String ATTR_REVIEW_FLAG = ""isReview"";
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = ""org.eclipse.mylyn.reviews.core""; //$NON-NLS-1$
+
+	public static final String REVIEW_MARKER = ""[review]"";
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewResultNode.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewResultNode.java
new file mode 100644
index 00000000..dcc1da41
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewResultNode.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import org.eclipse.mylyn.reviews.tasks.core.Rating;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewResult;
+/**
+ * @author mattk
+ *
+ */
+public class ReviewResultNode extends AbstractTreeNode {
+
+	private ReviewResult result;
+
+	public ReviewResultNode(ReviewResult result) {
+		super(null);
+		this.result = result;
+	}
+
+	public String getDescription() {
+		return result.getComment();
+	}
+
+	@Override
+	public Rating getResult() {
+		return result.getRating();
+	}
+
+	@Override
+	public String getPerson() {
+		return result.getReviewer();
+	}
+	
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java
new file mode 100644
index 00000000..ba77e9cb
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.Rating;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewResult;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScopeItem;
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewScopeNode extends AbstractTreeNode {
+
+	private ReviewScope scope;
+	private String description;
+	private List<ReviewResult> results;
+
+	public ReviewScopeNode(ITaskProperties task, ReviewScope scope, List<ReviewResult> results) {
+		super(task);
+		this.scope = scope;
+		this.results = results;
+		for (ReviewResult result : results) {
+			addChildren(new ReviewResultNode(result));
+		}
+	}
+
+	public String getDescription() {
+		if (description == null) {
+			description = convertScopeToDescription();
+		}
+		return description;
+	}
+
+	private String convertScopeToDescription() {
+		StringBuilder sb = new StringBuilder();
+		Map<String, AtomicInteger> counts = new TreeMap<String, AtomicInteger>();
+		for (ReviewScopeItem item : scope.getItems()) {
+			String key = item.getDescription();
+			if (!counts.containsKey(key)) {
+				counts.put(key, new AtomicInteger());
+			}
+			counts.get(key).incrementAndGet();
+		}
+		boolean isFirstElement = true;
+		for (String type : counts.keySet()) {
+			if (isFirstElement) {
+				isFirstElement = false;
+			} else {
+				sb.append("", "");
+			}
+
+			int count = counts.get(type).get();
+			sb.append(count);
+			sb.append("" "");
+			sb.append(type);
+		}
+		return sb.toString();
+	}
+
+	@Override
+	public Rating getResult() {
+		Rating rating = null;
+		for (ReviewResult res : results) {
+			if (rating == null
+					|| res.getRating().getPriority() > rating.getPriority()) {
+				rating = res.getRating();
+			}
+		}
+		return rating;
+	}
+
+	@Override
+	public String getPerson() {
+		// TODO
+		return scope.getCreator();
+	}
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
new file mode 100644
index 00000000..ec559bf7
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.mylyn.reviews.tasks.core.Attachment;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.PatchScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.Rating;
+import org.eclipse.mylyn.reviews.tasks.core.ResourceScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.TaskComment;
+import org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr.ReviewDslParser;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.AttachmentSource;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.PatchDef;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ResourceDef;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ResultEnum;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslFactory;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult;
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.Source;
+import org.eclipse.xtext.parser.IParseResult;
+import org.eclipse.xtext.parsetree.reconstr.Serializer;
+/**
+ * @author mattk
+ *
+ */
+public class ReviewTaskMapper implements IReviewMapper {
+	private ReviewDslParser parser;
+	private Serializer serializer;
+
+	public ReviewTaskMapper(ReviewDslParser parser, Serializer serializer) {
+		this.parser = parser;
+		this.serializer = serializer;
+	}
+
+	private org.eclipse.mylyn.reviews.tasks.core.ReviewResult mapResult(
+			org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult parsed,
+			TaskComment comment) {
+		if (parsed == null)
+			return null;
+
+		org.eclipse.mylyn.reviews.tasks.core.ReviewResult result = new org.eclipse.mylyn.reviews.tasks.core.ReviewResult();
+		result.setReviewer(comment.getAuthor());
+		result.setDate(comment.getDate());
+		result.setRating(mapRating(parsed.getResult()));
+		result.setComment(comment.getText());
+		return result;
+	}
+
+	private Rating mapRating(ResultEnum result) {
+		switch (result) {
+		case PASSED:
+			return Rating.PASSED;
+		case FAILED:
+			return Rating.FAIL;
+		case WARNING:
+			return Rating.WARNING;
+		case TODO:
+			return Rating.TODO;
+		}
+		throw new IllegalArgumentException();
+	}
+
+	@Override
+	public ReviewScope mapTaskToScope(ITaskProperties properties)
+			throws CoreException {
+		Assert.isNotNull(properties);
+		IParseResult parsed = parser.doParse(properties.getDescription());
+
+		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope = (org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope) parsed
+				.getRootASTElement();
+		return mapReviewScope(properties, scope);
+	}
+
+	private ReviewScope mapReviewScope(ITaskProperties properties,
+			org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope)
+			throws CoreException {
+		if (scope == null)
+			return null;
+
+		ReviewScope mappedScope = new ReviewScope();
+		mappedScope.setCreator(properties.getReporter());
+		for (org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScopeItem s : scope
+				.getScope()) {
+			if (s instanceof PatchDef) {
+				PatchScopeItem item = mapPatchDef(properties, mappedScope, (PatchDef) s);
+				mappedScope.addScope(item);
+			} else if (s instanceof ResourceDef) {
+				ResourceDef res = (ResourceDef) s;
+				ResourceScopeItem item = mapResourceDef(properties, res);
+				mappedScope.addScope(item);
+			}
+		}
+		return mappedScope;
+	}
+
+	private ResourceScopeItem mapResourceDef(ITaskProperties properties,
+			ResourceDef res) throws CoreException {
+		Source source = res.getSource();
+		Attachment att = null;
+		if (source instanceof AttachmentSource) {
+			att = parseAttachmenSource(properties, source);
+		}
+		return new ResourceScopeItem(att);
+	}
+
+	private PatchScopeItem mapPatchDef(ITaskProperties properties,
+			ReviewScope mappedScope, PatchDef patch) throws CoreException {
+		Source source = patch.getSource();
+		Attachment att = null;
+		if (source instanceof AttachmentSource) {
+			att = parseAttachmenSource(properties, source);
+		}
+		return new PatchScopeItem(att);
+	}
+
+	private Attachment parseAttachmenSource(ITaskProperties properties,
+			Source source) throws CoreException {
+		AttachmentSource attachment = (AttachmentSource) source;
+
+		Attachment att = ReviewsUtil.findAttachment(attachment.getFilename(),
+				attachment.getAuthor(), attachment.getCreatedDate(),
+				properties.loadFor(attachment.getTaskId()));
+		return att;
+	}
+
+	@Override
+	public void mapScopeToTask(ReviewScope scope, ITaskProperties taskProperties) {
+		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope2 = mapScope(scope);
+
+		taskProperties.setDescription(serializer.serialize(scope2));
+	}
+
+	private org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope mapScope(
+			ReviewScope scope) {
+		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope2 = ReviewDslFactory.eINSTANCE
+				.createReviewScope();
+		for (ReviewScopeItem item : scope.getItems()) {
+			scope2.getScope().add(mapScopeItem(item));
+		}
+		return scope2;
+	}
+
+	private org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScopeItem mapScopeItem(
+			ReviewScopeItem item) {
+		if (item instanceof PatchScopeItem) {
+			PatchScopeItem patchItem = (PatchScopeItem) item;
+			PatchDef patch = ReviewDslFactory.eINSTANCE.createPatchDef();
+			Attachment attachment = patchItem.getAttachment();
+			AttachmentSource source = mapAttachment(attachment);
+			patch.setSource(source);
+
+			return patch;
+		} else if (item instanceof ResourceScopeItem) {
+			ResourceScopeItem resourceItem = (ResourceScopeItem) item;
+			ResourceDef resource = ReviewDslFactory.eINSTANCE
+					.createResourceDef();
+			Attachment attachment = resourceItem.getAttachment();
+			AttachmentSource source = mapAttachment(attachment);
+			resource.setSource(source);
+			return resource;
+		}
+		System.err.println(""would return null"");
+		return null;
+	}
+
+	private AttachmentSource mapAttachment(Attachment attachment) {
+		AttachmentSource source = ReviewDslFactory.eINSTANCE
+				.createAttachmentSource();
+		source.setAuthor(attachment.getAuthor());
+		source.setCreatedDate(attachment.getDate());
+		source.setFilename(attachment.getFileName());
+		source.setTaskId(attachment.getTask().getTaskId());
+		return source;
+	}
+
+	@Override
+	public void mapResultToTask(
+			org.eclipse.mylyn.reviews.tasks.core.ReviewResult res,
+			ITaskProperties taskProperties) {
+		ReviewResult result = ReviewDslFactory.eINSTANCE.createReviewResult();
+		ResultEnum rating = ResultEnum.WARNING;
+		switch (res.getRating()) {
+		case FAIL:
+			rating = ResultEnum.FAILED;
+			break;
+		case PASSED:
+			rating = ResultEnum.PASSED;
+			break;
+		case TODO:
+			rating = ResultEnum.TODO;
+			break;
+		case WARNING:
+			rating = ResultEnum.WARNING;
+			break;
+		}
+		result.setResult(rating);
+		result.setComment(res.getComment());
+
+		String resultAsText = serializer.serialize(result);
+		System.err.println(resultAsText);
+		taskProperties.setNewCommentText(resultAsText);
+	}
+
+	@Override
+	public org.eclipse.mylyn.reviews.tasks.core.ReviewResult mapCurrentReviewResult(
+			ITaskProperties taskProperties) {
+		Assert.isNotNull(taskProperties);
+		if (taskProperties.getNewCommentText() == null)
+			return null;
+		IParseResult parsed = parser
+				.doParse(taskProperties.getNewCommentText());
+
+		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult res = (org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult) parsed
+				.getRootASTElement();
+		org.eclipse.mylyn.reviews.tasks.core.ReviewResult result = new org.eclipse.mylyn.reviews.tasks.core.ReviewResult();
+		if (res == null)
+			return null;
+		result.setComment(res.getComment());
+		result.setRating(mapRating(res.getResult()));
+		// FIXME author is current
+		// result.setReviewer()
+		// result.setDate()
+		return result;
+	}
+
+	@Override
+	public List<org.eclipse.mylyn.reviews.tasks.core.ReviewResult> mapTaskToResults(
+			ITaskProperties taskProperties) {
+		List<org.eclipse.mylyn.reviews.tasks.core.ReviewResult> results = new ArrayList<org.eclipse.mylyn.reviews.tasks.core.ReviewResult>();
+		for (TaskComment comment : taskProperties.getComments()) {
+			IParseResult parsed = parser.doParse(comment.getText());
+			if (parsed.getRootASTElement() != null) {
+				results.add(mapResult(
+						(org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult) parsed
+								.getRootASTElement(), comment));
+			}
+		}
+		return results;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java
new file mode 100644
index 00000000..f0096105
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.mylyn.reviews.tasks.core.Attachment;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewResult;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
+import org.eclipse.mylyn.reviews.tasks.core.patch.GitPatchPathFindingStrategy;
+import org.eclipse.mylyn.reviews.tasks.core.patch.ITargetPathStrategy;
+import org.eclipse.mylyn.reviews.tasks.core.patch.SimplePathFindingStrategy;
+import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.ITaskContainer;
+import org.eclipse.mylyn.tasks.core.data.ITaskDataManager;
+
+/**
+ * @author Kilian Matt
+ */
+public class ReviewsUtil {
+	public static ITreeNode getReviewSubTasksFor(ITask task,
+			ITaskDataManager taskDataManager, IReviewMapper mapper,
+			IProgressMonitor monitor) throws CoreException {
+
+		ITaskProperties taskProperties = TaskProperties.fromTaskData(
+				taskDataManager, taskDataManager.getTaskData(task));
+		if (ReviewsUtil.isMarkedAsReview(task)) {
+
+			ReviewScope scope = mapper.mapTaskToScope(taskProperties);
+			List<ReviewResult> results = mapper
+					.mapTaskToResults(taskProperties);
+			return new ReviewScopeNode(taskProperties, scope, results);
+		} else {
+			TaskNode current = new TaskNode(taskProperties);
+			if (task instanceof ITaskContainer) {
+				ITaskContainer taskContainer = (ITaskContainer) task;
+				for (ITask subTask : taskContainer.getChildren()) {
+					current.addChildren(
+							getReviewSubTasksFor(subTask, taskDataManager,
+									mapper, monitor));
+				}
+			}
+			return current;
+		}
+	}
+
+	private static List<ITargetPathStrategy> strategies;
+	static {
+		strategies = new ArrayList<ITargetPathStrategy>();
+		strategies.add(new SimplePathFindingStrategy());
+		strategies.add(new GitPatchPathFindingStrategy());
+	}
+
+	public static List<? extends ITargetPathStrategy> getPathFindingStrategies() {
+		return strategies;
+	}
+
+	public static boolean isMarkedAsReview(ITask task) {
+		return task.getSummary().startsWith(ReviewConstants.REVIEW_MARKER);
+	}
+
+	public static boolean hasReviewMarker(ITask task) {
+		return task.getAttribute(ReviewConstants.ATTR_REVIEW_FLAG) != null;
+	}
+
+	public static Attachment findAttachment(String filename, String author,
+			String createdDate, ITaskProperties task) {
+		for (Attachment att : task.getAttachments()) {
+			if (filename.equals(att.getFileName())) {
+				return att;
+			}
+
+		}
+		return null;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/TaskNode.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/TaskNode.java
new file mode 100644
index 00000000..26607f5e
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/TaskNode.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import org.eclipse.mylyn.reviews.tasks.core.Attachment;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.Rating;
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class TaskNode extends AbstractTreeNode {
+
+	public TaskNode(ITaskProperties task) {
+		super(task);
+	}
+
+	@Override
+	public String getDescription() {
+		int patchCount=0;
+		int otherCount=0;
+		for(Attachment att : getTask().getAttachments()) {
+			if(att.isPatch()) {
+				patchCount++;
+			} else {
+				otherCount++;
+			}
+		}
+		StringBuilder sb = new StringBuilder();
+		if(patchCount >0) {
+			sb.append(patchCount);
+			sb.append("" Patch"");
+			if(patchCount>1) {
+				sb.append(""es"");
+			}
+		}
+		if(patchCount>0&& otherCount>0) {
+			sb.append("", "");
+		}
+		if(otherCount>0) {
+			sb.append(otherCount);
+			sb.append("" other attachment"");
+			if(otherCount>1) {
+				sb.append(""s"");
+			}
+		}
+		return sb.toString();
+	}
+
+	@Override
+	public Rating getResult() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getPerson() {
+		//TODO
+		return ""FIXME"";
+	}
+	public boolean hasReviewSubTasks() {
+		for (ITreeNode node :getChildren())  {
+			if(node instanceof ReviewScopeNode)
+				return true;
+			else if (node instanceof TaskNode) 
+				if(((TaskNode)node).hasReviewSubTasks())
+					return true;
+		}
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/TaskProperties.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/TaskProperties.java
new file mode 100644
index 00000000..d93259e3
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/TaskProperties.java
@@ -0,0 +1,181 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.core.internal;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.mylyn.reviews.tasks.core.Attachment;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.TaskComment;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.core.data.ITaskDataManager;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
+import org.eclipse.mylyn.tasks.core.data.TaskData;
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class TaskProperties implements ITaskProperties {
+	private ITaskDataManager manager;
+	private TaskData taskData;
+
+	public TaskProperties(ITaskDataManager manager, TaskData taskData) {
+		Assert.isNotNull(manager);
+		Assert.isNotNull(taskData);
+		this.taskData = taskData;
+		this.manager = manager;
+	}
+
+	@Override
+	public String getDescription() {
+		return taskData.getRoot().getMappedAttribute(TaskAttribute.DESCRIPTION)
+				.getValue();
+	}
+
+	@Override
+	public String getAssignedTo() {
+		return taskData.getRoot()
+				.getMappedAttribute(TaskAttribute.USER_ASSIGNED).getValue();
+	}
+
+	@Override
+	public List<Attachment> getAttachments() {
+		List<TaskAttribute> attachments = taskData.getAttributeMapper()
+				.getAttributesByType(taskData, TaskAttribute.TYPE_ATTACHMENT);
+		ArrayList<Attachment> list = new ArrayList<Attachment>();
+		for (TaskAttribute att : attachments) {
+			list.add(new Attachment(
+					this,
+					attributeValue(att, TaskAttribute.ATTACHMENT_FILENAME),
+					attributeValue(att, TaskAttribute.ATTACHMENT_AUTHOR),
+					attributeValue(att, TaskAttribute.ATTACHMENT_DATE),
+					taskData.getAttributeMapper()
+							.getBooleanValue(
+									att.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH)),
+					attributeValue(att, TaskAttribute.ATTACHMENT_URL)));
+		}
+		return list;
+	}
+
+	private String attributeValue(TaskAttribute parent, String attribute) {
+		return parent.getMappedAttribute(attribute).getValue();
+	}
+
+	@Override
+	public List<TaskComment> getComments() {
+		List<TaskComment> comments = new ArrayList<TaskComment>();
+		for (TaskAttribute attr : taskData.getRoot().getAttributes().values()) {
+			if (attr.getId().startsWith(TaskAttribute.PREFIX_COMMENT)) {
+
+				TaskComment comment = new TaskComment();
+				comment.setAuthor(attr.getMappedAttribute(
+						TaskAttribute.COMMENT_AUTHOR).getValue());
+				comment.setText(attr.getMappedAttribute(
+						TaskAttribute.COMMENT_TEXT).getValue());
+				try {
+					comment.setDate(parseDate(attr.getMappedAttribute(
+							TaskAttribute.COMMENT_DATE).getValue()));
+				} catch (ParseException ex) {
+					ex.printStackTrace();
+				}
+				comments.add(comment);
+			}
+		}
+		return comments;
+	}
+
+	@Override
+	public String getNewCommentText() {
+		TaskAttribute attribute = this.taskData.getRoot().getMappedAttribute(
+				TaskAttribute.COMMENT_NEW);
+		if (attribute == null)
+			return null;
+
+		return attribute.getValue();
+	}
+
+	@Override
+	public void setNewCommentText(String value) {
+		TaskAttribute attribute = this.taskData.getRoot().getMappedAttribute(
+				TaskAttribute.COMMENT_NEW);
+		if (attribute == null) {
+			attribute = this.taskData.getRoot().createMappedAttribute(
+					TaskAttribute.COMMENT_NEW);
+		}
+		attribute.setValue(value);
+	}
+
+	private Date parseDate(String dateString) throws ParseException {
+		return new SimpleDateFormat(""yyyy-mm-dd hh:MM"").parse(dateString);
+	}
+
+	public static ITaskProperties fromTaskData(ITaskDataManager manager,
+			TaskData taskData) {
+		return new TaskProperties(manager, taskData);
+	}
+
+	@Override
+	public ITaskProperties loadFor(String taskId) throws CoreException {
+		TaskData td = manager.getTaskData(
+				new TaskRepository(taskData.getConnectorKind(), taskData
+						.getRepositoryUrl()), taskId);
+		return new TaskProperties(manager, td);
+	}
+
+	@Override
+	public String getTaskId() {
+		return taskData.getTaskId();
+	}
+
+	@Override
+	public void setDescription(String description) {
+		setValue(TaskAttribute.DESCRIPTION, description);
+	}
+
+	private void setValue(String mappedAttributeName, String value) {
+		TaskAttribute attribute = taskData.getRoot().getMappedAttribute(
+				mappedAttributeName);
+		if (attribute == null) {
+			attribute = taskData.getRoot().createMappedAttribute(
+					mappedAttributeName);
+		}
+		attribute.setValue(value);
+	}
+
+	@Override
+	public void setSummary(String summary) {
+		taskData.getRoot().getMappedAttribute(TaskAttribute.SUMMARY)
+				.setValue(summary);
+	}
+
+	@Override
+	public void setAssignedTo(String assignee) {
+		taskData.getRoot().getMappedAttribute(TaskAttribute.USER_ASSIGNED)
+				.setValue(assignee);
+	}
+
+	@Override
+	public String getRepositoryUrl() {
+		return taskData.getRepositoryUrl();
+	}
+
+	@Override
+	public String getReporter() {
+		return attributeValue(taskData.getRoot(),TaskAttribute.USER_REPORTER);
+	}
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/GitPatchPathFindingStrategy.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/GitPatchPathFindingStrategy.java
similarity index 96%
rename from tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/GitPatchPathFindingStrategy.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/GitPatchPathFindingStrategy.java
index 4875e3ea..e40d2694 100644
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/GitPatchPathFindingStrategy.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/GitPatchPathFindingStrategy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
+package org.eclipse.mylyn.reviews.tasks.core.patch;
 
 import java.io.InputStreamReader;
 import java.io.Reader;
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ITargetPathStrategy.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/ITargetPathStrategy.java
similarity index 94%
rename from tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ITargetPathStrategy.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/ITargetPathStrategy.java
index 78f355cc..d64d4f72 100644
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ITargetPathStrategy.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/ITargetPathStrategy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
+package org.eclipse.mylyn.reviews.tasks.core.patch;
 
 import org.eclipse.compare.patch.ReaderCreator;
 import org.eclipse.core.runtime.IPath;
diff --git a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/SimplePathFindingStrategy.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/SimplePathFindingStrategy.java
similarity index 96%
rename from tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/SimplePathFindingStrategy.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/SimplePathFindingStrategy.java
index db3b871e..57400ad4 100644
--- a/tbr/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/SimplePathFindingStrategy.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/patch/SimplePathFindingStrategy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.core;
+package org.eclipse.mylyn.reviews.tasks.core.patch;
 
 import java.io.InputStreamReader;
 import java.io.Reader;
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath
new file mode 100644
index 00000000..7e8449de
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath
@@ -0,0 +1,8 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<classpath>
+	<classpathentry kind=""src"" path=""src""/>
+	<classpathentry kind=""src"" path=""src-gen""/>
+	<classpathentry kind=""con"" path=""org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5""/>
+	<classpathentry kind=""con"" path=""org.eclipse.pde.core.requiredPlugins""/>
+	<classpathentry kind=""output"" path=""bin""/>
+</classpath>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.project b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.project
new file mode 100644
index 00000000..27776feb
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.project
@@ -0,0 +1,34 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<projectDescription>
+	<name>org.eclipse.mylyn.reviews.tasks.dsl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..acec93ef
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.mylyn.reviews.tasks.dsl
+Bundle-Vendor: Mylyn Reviews Project
+Bundle-Version: 0.0.1.qualifier
+Bundle-SymbolicName: org.eclipse.mylyn.reviews.tasks.dsl;singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.xtext.xtend;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.antlr.runtime
+Import-Package: org.apache.log4j
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.mylyn.reviews.tasks.dsl,
+ org.eclipse.mylyn.reviews.tasks.dsl.parseTreeConstruction,
+ org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr,
+ org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr.internal,
+ org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl,
+ org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.impl,
+ org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.util,
+ org.eclipse.mylyn.reviews.tasks.dsl.services,
+ org.eclipse.mylyn.reviews.tasks.dsl.validation
+
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/build.properties b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/build.properties
new file mode 100644
index 00000000..e10dcceb
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/build.properties
@@ -0,0 +1,5 @@
+source.. = src/,\
+          src-gen/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml
new file mode 100644
index 00000000..8881d7bf
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml
@@ -0,0 +1,18 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<?eclipse version=""3.0""?>
+
+<plugin>
+
+  <extension point=""org.eclipse.emf.ecore.generated_package"">
+    <package 
+       uri = ""http://www.eclipse.org/mylyn/reviews/tasks/dsl/ReviewDsl"" 
+       class = ""org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslPackage""
+       genModel = ""org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.genmodel"" /> 
+	
+  </extension>
+
+
+
+
+
+</plugin>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml_gen b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml_gen
new file mode 100644
index 00000000..8881d7bf
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml_gen
@@ -0,0 +1,18 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<?eclipse version=""3.0""?>
+
+<plugin>
+
+  <extension point=""org.eclipse.emf.ecore.generated_package"">
+    <package 
+       uri = ""http://www.eclipse.org/mylyn/reviews/tasks/dsl/ReviewDsl"" 
+       class = ""org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslPackage""
+       genModel = ""org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.genmodel"" /> 
+	
+  </extension>
+
+
+
+
+
+</plugin>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2 b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2
new file mode 100644
index 00000000..06d08ac7
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2
@@ -0,0 +1,100 @@
+module org.eclipse.mylyn.reviews.tasks.dsl.ReviewDsl
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.generator.*
+import org.eclipse.xtext.ui.generator.*
+
+var grammarURI = ""classpath:/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext""
+var file.extensions = ""review-dsl""
+var projectName = ""org.eclipse.mylyn.reviews.tasks.dsl""
+var runtimeProject = ""../${projectName}""
+
+Workflow {
+    bean = StandaloneSetup {
+		platformUri = ""${runtimeProject}/..""
+	}
+
+	component = DirectoryCleaner {
+		directory = ""${runtimeProject}/src-gen""
+	}
+
+	component = DirectoryCleaner {
+		directory = ""${runtimeProject}.ui/src-gen""
+	}
+
+	component = Generator {
+		pathRtProject = runtimeProject
+		pathUiProject = ""${runtimeProject}.ui""
+		projectNameRt = projectName
+		projectNameUi = ""${projectName}.ui""
+		language = {
+			uri = grammarURI
+			fileExtensions = file.extensions
+
+			// Java API to access grammar elements (required by several other fragments)
+			fragment = grammarAccess.GrammarAccessFragment {}
+
+			// generates Java API for the generated EPackages 
+			fragment = ecore.EcoreGeneratorFragment {
+			// referencedGenModels = ""uri to genmodel, uri to next genmodel""
+			}
+
+			// the serialization component
+			fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
+
+			// a custom ResourceFactory for use with EMF 
+			fragment = resourceFactory.ResourceFactoryFragment {
+				fileExtensions = file.extensions
+			}
+
+			// The antlr parser generator fragment.
+			fragment = parser.antlr.XtextAntlrGeneratorFragment {
+			//  options = {
+			//		backtrack = true
+			//	}
+			}
+
+			// java-based API for validation 
+			fragment = validation.JavaValidatorFragment {
+				composedCheck = ""org.eclipse.xtext.validation.ImportUriValidator""
+				composedCheck = ""org.eclipse.xtext.validation.NamesAreUniqueValidator""
+				// registerForImportedPackages = true
+			}
+
+			// scoping and exporting API
+			// fragment = scoping.ImportURIScopingFragment {}
+			// fragment = exporting.SimpleNamesFragment {}
+
+			// scoping and exporting API 
+			fragment = scoping.ImportNamespacesScopingFragment {}
+			fragment = exporting.QualifiedNamesFragment {}
+			fragment = builder.BuilderIntegrationFragment {}
+
+			// formatter API 
+			fragment = formatting.FormatterFragment {}
+
+			// labeling API 
+			fragment = labeling.LabelProviderFragment {}
+
+			// outline API 
+			fragment = outline.TransformerFragment {}
+			fragment = outline.OutlineNodeAdapterFactoryFragment {}
+			fragment = outline.QuickOutlineFragment {}
+
+			// quickfix API 
+			fragment = quickfix.QuickfixProviderFragment {}
+
+			// content assist API  
+			fragment = contentAssist.JavaBasedContentAssistFragment {}
+
+			// generates a more lightweight Antlr parser and lexer tailored for content assist  
+			fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
+
+			// project wizard (optional) 
+			// fragment = projectWizard.SimpleProjectWizardFragment {
+			// 		generatorProjectName = ""${projectName}.generator"" 
+			//		modelFileExtension = file.extensions
+			// }
+		}
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext
new file mode 100644
index 00000000..1a3e41c6
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext
@@ -0,0 +1,50 @@
+grammar org.eclipse.mylyn.reviews.tasks.dsl.ReviewDsl with org.eclipse.xtext.common.Terminals
+
+generate reviewDsl ""http://www.eclipse.org/mylyn/reviews/tasks/dsl/ReviewDsl""
+
+Model:
+	ReviewResult | ReviewScope;
+
+ReviewResult:
+	""Review result:"" result=ResultEnum
+	(""Comment:"" comment=STRING )? (filecomments+=FileComment)* ;
+
+enum ResultEnum:
+	passed=""PASSED"" | failed=""FAILED""
+	| todo=""TODO"" |	warning=""WARNING"";
+
+FileComment:
+	""File""  path=STRING  "":""  comment=STRING?
+	linecomments+=LineComment*;
+
+LineComment:
+	""Line "" start=INT (""-"" end=INT)? "":""  comment=STRING;
+
+ReviewScope:
+	""Review scope:"" 
+	(
+	 scope+=ReviewScopeItem
+	 )+;
+
+//ChangesetDef:
+//	(""Changeset"" revision=INT "" from "" repoType=ID url=STRING );
+ReviewScopeItem:
+	ResourceDef|PatchDef;
+ResourceDef:
+	(""Resource"" source=Source );
+
+PatchDef:
+	(""Patch"" source=Source );
+
+Source:
+	AttachmentSource;
+
+AttachmentSource:
+	""from Attachment""  filename=STRING  
+	""by"" author=STRING  
+	""on"" createdDate=STRING  
+	""of task"" taskId=TASK_ID;
+
+
+terminal TASK_ID  		: ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9')*;
+	
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslRuntimeModule.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslRuntimeModule.java
new file mode 100644
index 00000000..7bf5ed9f
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslRuntimeModule.java
@@ -0,0 +1,12 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+
+/**
+ * Use this class to register components to be used at runtime / without the Equinox extension registry.
+ */
+public class ReviewDslRuntimeModule extends org.eclipse.mylyn.reviews.tasks.dsl.AbstractReviewDslRuntimeModule {
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslStandaloneSetup.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslStandaloneSetup.java
new file mode 100644
index 00000000..e5caf580
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslStandaloneSetup.java
@@ -0,0 +1,16 @@
+
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslStandaloneSetupGenerated;
+
+/**
+ * Initialization support for running Xtext languages 
+ * without equinox extension registry
+ */
+public class ReviewDslStandaloneSetup extends ReviewDslStandaloneSetupGenerated{
+
+	public static void doSetup() {
+		new ReviewDslStandaloneSetup().createInjectorAndDoEMFRegistration();
+	}
+}
+
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/formatting/ReviewDslFormatter.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/formatting/ReviewDslFormatter.java
new file mode 100644
index 00000000..81a99589
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/formatting/ReviewDslFormatter.java
@@ -0,0 +1,32 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.mylyn.reviews.tasks.dsl.formatting;
+
+import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslPackage;
+import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter;
+import org.eclipse.xtext.formatting.impl.FormattingConfig;
+
+/**
+ * This class contains custom formatting description.
+ * 
+ * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
+ * on how and when to use it 
+ * 
+ * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
+ */
+public class ReviewDslFormatter extends AbstractDeclarativeFormatter {
+	
+	@Override
+	protected void configureFormatting(FormattingConfig c) {
+		c.setLinewrap(1).after(ReviewDslPackage.eINSTANCE.getReviewScope());
+		c.setIndentationIncrement().before(ReviewDslPackage.eINSTANCE.getReviewScopeItem());
+		c.setIndentationDecrement().after(ReviewDslPackage.eINSTANCE.getReviewScopeItem());
+		c.setLinewrap(1).after(ReviewDslPackage.eINSTANCE.getReviewScopeItem());
+
+		//		c.setLinewrap(1, 1, 2).before(ReviewDslPackage.eINSTANCE.getFileComment());
+//		c.setLinewrap(1, 1, 2).before(ReviewDslPackage.eINSTANCE.getLineComment());
+//		c.setLinewrap(1, 1, 2).before(ReviewDslPackage.eINSTANCE.getResourceDef());
+//		c.setLinewrap(1, 1, 2).before(ReviewDslPackage.eINSTANCE.getPatchDef());
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/scoping/ReviewDslScopeProvider.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/scoping/ReviewDslScopeProvider.java
new file mode 100644
index 00000000..b763d9b4
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/scoping/ReviewDslScopeProvider.java
@@ -0,0 +1,17 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.mylyn.reviews.tasks.dsl.scoping;
+
+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
+
+/**
+ * This class contains custom scoping description.
+ * 
+ * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping
+ * on how and when to use it 
+ *
+ */
+public class ReviewDslScopeProvider extends AbstractDeclarativeScopeProvider {
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/validation/ReviewDslJavaValidator.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/validation/ReviewDslJavaValidator.java
new file mode 100644
index 00000000..1ebad0a8
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/validation/ReviewDslJavaValidator.java
@@ -0,0 +1,13 @@
+package org.eclipse.mylyn.reviews.tasks.dsl.validation;
+ 
+
+public class ReviewDslJavaValidator extends AbstractReviewDslJavaValidator {
+
+//	@Check
+//	public void checkGreetingStartsWithCapital(Greeting greeting) {
+//		if (!Character.isUpperCase(greeting.getName().charAt(0))) {
+//			warning(""Name should start with a capital"", MyDslPackage.GREETING__NAME);
+//		}
+//	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/.classpath b/tbr/org.eclipse.mylyn.reviews.tasks.ui/.classpath
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/.classpath
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/.classpath
diff --git a/tbr/org.eclipse.mylyn.reviews.core/.project b/tbr/org.eclipse.mylyn.reviews.tasks.ui/.project
similarity index 94%
rename from tbr/org.eclipse.mylyn.reviews.core/.project
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/.project
index 7b0cd529..643061eb 100644
--- a/tbr/org.eclipse.mylyn.reviews.core/.project
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/.project
@@ -1,6 +1,6 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <projectDescription>
-	<name>org.eclipse.mylyn.reviews.core</name>
+	<name>org.eclipse.mylyn.reviews.tasks.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..30bc017f
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Mylyn Reviews UI (Incubation)
+Bundle-SymbolicName: org.eclipse.mylyn.reviews.tasks.ui;singleton:=true
+Bundle-Version: 0.0.1
+Bundle-Activator: org.eclipse.mylyn.reviews.tasks.ui.ReviewsUiPlugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.mylyn.tasks.ui;bundle-version=""3.4.0"",
+ org.eclipse.ui.forms;bundle-version=""3.4.1"",
+ org.eclipse.mylyn.tasks.core;bundle-version=""3.3.0"",
+ org.eclipse.compare;bundle-version=""3.5.0"",
+ org.eclipse.core.resources;bundle-version=""3.6.0"",
+ org.eclipse.mylyn.reviews.tasks.dsl;bundle-version=""0.0.1"",
+ org.eclipse.emf.common;bundle-version=""2.6.0"",
+ org.eclipse.emf.ecore;bundle-version=""2.6.1"",
+ org.eclipse.xtext;bundle-version=""1.0.1"",
+ org.eclipse.xtext.util;bundle-version=""1.0.1"",
+ org.eclipse.mylyn.reviews.tasks.core;bundle-version=""0.0.1""
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.mylyn.reviews.tasks.ui,
+ org.eclipse.mylyn.reviews.tasks.ui.editors
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/about.html b/tbr/org.eclipse.mylyn.reviews.tasks.ui/about.html
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/about.html
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/about.html
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/about_files/CreativeCommons-Attribution2.5-Legalcode.html b/tbr/org.eclipse.mylyn.reviews.tasks.ui/about_files/CreativeCommons-Attribution2.5-Legalcode.html
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/about_files/CreativeCommons-Attribution2.5-Legalcode.html
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/about_files/CreativeCommons-Attribution2.5-Legalcode.html
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/build.properties b/tbr/org.eclipse.mylyn.reviews.tasks.ui/build.properties
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/build.properties
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/build.properties
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/addition.gif b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/addition.gif
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/addition.gif
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/addition.gif
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/filter_ps.gif b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/filter_ps.gif
new file mode 100644
index 00000000..a4c9e60e
Binary files /dev/null and b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/filter_ps.gif differ
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/maximize.png b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/maximize.png
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/maximize.png
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/maximize.png
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/obstructed.gif b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/obstructed.gif
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/obstructed.gif
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/obstructed.gif
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/review_failed.png b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_failed.png
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/review_failed.png
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_failed.png
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/review_none.png b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_none.png
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/review_none.png
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_none.png
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/review_passed.png b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_passed.png
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/review_passed.png
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_passed.png
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/review_warning.png b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_warning.png
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/review_warning.png
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/review_warning.png
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/reviews16.gif b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/reviews16.gif
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/reviews16.gif
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/reviews16.gif
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/reviews24.gif b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/reviews24.gif
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/reviews24.gif
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/reviews24.gif
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/icons/reviews32.gif b/tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/reviews32.gif
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/icons/reviews32.gif
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/icons/reviews32.gif
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/plugin.xml b/tbr/org.eclipse.mylyn.reviews.tasks.ui/plugin.xml
similarity index 54%
rename from tbr/org.eclipse.mylyn.reviews.ui/plugin.xml
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/plugin.xml
index 61482a16..12faedae 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/plugin.xml
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/plugin.xml
@@ -11,15 +11,6 @@
  -->
 
 <plugin>
-   <extension
-         point=""org.eclipse.ui.editors"">
-      <editor
-            class=""org.eclipse.mylyn.reviews.ui.editors.ReviewEditor""
-            icon=""icons/reviews32.gif""
-            id=""org.eclipse.mylyn.reviews.ui.editors.ReviewEditor""
-            name=""Mylyn Reviews Editor"">
-      </editor>
-   </extension>
    <extension
          point=""org.eclipse.ui.popupMenus"">
       <objectContribution
@@ -27,24 +18,20 @@
             id=""org.eclipse.mylyn.reviews.ui.objectContribution1""
             objectClass=""org.eclipse.mylyn.tasks.core.ITaskAttachment"">
          <action
-               class=""org.eclipse.mylyn.reviews.ui.CreateReviewAction""
+               class=""org.eclipse.mylyn.reviews.tasks.ui.CreateReviewActionFromAttachment""
                enablesFor=""*""
-               id=""org.eclipse.mylyn.reviews.ui.create_review_from_attachment""
+               id=""org.eclipse.mylyn.reviews.tasks.ui.create_review_from_attachment""
                label=""Create Review from Attachment""
                tooltip=""Create a new review from this attachment"">
          </action>
       </objectContribution>
    </extension>
    <extension
-         point=""org.eclipse.mylyn.tasks.ui.taskEditorPageContribution"">
-      <partAdvisor
-      		class=""org.eclipse.mylyn.reviews.ui.editors.ReviewTaskEditorPartAdvisor""
-            id=""org.eclipse.mylyn.reviews.ui.reviewPart"">
-      </partAdvisor>
-      <partAdvisor
-      		class=""org.eclipse.mylyn.reviews.ui.editors.ReviewSummaryPartConfigurer""
-            id=""org.eclipse.mylyn.reviews.ui.reviewSummaryPart"">
-      </partAdvisor>
+         point=""org.eclipse.mylyn.tasks.ui.editors"">
+      <pageFactory
+            class=""org.eclipse.mylyn.reviews.tasks.ui.editors.ReviewTaskEditorPageFactory""
+            id=""org.eclipse.mylyn.reviews.ui.pageFactory2"">
+      </pageFactory>
    </extension>
 
 </plugin>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/CreateReviewActionFromAttachment.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/CreateReviewActionFromAttachment.java
new file mode 100644
index 00000000..1ec9d850
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/CreateReviewActionFromAttachment.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.ui;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
+import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
+import org.eclipse.mylyn.reviews.tasks.core.Attachment;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.PatchScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.ResourceScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewsUtil;
+import org.eclipse.mylyn.reviews.tasks.core.internal.TaskProperties;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.ITaskAttachment;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.core.data.ITaskDataManager;
+import org.eclipse.mylyn.tasks.core.data.TaskData;
+import org.eclipse.mylyn.tasks.core.data.TaskMapper;
+import org.eclipse.mylyn.tasks.ui.TasksUi;
+import org.eclipse.ui.IActionDelegate;
+
+public class CreateReviewActionFromAttachment extends Action implements
+		IActionDelegate {
+
+	private Attachment attachment;
+	private ITaskAttachment taskAttachment;
+
+	public void run(IAction action) {
+		if (attachment != null) {
+			try {
+				// FIXME move common creation to a subclass
+				TaskRepository taskRepository = taskAttachment
+						.getTaskRepository();
+				ITaskDataManager manager = TasksUi.getTaskDataManager();
+				ITask parentTask = taskAttachment.getTask();
+				TaskData parentTaskData = manager.getTaskData(taskAttachment
+						.getTask());
+
+				TaskMapper initializationData = new TaskMapper(parentTaskData);
+				IReviewMapper taskMapper = ReviewsUiPlugin.getMapper();
+
+				TaskData taskData = TasksUiInternal.createTaskData(
+						taskRepository, initializationData, null,
+						new NullProgressMonitor());
+				AbstractRepositoryConnector connector = TasksUiPlugin
+						.getConnector(taskRepository.getConnectorKind());
+
+				connector.getTaskDataHandler().initializeSubTaskData(
+						taskRepository, taskData, parentTaskData,
+						new NullProgressMonitor());
+
+				ITaskProperties taskProperties = TaskProperties.fromTaskData(
+						manager, taskData);
+				taskProperties
+						.setSummary(""[review] "" + parentTask.getSummary());
+
+				String reviewer = taskRepository.getUserName();
+				taskProperties.setAssignedTo(reviewer);
+
+				initTaskProperties(taskMapper, taskProperties);
+
+				TasksUiInternal.createAndOpenNewTask(taskData);
+			} catch (CoreException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+	}
+
+	private void initTaskProperties(IReviewMapper taskMapper,
+			ITaskProperties taskProperties) {
+		ReviewScope scope = new ReviewScope();
+		if (attachment.isPatch()) {
+			scope.addScope(new PatchScopeItem(attachment));
+		} else {
+			scope.addScope(new ResourceScopeItem(attachment));
+		}
+		taskMapper.mapScopeToTask(scope, taskProperties);
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		action.setEnabled(false);
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			if (structuredSelection.size() == 1) {
+				if (structuredSelection.getFirstElement() instanceof ITaskAttachment) {
+					action.setEnabled(true);
+					taskAttachment = (ITaskAttachment) structuredSelection
+							.getFirstElement();
+					ITaskProperties taskProperties = TaskProperties
+							.fromTaskData(TasksUi.getTaskDataManager(),
+									taskAttachment.getTaskAttribute()
+											.getTaskData());
+					// FIXME date from task attachment
+					this.attachment = ReviewsUtil.findAttachment(taskAttachment
+							.getFileName(), taskAttachment.getAuthor()
+							.getPersonId(), taskAttachment.getCreationDate()
+							.toString(), taskProperties);
+				}
+			}
+		}
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/Images.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/Images.java
similarity index 95%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/Images.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/Images.java
index f6cae175..f5c4c8f5 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/Images.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/Images.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Christoph Mayerhofer (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
+package org.eclipse.mylyn.reviews.tasks.ui;
 
 import java.net.URL;
 
@@ -53,6 +53,8 @@ public class Images {
 			""obstructed.gif""); //$NON-NLS-1$
 	public static final ImageDescriptor MAXIMIZE = create(ICONS_PATH,
 	""maximize.png""); //$NON-NLS-1$
+	public static final ImageDescriptor FILTER = create(ICONS_PATH,
+	""filter_ps.gif""); //$NON-NLS-1$
 
 	protected static ImageDescriptor create(String prefix, String name) {
 		return ImageDescriptor.createFromURL(makeIconURL(prefix, name));
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/Messages.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/Messages.java
similarity index 93%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/Messages.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/Messages.java
index 56a075c8..eaf36f61 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/Messages.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/Messages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
+package org.eclipse.mylyn.reviews.tasks.ui;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -16,7 +16,7 @@
  * @author Kilian Matt
  */
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = ""org.eclipse.mylyn.reviews.ui.messages""; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = ""org.eclipse.mylyn.reviews.tasks.ui.messages""; //$NON-NLS-1$
 	public static String CreateTask_Success;
 	public static String CreateTask_Title;
 	public static String CreateTask_UploadingAttachment;
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/ReviewUiUtils.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/ReviewUiUtils.java
new file mode 100644
index 00000000..bbc4276d
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/ReviewUiUtils.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.ui;
+
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewUiUtils {
+	public static void openTaskInMylyn(ITaskProperties task) {
+		TasksUiUtil.openTask(task.getRepositoryUrl(), task.getTaskId(), null);
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewsUiPlugin.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/ReviewsUiPlugin.java
similarity index 65%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewsUiPlugin.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/ReviewsUiPlugin.java
index 64343541..8a02ceb4 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewsUiPlugin.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/ReviewsUiPlugin.java
@@ -8,16 +8,18 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
+package org.eclipse.mylyn.reviews.tasks.ui;
 
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.reviews.core.ReviewDataManager;
-import org.eclipse.mylyn.reviews.core.ReviewDataStore;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewTaskMapper;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslStandaloneSetup;
+import org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr.ReviewDslParser;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.xtext.parsetree.reconstr.Serializer;
 import org.osgi.framework.BundleContext;
 
+import com.google.inject.Injector;
+
 /**
  * The activator class controls the plug-in life cycle
  * 
@@ -31,7 +33,7 @@ public class ReviewsUiPlugin extends AbstractUIPlugin {
 	// The shared instance
 	private static ReviewsUiPlugin plugin;
 
-	private static ReviewDataManager reviewDataManager;
+	private static ReviewTaskMapper mapper;
 
 	/**
 	 * The constructor
@@ -50,17 +52,6 @@ public ReviewsUiPlugin() {
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
-
-		String DIRECTORY_METADATA = "".metadata""; //$NON-NLS-1$
-
-		String NAME_DATA_DIR = "".mylyn""; //$NON-NLS-1$
-		String storeDir = ResourcesPlugin.getWorkspace().getRoot()
-				.getLocation().toString()
-				+ '/' + DIRECTORY_METADATA + '/' + NAME_DATA_DIR;
-		ReviewDataStore store = new ReviewDataStore(storeDir);
-		reviewDataManager = new ReviewDataManager(store,
-				TasksUiPlugin.getTaskDataManager(),
-				TasksUiPlugin.getRepositoryModel());
 	}
 
 	/*
@@ -85,8 +76,17 @@ public static ReviewsUiPlugin getDefault() {
 		return plugin;
 	}
 
-	public static ReviewDataManager getDataManager() {
-		return reviewDataManager;
+	public static IReviewMapper getMapper() {
+		if (mapper == null) {
+			Injector createInjectorAndDoEMFRegistration = new ReviewDslStandaloneSetup()
+					.createInjectorAndDoEMFRegistration();
+			ReviewDslParser parser = createInjectorAndDoEMFRegistration
+					.getInstance(ReviewDslParser.class);
+			Serializer serializer = createInjectorAndDoEMFRegistration
+					.getInstance(Serializer.class);
+			mapper = new ReviewTaskMapper(parser, serializer);
+		}
+		return mapper;
 	}
 
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/AbstractReviewTaskEditorPart.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/AbstractReviewTaskEditorPart.java
new file mode 100644
index 00000000..baa06c5f
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/AbstractReviewTaskEditorPart.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
+
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
+
+public abstract class AbstractReviewTaskEditorPart  extends AbstractTaskEditorPart{
+
+	private ReviewTaskEditorPage reviewPage;
+public AbstractReviewTaskEditorPart() {
+super();
+}
+	@Override
+	public void initialize(AbstractTaskEditorPage taskEditorPage) {
+		super.initialize(taskEditorPage);
+		reviewPage = (ReviewTaskEditorPage)taskEditorPage;
+	}
+	protected ReviewTaskEditorPage getReviewPage() {
+		return reviewPage;
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/Messages.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/Messages.java
similarity index 96%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/Messages.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/Messages.java
index 288a7ee0..16b59e14 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/Messages.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/Messages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -16,7 +16,7 @@
  * @author Kilian Matt
  */
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = ""org.eclipse.mylyn.reviews.ui.editors.messages""; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = ""org.eclipse.mylyn.reviews.tasks.ui.editors.messages""; //$NON-NLS-1$
 	public static String CreateReviewTaskEditorPageFactory_Reviews;
 	public static String CreateReviewTaskEditorPart_Patches;
 	public static String CreateReviewTaskEditorPart_Create_Review;
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewSummaryTaskEditorPart.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewSummaryTaskEditorPart.java
new file mode 100644
index 00000000..475a9279
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewSummaryTaskEditorPart.java
@@ -0,0 +1,254 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.TreeViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ITreeNode;
+import org.eclipse.mylyn.reviews.tasks.core.internal.TaskNode;
+import org.eclipse.mylyn.reviews.tasks.ui.Images;
+import org.eclipse.mylyn.reviews.tasks.ui.ReviewUiUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+/*
+ * @author Kilian Matt
+ */
+public class ReviewSummaryTaskEditorPart extends AbstractReviewTaskEditorPart {
+
+	public static final String ID_PART_REVIEWSUMMARY = ""org.eclipse.mylyn.reviews.ui.editors.parts.reviewsummary""; //$NON-NLS-1$
+	private TreeViewer reviewResults;
+	private ScopeViewerFilter scopeViewerFilter = new ScopeViewerFilter();
+
+	public ReviewSummaryTaskEditorPart() {
+		setPartName(Messages.ReviewSummaryTaskEditorPart_Partname);
+	}
+
+	@Override
+	public void createControl(final Composite parent, FormToolkit toolkit) {
+		Section summarySection = createSection(parent, toolkit,
+				ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+						| ExpandableComposite.EXPANDED);
+		summarySection.setLayout(new FillLayout(SWT.HORIZONTAL));
+		summarySection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
+				true));
+		Composite reviewResultsComposite = toolkit
+				.createComposite(summarySection);
+		toolkit.paintBordersFor(reviewResultsComposite);
+		reviewResultsComposite.setLayout(new GridLayout(1, false));
+
+		reviewResults = createResultsViewer(reviewResultsComposite, toolkit);
+		reviewResults.getControl().setLayoutData(
+				new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		try {
+			ITreeNode rootNode = getReviewPage().getReviewResults(
+					new NullProgressMonitor());
+			reviewResults.setInput(new Object[] { rootNode });
+			reviewResults.expandAll();
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		summarySection.setText(""Review Summary "");
+		summarySection.setClient(reviewResultsComposite);
+		setSection(toolkit, summarySection);
+	}
+
+	private TreeViewerColumn createColumn(TreeViewer tree, String columnTitle) {
+		TreeViewerColumn column = new TreeViewerColumn(tree, SWT.LEFT);
+		column.getColumn().setText(columnTitle);
+		column.getColumn().setWidth(100);
+		column.getColumn().setResizable(true);
+		return column;
+	}
+
+	private TreeViewer createResultsViewer(Composite reviewResultsComposite,
+			FormToolkit toolkit) {
+		Tree tree = new Tree(reviewResultsComposite, SWT.SINGLE
+				| SWT.FULL_SELECTION);
+		tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		tree.setLinesVisible(true);
+		tree.setHeaderVisible(true);
+		for (int i = 0; i < tree.getColumnCount(); i++) {
+			tree.getColumn(i).pack();
+		}
+		tree.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
+
+		TreeViewer reviewResults = new TreeViewer(tree);
+		createColumn(reviewResults, ""Task"");
+		createColumn(reviewResults,
+				Messages.ReviewSummaryTaskEditorPart_Header_Result);
+		createColumn(reviewResults, ""Description"");
+		createColumn(reviewResults, ""Who"");
+
+		reviewResults.setContentProvider(new ReviewResultContentProvider());
+
+		reviewResults.setLabelProvider(new TableLabelProvider() {
+			private static final int COLUMN_TASK_ID = 0;
+			private static final int COLUMN_RESULT = 1;
+			private static final int COLUMN_DESCRIPTION = 2;
+			private static final int COLUMN_WHO = 3;
+
+			public Image getColumnImage(Object element, int columnIndex) {
+				if (columnIndex == COLUMN_RESULT) {
+					ITreeNode node = (ITreeNode) element;
+					if (node.getResult() == null)
+						return null;
+					switch (node.getResult()) {
+					case FAIL:
+						return Images.REVIEW_RESULT_FAILED.createImage();
+					case WARNING:
+						return Images.REVIEW_RESULT_WARNING.createImage();
+					case PASSED:
+						return Images.REVIEW_RESULT_PASSED.createImage();
+					case TODO:
+						return Images.REVIEW_RESULT_NONE.createImage();
+
+					}
+				}
+				return null;
+			}
+
+			public String getColumnText(Object element, int columnIndex) {
+
+				ITreeNode node = (ITreeNode) element;
+				switch (columnIndex) {
+				case COLUMN_TASK_ID:
+					return node.getTaskId();
+				case COLUMN_RESULT:
+					return node.getResult() != null ? node.getResult().name()
+							: """";
+				case COLUMN_DESCRIPTION:
+					return node.getDescription();
+				case COLUMN_WHO:
+					return node.getPerson();
+				default:
+					return null;
+				}
+			}
+
+		});
+		reviewResults.addDoubleClickListener(new IDoubleClickListener() {
+
+			public void doubleClick(DoubleClickEvent event) {
+				if (!event.getSelection().isEmpty()) {
+					ITaskProperties task = ((ITreeNode) ((IStructuredSelection) event
+							.getSelection()).getFirstElement()).getTask();
+					ReviewUiUtils.openTaskInMylyn(task);
+				}
+			}
+		});
+		return reviewResults;
+	}
+
+	private final class ScopeViewerFilter extends ViewerFilter {
+		@Override
+		public boolean select(Viewer viewer, Object parentElement,
+				Object element) {
+			if (element instanceof TaskNode) {
+				return ((TaskNode) element).hasReviewSubTasks();
+			}
+			return true;
+		}
+	}
+
+	private static class ReviewResultContentProvider implements
+			ITreeContentProvider {
+
+		@Override
+		public Object[] getChildren(Object parentElement) {
+			return ((ITreeNode) parentElement).getChildren().toArray();
+		}
+
+		@Override
+		public Object getParent(Object element) {
+			return ((ITreeNode) element).getParent();
+		}
+
+		@Override
+		public boolean hasChildren(Object element) {
+			return !((ITreeNode) element).getChildren().isEmpty();
+		}
+
+		@Override
+		public void dispose() {
+			// nothing to do
+
+		}
+
+		@Override
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			// nothing to do
+		}
+
+		@Override
+		public Object[] getElements(Object inputElement) {
+			if (inputElement instanceof Object[]) {
+				return (Object[]) inputElement;
+			} else if (inputElement instanceof Collection<?>) {
+				return ((Collection<?>) inputElement).toArray();
+			}
+			return new Object[0];
+		}
+	}
+
+	@Override
+	protected void fillToolBar(ToolBarManager manager) {
+		Action toggleFiltering = new Action(""Filter"", SWT.TOGGLE) { //$NON-NLS-1$
+			@Override
+			public void run() {
+				enableFiltering(!isFiltering());
+			}
+		};
+		toggleFiltering.setImageDescriptor(Images.FILTER);
+		toggleFiltering.setToolTipText(""Toogle Filtering"");
+		toggleFiltering.setChecked(true);
+		enableFiltering(true);
+		manager.add(toggleFiltering);
+		super.fillToolBar(manager);
+	}
+
+	private boolean isFiltering() {
+		return reviewResults.getFilters() != null
+				&& reviewResults.getFilters().length > 0;
+	}
+
+	private void enableFiltering(boolean enable) {
+		if (enable) {
+
+			reviewResults.setFilters(new ViewerFilter[] { scopeViewerFilter });
+		} else {
+			reviewResults.setFilters(new ViewerFilter[0]);
+		}
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPage.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPage.java
new file mode 100644
index 00000000..b99ea49f
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPage.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.mylyn.internal.tasks.ui.editors.ToolBarButtonContribution;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ITreeNode;
+import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewsUtil;
+import org.eclipse.mylyn.reviews.tasks.core.internal.TaskProperties;
+import org.eclipse.mylyn.reviews.tasks.ui.ReviewsUiPlugin;
+import org.eclipse.mylyn.tasks.core.sync.SubmitJobEvent;
+import org.eclipse.mylyn.tasks.ui.TasksUi;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+
+/*
+ * @author Kilian Matt
+ */
+public class ReviewTaskEditorPage extends AbstractTaskEditorPage {
+	private ReviewScope scope;
+
+	public ReviewTaskEditorPage(TaskEditor editor) {
+		super(editor, getConnectorId(editor));
+	}
+
+	private static String getConnectorId(TaskEditor editor) {
+		return ((TaskEditorInput) editor.getEditorInput()).getTaskRepository()
+				.getConnectorKind();
+	}
+
+	@Override
+	public boolean needsSubmitButton() {
+		return true;
+	}
+
+	@Override
+	public void doSubmit() {
+		super.doSubmit();
+	}
+
+	@Override
+	protected void handleTaskSubmitted(SubmitJobEvent event) {
+		super.handleTaskSubmitted(event);
+	}
+
+	@Override
+	protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
+		Set<TaskEditorPartDescriptor> taskDescriptors = new HashSet<TaskEditorPartDescriptor>();
+		taskDescriptors.add(new TaskEditorPartDescriptor(
+				ReviewTaskEditorPart.ID_PART_REVIEW) {
+			@Override
+			public AbstractTaskEditorPart createPart() {
+				return new ReviewTaskEditorPart();
+			}
+		});
+		taskDescriptors.add(new TaskEditorPartDescriptor(ReviewSummaryTaskEditorPart.ID_PART_REVIEWSUMMARY) {
+			
+			@Override
+			public AbstractTaskEditorPart createPart() {
+				return new ReviewSummaryTaskEditorPart();
+			}
+		});
+
+		return taskDescriptors;
+	}
+
+	@Override
+	public void fillToolBar(IToolBarManager toolBarManager) {
+		ToolBarButtonContribution submitButtonContribution = new ToolBarButtonContribution(
+				""org.eclipse.mylyn.reviews.tasks.toolbars.submit"") {
+
+			@Override
+			protected Control createButton(Composite parent) {
+				Button submitButton = new Button(parent, SWT.FLAT);
+				submitButton.setText(""submit review""); //$NON-NLS-1$
+				submitButton.setBackground(null);
+				submitButton.addListener(SWT.Selection, new Listener() {
+					public void handleEvent(Event e) {
+						doSubmit();
+					}
+				});
+				return submitButton;
+			}
+		};
+		submitButtonContribution.marginLeft = 10;
+		toolBarManager.add(submitButtonContribution);
+	}
+
+	public ReviewScope getReviewScope() throws CoreException {
+		if (scope == null) {
+			IReviewMapper mapper = ReviewsUiPlugin.getMapper();
+			scope = mapper.mapTaskToScope(TaskProperties.fromTaskData(
+					TasksUi.getTaskDataManager(), getModel().getTaskData()));
+
+		}
+		return scope;
+	}
+
+	/*package*/ ITreeNode getReviewResults(IProgressMonitor monitor) throws CoreException {
+		return ReviewsUtil
+		.getReviewSubTasksFor(getModel().getTask(),
+				TasksUi.getTaskDataManager(),
+				ReviewsUiPlugin.getMapper(),
+				monitor);
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPageFactory.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPageFactory.java
new file mode 100644
index 00000000..5e8f6fa3
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPageFactory.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
+
+import org.eclipse.mylyn.reviews.tasks.ui.Images;
+import org.eclipse.mylyn.reviews.tasks.ui.Messages;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.forms.editor.IFormPage;
+
+/*
+ * @author Kilian Matt
+ */
+public class ReviewTaskEditorPageFactory extends AbstractTaskEditorPageFactory {
+
+	@Override
+	public boolean canCreatePageFor(TaskEditorInput input) {
+		// TODO restrict reviews to non-new and non-local tasks
+		return true;
+	}
+
+	@Override
+	public IFormPage createPage(TaskEditor parentEditor) {
+		return new ReviewTaskEditorPage(parentEditor);
+	}
+
+	@Override
+	public Image getPageImage() {
+		return Images.SMALL_ICON.createImage();
+	}
+
+	@Override
+	public String getPageText() {
+		return Messages.ReviewTaskEditorPageFactory_PageTitle;
+	}
+
+	@Override
+	public int getPriority() {
+		return PRIORITY_ADDITIONS;
+	}
+
+	@Override
+	public String[] getConflictingIds(TaskEditorInput input) {
+		return new String[0];
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPart.java
similarity index 68%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPart.java
index d0279cfa..38861453 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/ReviewTaskEditorPart.java
@@ -8,17 +8,22 @@
  * Contributors:
  *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.CompareEditorInput;
 import org.eclipse.compare.CompareUI;
-import org.eclipse.compare.patch.IFilePatch2;
-import org.eclipse.compare.patch.PatchConfiguration;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.resource.CompositeImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -28,27 +33,24 @@
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.reviews.core.ReviewData;
-import org.eclipse.mylyn.reviews.core.ReviewsUtil;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.Rating;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
-import org.eclipse.mylyn.reviews.ui.Images;
-import org.eclipse.mylyn.reviews.ui.ReviewDiffModel;
-import org.eclipse.mylyn.reviews.ui.ReviewsUiPlugin;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewFile;
+import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper;
+import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties;
+import org.eclipse.mylyn.reviews.tasks.core.Rating;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewResult;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.internal.TaskProperties;
+import org.eclipse.mylyn.reviews.tasks.ui.Images;
+import org.eclipse.mylyn.reviews.tasks.ui.ReviewsUiPlugin;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.ModifyEvent;
@@ -59,6 +61,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -69,10 +72,12 @@
 /*
  * @author Kilian Matt
  */
-public class ReviewTaskEditorPart extends AbstractTaskEditorPart {
+public class ReviewTaskEditorPart extends AbstractReviewTaskEditorPart {
 	public static final String ID_PART_REVIEW = ""org.eclipse.mylyn.reviews.ui.editors.ReviewTaskEditorPart""; //$NON-NLS-1$
 	private TableViewer fileList;
 	private Composite composite;
+	private ITaskProperties taskProperties;
+	private ComboViewer ratingList;
 
 	public ReviewTaskEditorPart() {
 		setPartName(""Review "");
@@ -94,7 +99,7 @@ public void createControl(Composite parent, FormToolkit toolkit) {
 		composite.setLayout(new GridLayout(1, true));
 
 		fileList = new TableViewer(composite);
-		
+
 		fileList.getControl().setLayoutData(
 				new GridData(SWT.FILL, SWT.FILL, true, true));
 
@@ -106,17 +111,17 @@ public void createControl(Composite parent, FormToolkit toolkit) {
 		TableLayout tableLayout = new TableLayout();
 		tableLayout.addColumnData(new ColumnWeightData(100, true));
 		fileList.getTable().setLayout(tableLayout);
-		
+
 		fileList.setLabelProvider(new TableLabelProvider() {
 			private final int COLUMN_FILE = 0;
 
 			@Override
 			public String getColumnText(Object element, int columnIndex) {
 				if (columnIndex == COLUMN_FILE) {
-					if (element instanceof ReviewDiffModel) {
-						ReviewDiffModel diffModel = ((ReviewDiffModel) element);
+					if (element instanceof IReviewFile) {
+						IReviewFile file = ((IReviewFile) element);
 
-						return diffModel.getFileName();
+						return file.getFileName();
 					}
 				}
 				return null;
@@ -127,12 +132,12 @@ public Image getColumnImage(Object element, int columnIndex) {
 				if (columnIndex == COLUMN_FILE) {
 					ISharedImages sharedImages = PlatformUI.getWorkbench()
 							.getSharedImages();
-					if (element instanceof ReviewDiffModel) {
-						ReviewDiffModel diffModel = ((ReviewDiffModel) element);
-						if (diffModel.isNewFile()) {
+					if (element instanceof IReviewFile) {
+						IReviewFile file = ((IReviewFile) element);
+						if (file.isNewFile()) {
 							return new NewFile().createImage();
 						}
-						if (!diffModel.canReview()) {
+						if (!file.canReview()) {
 							return new MissingFile().createImage();
 						}
 					}
@@ -143,41 +148,17 @@ public Image getColumnImage(Object element, int columnIndex) {
 			}
 		});
 
-		fileList.setContentProvider(new IStructuredContentProvider() {
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-			}
-
-			public void dispose() {
-			}
-
-			public Object[] getElements(Object inputElement) {
-				// parse the patch and create our model for the table
-				Patch patch = (Patch) inputElement;
-				List<IFilePatch2> patches = patch.parse();
-				ReviewDiffModel[] model = new ReviewDiffModel[patches.size()];
-				int index = 0;
-				for (IFilePatch2 currentPatch : patches) {
-					final PatchConfiguration configuration = new PatchConfiguration();
-					currentPatch.getTargetPath(configuration);
-					model[index++] = new ReviewDiffModel(currentPatch,
-							configuration);
-
-				}
-				return model;
-			}
-		});
+		fileList.setContentProvider(ArrayContentProvider.getInstance());
 		fileList.addDoubleClickListener(new IDoubleClickListener() {
 
 			public void doubleClick(DoubleClickEvent event) {
 				ISelection selection = event.getSelection();
 				if (selection instanceof IStructuredSelection) {
 					IStructuredSelection sel = (IStructuredSelection) selection;
-					if (sel.getFirstElement() instanceof ReviewDiffModel) {
-						final ReviewDiffModel diffModel = ((ReviewDiffModel) sel
+					if (sel.getFirstElement() instanceof IReviewFile) {
+						final IReviewFile file = ((IReviewFile) sel
 								.getFirstElement());
-						if (diffModel.canReview()) {
+						if (file.canReview()) {
 							CompareConfiguration configuration = new CompareConfiguration();
 							configuration.setLeftEditable(false);
 							configuration.setRightEditable(false);
@@ -192,15 +173,14 @@ public void doubleClick(DoubleClickEvent event) {
 									.setProperty(
 											CompareConfiguration.USE_OUTLINE_VIEW,
 											true);
-							CompareUI.openCompareEditor(new CompareEditorInput(
-									configuration) {
+							CompareUI.openCompareEditor(new CompareEditorInput(configuration) {
 
 								@Override
 								protected Object prepareInput(
 										IProgressMonitor monitor)
 										throws InvocationTargetException,
 										InterruptedException {
-									return diffModel.getCompareInput();
+									return file.getCompareInput();
 								}
 							}, true);
 						}
@@ -208,7 +188,6 @@ protected Object prepareInput(
 				}
 			}
 		});
-		setInput();
 
 		createResultFields(composite, toolkit);
 
@@ -227,23 +206,41 @@ protected Object prepareInput(
 
 		setSection(toolkit, section);
 
+		SafeRunner.run(new ISafeRunnable() {
+			
+			@Override
+			public void run() throws Exception {
+				final List<IReviewFile> files = getInput();
+				Display.getCurrent().asyncExec(new Runnable() {
+					@Override
+					public void run() {
+						fileList.setInput(files);	
+					}
+				});
+				
+			}
+			
+			@Override
+			public void handleException(Throwable exception) {
+				exception.printStackTrace();
+			}
+			private List<IReviewFile> getInput() throws CoreException {
+				List<IReviewFile> files = new ArrayList<IReviewFile>();
+				ReviewScope reviewScope = getReviewScope();
+				if (reviewScope != null) {
+					// FIXME parse all scopes
+					for (ReviewScopeItem scopeItem : reviewScope.getItems()) {
+						files.addAll(scopeItem
+								.getReviewFiles(new NullProgressMonitor()));
+					}
+				}
+				return files;
+			}
+
+		});
 	}
 
 	private void createResultFields(Composite composite, FormToolkit toolkit) {
-
-		final Review review;
-		final ReviewData rd = ReviewsUiPlugin.getDataManager().getReviewData(
-				getModel().getTask());
-		if (rd != null) {
-			review = rd.getReview();
-		} else {
-			review = parseFromAttachments();
-			if (review != null) {
-				ReviewsUiPlugin.getDataManager().storeTask(
-						getModel().getTask(), review);
-			}
-		}
-
 		Composite resultComposite = toolkit.createComposite(composite);
 		toolkit.paintBordersFor(resultComposite);
 		resultComposite.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true,
@@ -257,24 +254,22 @@ private void createResultFields(Composite composite, FormToolkit toolkit) {
 		ratingsCombo.setData(FormToolkit.KEY_DRAW_BORDER,
 				FormToolkit.TREE_BORDER);
 		toolkit.adapt(ratingsCombo, false, false);
-
-		final ComboViewer ratingList = new ComboViewer(ratingsCombo);
-
+		ratingList = new ComboViewer(ratingsCombo);
 		ratingList.setContentProvider(ArrayContentProvider.getInstance());
 		ratingList.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				// TODO externalize string
-				return ((Rating) element).getName();
+				return ((Rating) element).name();
 			}
 
 			@Override
 			public Image getImage(Object element) {
 				Rating rating = ((Rating) element);
 				switch (rating) {
-				case FAILED:
+				case FAIL:
 					return Images.REVIEW_RESULT_FAILED.createImage();
-				case NONE:
+				case TODO:
 					return Images.REVIEW_RESULT_NONE.createImage();
 				case PASSED:
 					return Images.REVIEW_RESULT_PASSED.createImage();
@@ -284,33 +279,30 @@ public Image getImage(Object element) {
 				return super.getImage(element);
 			}
 		});
-		ratingList.setInput(Rating.VALUES);
+		ratingList.setInput(Rating.values());
 		ratingList.getControl().setLayoutData(
 				new GridData(SWT.LEFT, SWT.TOP, false, false));
 
 		toolkit.createLabel(resultComposite, ""Rating comment:"").setForeground(
 				toolkit.getColors().getColor(IFormColors.TITLE));
-		final Text commentText = toolkit.createText(resultComposite, """", SWT.MULTI);
-		
+		final Text commentText = toolkit.createText(resultComposite, """",
+				SWT.MULTI);
+
 		GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
 		gd.heightHint = 100;
 		commentText.setLayoutData(gd);
+		final ReviewResult result = getCurrentResultOrNew();
 
-		if (review.getResult() != null) {
-			Rating rating = review.getResult().getRating();
-			ratingList.setSelection(new StructuredSelection(rating));
-			String comment = review.getResult().getText();
-			commentText.setText(comment != null ? comment : """");
-		}
+		// FIXME selection for rating
+		if (result.getRating() != null)
+			ratingList.getCCombo().select(result.getRating().ordinal());
+		if (result.getComment() != null)
+			commentText.setText(result.getComment());
 		commentText.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent e) {
-				if (review.getResult() == null) {
-					review.setResult(ReviewFactory.eINSTANCE
-							.createReviewResult());
-				}
-				review.getResult().setText(commentText.getText());
-				rd.setDirty();
+				result.setComment(commentText.getText());
+
 			}
 		});
 		ratingList.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -318,46 +310,65 @@ public void modifyText(ModifyEvent e) {
 			public void selectionChanged(SelectionChangedEvent event) {
 				Rating rating = (Rating) ((IStructuredSelection) event
 						.getSelection()).getFirstElement();
-				if (review.getResult() == null) {
-					review.setResult(ReviewFactory.eINSTANCE
-							.createReviewResult());
-				}
-				review.getResult().setRating(rating);
-				rd.setDirty();
+
+				result.setRating(rating);
 			}
 		});
+		registerEditOperations(result);
+	}
 
+	private ReviewResult getCurrentResultOrNew() {
+		ReviewResult result = getCurrentResult();
+		if (result == null) {
+			result = new ReviewResult();
+		}
+		return result;
 	}
 
-	private Review parseFromAttachments() {
-		try {
-			final TaskDataModel model = getModel();
-			List<Review> reviews = ReviewsUtil.getReviewAttachmentFromTask(
-					TasksUi.getTaskDataManager(), TasksUi.getRepositoryModel(),
-					model.getTask());
+	void registerEditOperations(ReviewResult result) {
+		final IReviewMapper mapper = ReviewsUiPlugin.getMapper();
+		PropertyChangeListener listener = new PropertyChangeListener() {
 
-			if (reviews.size() > 0) {
-				return reviews.get(0);
+			@Override
+			public void propertyChange(PropertyChangeEvent arg0) {
+				ReviewResult result = (ReviewResult) arg0.getSource();
+
+				mapper.mapResultToTask(result, getTaskProperties());
+				// FIXME
+				getModel().attributeChanged(
+						getModel().getTaskData().getRoot()
+								.getMappedAttribute(TaskAttribute.COMMENT_NEW));
 			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 
-		return null;
+		};
+		result.addPropertyChangeListener(""comment"", listener);
+		result.addPropertyChangeListener(""rating"", listener);
+	}
+
+	private ITaskProperties getTaskProperties() {
+		if (taskProperties == null) {
+			taskProperties = TaskProperties.fromTaskData(
+					TasksUi.getTaskDataManager(), getTaskData());
+
+		}
+		return taskProperties;
 	}
 
 	/**
 	 * Retrieves the review from the review data manager and fills the left
 	 * table with the files.
+	 * 
+	 * @return
 	 */
-	private void setInput() {
-		ReviewData rd = ReviewsUiPlugin.getDataManager().getReviewData(
-				getModel().getTask());
-		if (rd != null) {
-			fileList.setInput((rd.getReview().getScope().get(0)));
-		}
+	private ReviewResult getCurrentResult() {
+		ITaskProperties taskProperties = getTaskProperties();
+
+		final IReviewMapper mapper = ReviewsUiPlugin.getMapper();
+		ReviewResult res = mapper.mapCurrentReviewResult(taskProperties);
+		return res;
 	}
 
+
 	private static class MissingFile extends CompositeImageDescriptor {
 		ISharedImages sharedImages = PlatformUI.getWorkbench()
 				.getSharedImages();
@@ -415,6 +426,10 @@ private ImageData getBaseImageData() {
 
 	}
 
+	private ReviewScope getReviewScope() throws CoreException {
+		return getReviewPage().getReviewScope();
+	}
+
 	@Override
 	protected void fillToolBar(ToolBarManager manager) {
 		// Depends on 288171
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/TableLabelProvider.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/TableLabelProvider.java
similarity index 95%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/TableLabelProvider.java
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/TableLabelProvider.java
index 22d00865..7289bf28 100644
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/TableLabelProvider.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/TableLabelProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Christoph Mayerhofer (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
+package org.eclipse.mylyn.reviews.tasks.ui.editors;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/messages.properties b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/messages.properties
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/messages.properties
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/editors/messages.properties
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/messages.properties b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/messages.properties
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/messages.properties
rename to tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/messages.properties
diff --git a/tbr/org.eclipse.mylyn.reviews/.project b/tbr/org.eclipse.mylyn.reviews.tasks/.project
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews/.project
rename to tbr/org.eclipse.mylyn.reviews.tasks/.project
diff --git a/tbr/org.eclipse.mylyn.reviews/build.properties b/tbr/org.eclipse.mylyn.reviews.tasks/build.properties
similarity index 100%
rename from tbr/org.eclipse.mylyn.reviews/build.properties
rename to tbr/org.eclipse.mylyn.reviews.tasks/build.properties
diff --git a/tbr/org.eclipse.mylyn.reviews/feature.xml b/tbr/org.eclipse.mylyn.reviews.tasks/feature.xml
similarity index 97%
rename from tbr/org.eclipse.mylyn.reviews/feature.xml
rename to tbr/org.eclipse.mylyn.reviews.tasks/feature.xml
index 1bcecf9a..e83cd07c 100644
--- a/tbr/org.eclipse.mylyn.reviews/feature.xml
+++ b/tbr/org.eclipse.mylyn.reviews.tasks/feature.xml
@@ -1,7 +1,7 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <feature
-      id=""org.eclipse.mylyn.reviews""
-      label=""Mylyn Reviews (Incubation)""
+      id=""org.eclipse.mylyn.reviews.tasks""
+      label=""Mylyn Reviews TBR (Incubation)""
       version=""0.0.1""
       provider-name=""Mylyn Reviews Team"">
 
@@ -68,14 +68,14 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </license>
 
    <plugin
-         id=""org.eclipse.mylyn.reviews.core""
+         id=""org.eclipse.mylyn.reviews.tasks.core""
          download-size=""0""
          install-size=""0""
          version=""0.0.0""
          unpack=""false""/>
 
    <plugin
-         id=""org.eclipse.mylyn.reviews.ui""
+         id=""org.eclipse.mylyn.reviews.tasks.ui""
          download-size=""0""
          install-size=""0""
          version=""0.0.0""
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index cf178a13..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Reviews UI (Incubation)
-Bundle-SymbolicName: org.eclipse.mylyn.reviews.ui;singleton:=true
-Bundle-Version: 0.0.1
-Bundle-Activator: org.eclipse.mylyn.reviews.ui.ReviewsUiPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.mylyn.tasks.ui;bundle-version=""3.5.0"",
- org.eclipse.ui.forms;bundle-version=""3.4.1"",
- org.eclipse.mylyn.tasks.core;bundle-version=""3.3.0"",
- org.eclipse.compare;bundle-version=""3.5.0"",
- org.eclipse.mylyn.reviews.core;bundle-version=""0.0.1"",
- org.eclipse.emf.ecore.change;bundle-version=""2.5.0"",
- org.eclipse.mylyn.bugzilla.ui;bundle-version=""3.4.0"",
- org.eclipse.core.resources;bundle-version=""3.6.0""
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.mylyn.reviews.ui,
- org.eclipse.mylyn.reviews.ui.editors
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java
deleted file mode 100644
index 242ceda5..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.mylyn.reviews.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.reviews.core.ReviewConstants;
-import org.eclipse.mylyn.reviews.core.ReviewsUtil;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
-import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.ITaskDataWorkingCopy;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
-import org.eclipse.mylyn.tasks.core.data.TaskMapper;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.ui.IActionDelegate;
-
-public class CreateReviewAction extends Action implements IActionDelegate {
-
-	private ITaskAttachment attachment;
-
-	public void run(IAction action) {
-		if (attachment != null) {
-			try {
-				ITaskDataWorkingCopy taskDataState = TasksUiPlugin
-						.getTaskDataManager().getWorkingCopy(
-								attachment.getTask());
-				TaskDataModel model = new TaskDataModel(
-						attachment.getTaskRepository(), attachment.getTask(),
-						taskDataState);
-				
-				performFinish(model, new PatchCreator(attachment.getTaskAttribute()).create());
-			} catch (CoreException e) {
-				throw new RuntimeException(e);
-			}
-		}
-
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(false);
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			if (structuredSelection.size() == 1) {
-				attachment = (ITaskAttachment) structuredSelection
-						.getFirstElement();
-				if (attachment.isPatch()) {
-					action.setEnabled(true);
-				}
-			}
-		}
-	}
-
-	
-	public boolean performFinish(TaskDataModel model,ScopeItem scope) {
-		String reviewer=model.getTaskRepository().getUserName();
-		try {
-			Review review = ReviewFactory.eINSTANCE.createReview();
-			review.getScope().add(scope);
-			TaskRepository taskRepository=model.getTaskRepository();
-			ITask newTask = TasksUiUtil.createOutgoingNewTask(taskRepository.getConnectorKind(), taskRepository.getRepositoryUrl());
-
-			ReviewsUtil.markAsReview(newTask);
-			TaskMapper initializationData=new TaskMapper(model.getTaskData());
-			TaskData taskData = TasksUiInternal.createTaskData(taskRepository, initializationData, null,
-					new NullProgressMonitor());
-			AbstractRepositoryConnector connector=TasksUiPlugin.getConnector(taskRepository.getConnectorKind());
-			connector.getTaskDataHandler().initializeSubTaskData(
-					taskRepository, taskData, model.getTaskData(),
-					new NullProgressMonitor());
-
-			
-			taskData.getRoot().getMappedAttribute(TaskAttribute.SUMMARY).setValue(""Review of "" + model.getTask().getSummary());
-			taskData.getRoot().getMappedAttribute(TaskAttribute.USER_ASSIGNED).setValue(reviewer);
-			taskData.getRoot().getMappedAttribute(TaskAttribute.DESCRIPTION).setValue(""Review of "" + model.getTask().getSummary() );
-
-			ReviewsUiPlugin.getDataManager().storeOutgoingTask(newTask, review);
-			
-			
-			TasksUiInternal.createAndOpenNewTask(newTask, taskData);
-		} catch (CoreException e1) {
-			throw new RuntimeException(e1);
-		}
-
-		return true;
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateTask.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateTask.java
deleted file mode 100644
index fda72779..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateTask.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
-
-import java.io.ByteArrayOutputStream;
-import java.util.TreeSet;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskMigrator;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.reviews.core.ReviewConstants;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
-import org.eclipse.mylyn.tasks.core.sync.SubmitJob;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-
-/*
- * @author Kilian Matt
- */
-public class CreateTask extends Job {
-
-	private TaskDataModel model;
-	private Review review;
-	private TaskRepository taskRepository;
-	private AbstractRepositoryConnector connector;
-	private String reviewer;
-
-	public CreateTask(TaskDataModel model, Review review, String reviewer) {
-		super(Messages.CreateTask_Title);
-		this.model = model;
-		this.review = review;
-
-		this.taskRepository = model.getTaskRepository();
-
-		this.connector = TasksUi.getRepositoryConnector(taskRepository
-				.getConnectorKind());
-		this.reviewer = reviewer;
-	}
-
-	@Override
-	protected IStatus run(final IProgressMonitor monitor) {
-		try {
-
-			final ITask newLocalTask = TasksUiUtil.createOutgoingNewTask(
-					taskRepository.getConnectorKind(),
-					taskRepository.getRepositoryUrl());
-
-			TaskAttributeMapper mapper = connector.getTaskDataHandler()
-					.getAttributeMapper(taskRepository);
-
-			final TaskData data = new TaskData(mapper,
-					taskRepository.getConnectorKind(),
-					taskRepository.getRepositoryUrl(), """"); //$NON-NLS-1$
-
-			connector.getTaskDataHandler().initializeSubTaskData(
-					taskRepository, data, model.getTaskData(),
-					new NullProgressMonitor());
-
-			if (reviewer != null && reviewer.isEmpty()) {
-				createAttribute(data,TaskAttribute.USER_ASSIGNED,reviewer);
-			}
-
-			createAttribute(data,TaskAttribute.SUMMARY,
-							""Review of "" + model.getTask().getTaskKey() + "" "" + model.getTask().getSummary()); //$NON-NLS-1$ //$NON-NLS-2$
-
-			createAttribute(data,TaskAttribute.COMPONENT,
-							model.getTaskData()
-									.getRoot()
-									.getMappedAttribute(TaskAttribute.COMPONENT)
-									.getValue());
-			createAttribute(data,TaskAttribute.STATUS, ""NEW""); //$NON-NLS-1$
-			createAttribute(data,TaskAttribute.VERSION,
-							model.getTaskData().getRoot()
-									.getMappedAttribute(TaskAttribute.VERSION)
-									.getValue());
-			createAttribute(data,TaskAttribute.PRODUCT,
-							model.getTaskData().getRoot()
-									.getMappedAttribute(TaskAttribute.PRODUCT)
-									.getValue());
-
-			final byte[] attachmentBytes = createAttachment(model, review);
-
-			final SubmitJob submitJob = TasksUiInternal.getJobFactory()
-					.createSubmitTaskJob(connector, taskRepository,
-							newLocalTask, data, new TreeSet<TaskAttribute>());
-			submitJob.schedule();
-			submitJob.join();
-
-			if (submitJob.getStatus() == null) {
-				ITask newRepoTask = submitJob.getTask();
-
-				TaskMigrator migrator = new TaskMigrator(newLocalTask);
-				migrator.setDelete(true);
-				migrator.execute(newRepoTask);
-
-				TaskAttribute attachmentAttribute = data.getAttributeMapper()
-						.createTaskAttachment(data);
-				try {
-					ReviewCommentTaskAttachmentSource attachment = new ReviewCommentTaskAttachmentSource(
-							attachmentBytes);
-
-					monitor.subTask(Messages.CreateTask_UploadingAttachment);
-					connector.getTaskAttachmentHandler().postContent(
-							taskRepository, newRepoTask, attachment,
-							""review result"", //$NON-NLS-1$
-							attachmentAttribute, monitor);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-
-				return new ReviewStatus(Messages.CreateTask_Success,
-						newRepoTask);
-			}
-			return new Status(IStatus.WARNING, ReviewsUiPlugin.PLUGIN_ID, """");
-		} catch (Exception e) {
-			return new Status(IStatus.ERROR, ReviewsUiPlugin.PLUGIN_ID,
-					e.getMessage());
-		}
-	}
-	private TaskAttribute createAttribute( TaskData taskData, String mappedAttributeName, String value) {
-		TaskAttribute attribute = taskData.getRoot().createMappedAttribute(mappedAttributeName);
-		attribute.setValue(value);
-		return attribute;
-	}
-
-	private byte[] createAttachment(TaskDataModel model, Review review) {
-		try {
-			ResourceSet resourceSet = new ResourceSetImpl();
-
-			Resource resource = resourceSet.createResource(URI
-					.createFileURI("""")); //$NON-NLS-1$
-
-			resource.getContents().add(review);
-			resource.getContents().add(review.getScope().get(0));
-			if(review.getResult()!=null)
-				resource.getContents().add(review.getResult());
-			ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-			ZipOutputStream outputStream = new ZipOutputStream(
-					byteArrayOutputStream);
-			outputStream.putNextEntry(new ZipEntry(
-					ReviewConstants.REVIEW_DATA_FILE));
-			resource.save(outputStream, null);
-			outputStream.closeEntry();
-			outputStream.close();
-			return byteArrayOutputStream.toByteArray();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/PatchCreator.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/PatchCreator.java
deleted file mode 100644
index 5fc79751..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/PatchCreator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Date;
-import java.util.logging.Logger;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.internal.tasks.core.RepositoryModel;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-
-/**
- * @author Kilian Matt
- */
-public class PatchCreator implements IPatchCreator {
-
-	private static final Logger log = Logger.getAnonymousLogger();
-	private TaskAttribute attribute;
-
-	public PatchCreator(TaskAttribute attribute) {
-		this.attribute = attribute;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.ui.IPatchCreator#create()
-	 */
-	public Patch create() throws CoreException {
-		try {
-			ITaskAttachment taskAttachment = getTaskAttachment();
-			URL url = new URL(attribute.getMappedAttribute(
-					TaskAttribute.ATTACHMENT_URL).getValue());
-			Patch patch = ReviewFactory.eINSTANCE.createPatch();
-			patch.setAuthor(taskAttachment.getAuthor().getName());
-			patch.setCreationDate(taskAttachment.getCreationDate());
-			patch.setContents(readContents(url));
-			patch.setFileName(taskAttachment.getFileName());
-			return patch;
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.warning(e.toString());
-			throw new CoreException(new Status(IStatus.ERROR,
-					ReviewsUiPlugin.PLUGIN_ID,
-					Messages.PatchCreator_ReaderCreationFailed, e));
-		}
-	}
-
-	private ITaskAttachment taskAttachment;
-
-	private ITaskAttachment getTaskAttachment() {
-		if (taskAttachment == null) {
-			// TODO move RepositoryModel.createTaskAttachment to interface?
-			taskAttachment = ((RepositoryModel) TasksUi.getRepositoryModel())
-					.createTaskAttachment(attribute);
-			// new TaskAttachment(repository, task, attribute);
-			// attributeMapper.updateTaskAttachment(taskAttachment, attribute);
-		}
-		return taskAttachment;
-	}
-
-	private String readContents(URL url) throws IOException {
-		InputStream stream = null;
-		try {
-			stream = url.openStream();
-			InputStreamReader reader = new InputStreamReader(stream);
-			char[] buffer = new char[256];
-			int readChars = 0;
-			StringBuilder sb = new StringBuilder();
-			while ((readChars = reader.read(buffer)) > 0) {
-				sb.append(buffer, 0, readChars);
-			}
-			return sb.toString();
-		} finally {
-			if (stream != null)
-				try {
-					stream.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-
-	}
-
-	@Override
-	public String toString() {
-		return attribute.getMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME)
-				.getValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.ui.IPatchCreator#getFileName()
-	 */
-	public String getFileName() {
-		return getTaskAttachment().getFileName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.ui.IPatchCreator#getAuthor()
-	 */
-	public String getAuthor() {
-		return getTaskAttachment().getAuthor().getName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.ui.IPatchCreator#getCreationDate()
-	 */
-	public Date getCreationDate() {
-		return getTaskAttachment().getCreationDate();
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewCommentTaskAttachmentSource.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewCommentTaskAttachmentSource.java
deleted file mode 100644
index d3fdbe0f..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewCommentTaskAttachmentSource.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.reviews.core.ReviewConstants;
-import org.eclipse.mylyn.tasks.core.data.AbstractTaskAttachmentSource;
-
-/*
- * @author Kilian Matt
- */
-public class ReviewCommentTaskAttachmentSource extends
-		AbstractTaskAttachmentSource {
-
-	private byte[] source;
-
-	public ReviewCommentTaskAttachmentSource(byte[] source) {
-		this.source = source;
-	}
-
-	@Override
-	public InputStream createInputStream(IProgressMonitor monitor)
-			throws CoreException {
-		return new ByteArrayInputStream(source);
-	}
-
-	@Override
-	public String getContentType() {
-		return ""application/octet-stream""; //$NON-NLS-1$
-	}
-
-	@Override
-	public String getDescription() {
-		return Messages.ReviewCommentTaskAttachmentSource_Description;
-	}
-
-	@Override
-	public long getLength() {
-		return source.length;
-	}
-
-	@Override
-	public String getName() {
-		return ReviewConstants.REVIEW_DATA_CONTAINER;
-	}
-
-	@Override
-	public boolean isLocal() {
-		return true;
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewStatus.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewStatus.java
deleted file mode 100644
index e2f5c433..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewStatus.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.mylyn.reviews.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-public class ReviewStatus extends Status {
-	private ITask task;
-
-	public ReviewStatus(String message, ITask task) {
-		super(IStatus.OK, ReviewsUiPlugin.PLUGIN_ID, message);
-		this.task = task;
-	}
-
-	public ITask getTask() {
-		return task;
-	}
-
-}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/NewReviewTaskEditorInput.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/NewReviewTaskEditorInput.java
deleted file mode 100644
index 9356bf7c..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/NewReviewTaskEditorInput.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
-
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
-
-/*
- * @author Kilian Matt
- */
-public class NewReviewTaskEditorInput extends ReviewTaskEditorInput {
-
-	private TaskDataModel model;
-
-	public NewReviewTaskEditorInput(TaskDataModel model, Patch patch) {
-		super(ReviewFactory.eINSTANCE.createReview());
-		this.model = model;
-		getReview().getScope().add(patch);
-	}
-
-	@Override
-	public String getName() {
-		return Messages.NewReviewTaskEditorInput_ReviewPrefix + model.getTask().getTaskKey() + "" "" //$NON-NLS-2$
-				+ model.getTask().toString();
-	}
-
-	public TaskDataModel getModel() {
-		return model;
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSummaryPartConfigurer.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSummaryPartConfigurer.java
deleted file mode 100644
index bd1127c1..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSummaryPartConfigurer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.mylyn.reviews.ui.editors;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.mylyn.internal.tasks.core.RepositoryModel;
-import org.eclipse.mylyn.tasks.core.IRepositoryModel;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
-import org.eclipse.mylyn.tasks.ui.editors.ITaskEditorPartDescriptorAdvisor;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor;
-
-public class ReviewSummaryPartConfigurer implements
-		ITaskEditorPartDescriptorAdvisor {
-
-	public boolean canCustomize(ITask task) {
-		try {
-
-			// TODO change to detecting review sub tasks!
-
-			TaskData taskData = TasksUi.getTaskDataManager().getTaskData(task);
-			IRepositoryModel repositoryModel = TasksUi.getRepositoryModel();
-			if (taskData != null) {
-				List<TaskAttribute> attributesByType = taskData
-						.getAttributeMapper().getAttributesByType(taskData,
-								TaskAttribute.TYPE_ATTACHMENT);
-				for (TaskAttribute attribute : attributesByType) {
-					// TODO move RepositoryModel.createTaskAttachment to
-					// interface?
-					ITaskAttachment taskAttachment = ((RepositoryModel) repositoryModel)
-							.createTaskAttachment(attribute);
-					if (taskAttachment.isPatch())
-						return true;
-
-				}
-			}
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return false;
-	}
-
-	public Set<String> getBlockingIds(ITask task) {
-		return Collections.emptySet();
-	}
-
-	public Set<String> getBlockingPaths(ITask task) {
-		return Collections.emptySet();
-	}
-
-	public Set<TaskEditorPartDescriptor> getPartContributions(ITask task) {
-		Set<TaskEditorPartDescriptor> descriptors = new HashSet<TaskEditorPartDescriptor>();
-		descriptors.add(new TaskEditorPartDescriptor(
-				ReviewSummaryTaskEditorPart.ID_PART_REVIEWSUMMARY) {
-
-			@Override
-			public AbstractTaskEditorPart createPart() {
-				return new ReviewSummaryTaskEditorPart();
-			}
-		});
-		return descriptors;
-	}
-
-	public void afterSubmit(ITask task) {
-	}
-
-	public void prepareSubmit(ITask task) {
-	}
-
-	public void taskMigration(ITask oldTask, ITask newTask) {
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSummaryTaskEditorPart.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSummaryTaskEditorPart.java
deleted file mode 100644
index 48900dd4..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewSummaryTaskEditorPart.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.reviews.core.ReviewSubTask;
-import org.eclipse.mylyn.reviews.core.ReviewsUtil;
-import org.eclipse.mylyn.reviews.core.model.review.Rating;
-import org.eclipse.mylyn.reviews.ui.Images;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskContainer;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/*
- * @author Kilian Matt
- */
-public class ReviewSummaryTaskEditorPart extends AbstractTaskEditorPart {
-
-	public static final String ID_PART_REVIEWSUMMARY = ""org.eclipse.mylyn.reviews.ui.editors.parts.reviewsummary""; //$NON-NLS-1$
-	private Section summarySection;
-
-	public ReviewSummaryTaskEditorPart() {
-		setPartName(Messages.ReviewSummaryTaskEditorPart_Partname);
-	}
-
-	@Override
-	public void createControl(final Composite parent, FormToolkit toolkit) {
-		summarySection = createSection(parent, toolkit,
-				ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
-						| ExpandableComposite.EXPANDED);
-		summarySection.setLayout(new FillLayout(SWT.HORIZONTAL));
-		summarySection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
-				true));
-		// summarySection.setText(Messages.ReviewSummaryTaskEditorPart_Partname);
-		Composite reviewResultsComposite = toolkit
-				.createComposite(summarySection);
-		toolkit.paintBordersFor(reviewResultsComposite);
-		reviewResultsComposite.setLayout(new GridLayout(1, false));
-
-		TableViewer reviewResults = createResultsTableViewer(
-				reviewResultsComposite, toolkit);
-		reviewResults.getControl().setLayoutData(
-				new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		summarySection.setClient(reviewResultsComposite);
-	}
-
-	private TableViewerColumn createColumn(TableViewer parent,
-			String columnTitle) {
-		TableViewerColumn column = new TableViewerColumn(parent, SWT.LEFT);
-		column.getColumn().setText(columnTitle);
-		column.getColumn().setWidth(100);
-		column.getColumn().setResizable(true);
-		return column;
-	}
-
-	private TableViewer createResultsTableViewer(
-			Composite reviewResultsComposite, FormToolkit toolkit) {
-		Table table = toolkit.createTable(reviewResultsComposite, SWT.SINGLE
-				| SWT.FULL_SELECTION);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		table.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
-
-		TableViewer reviewResults = new TableViewer(table);
-		createColumn(reviewResults,
-				Messages.ReviewSummaryTaskEditorPart_Header_ReviewId);
-		createColumn(reviewResults,
-				Messages.ReviewSummaryTaskEditorPart_Header_Scope);
-		createColumn(reviewResults,
-				Messages.ReviewSummaryTaskEditorPart_Header_Author);
-		createColumn(reviewResults,
-				Messages.ReviewSummaryTaskEditorPart_Header_Reviewer);
-		createColumn(reviewResults,
-				Messages.ReviewSummaryTaskEditorPart_Header_Result);
-
-		createColumn(reviewResults,
-				Messages.ReviewSummaryTaskEditorPart_Header_Comment);
-
-		reviewResults.setContentProvider(new IStructuredContentProvider() {
-
-			public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
-			}
-
-			public void dispose() {
-			}
-
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof ITaskContainer) {
-					ITaskContainer taskContainer = (ITaskContainer) inputElement;
-					List<ReviewSubTask> reviewSubTasks = ReviewsUtil
-							.getReviewSubTasksFor(taskContainer,
-									TasksUi.getTaskDataManager(),
-									TasksUi.getRepositoryModel(),
-									new NullProgressMonitor());
-					int passedCount = 0;
-					int warningCount = 0;
-					int failedCount = 0;
-					int noResultCount = 0;
-					for (ReviewSubTask subtask : reviewSubTasks) {
-							switch (subtask.getResult()) {
-							case PASSED:
-								passedCount++;
-								break;
-							case WARNING:
-								warningCount++;
-								break;
-							case FAILED:
-								failedCount++;
-								break;
-							case NONE:
-								noResultCount++;
-								break;
-
-							}
-					}
-
-					summarySection.setText(String
-							.format(""Review Summary (PASSED: %s / WARNING: %s / FAILED: %s / ?: %s)"",
-									passedCount, warningCount, failedCount,
-									noResultCount));
-					return reviewSubTasks
-							.toArray(new ReviewSubTask[reviewSubTasks.size()]);
-				}
-				return null;
-			}
-		});
-
-		reviewResults.setLabelProvider(new TableLabelProvider() {
-			private static final int COLUMN_ID = 0;
-			private static final int COLUMN_PATCHFILE = 1;
-			private static final int COLUMN_AUTHOR = 2;
-			private static final int COLUMN_REVIEWER = 3;
-			private static final int COLUMN_RESULT = 4;
-			private static final int COLUMN_COMMENT = 5;
-
-			public Image getColumnImage(Object element, int columnIndex) {
-				if (columnIndex == COLUMN_RESULT) {
-					ReviewSubTask subtask = (ReviewSubTask) element;
-					switch (subtask.getResult()) {
-					case FAILED:
-						return Images.REVIEW_RESULT_FAILED.createImage();
-					case WARNING:
-						return Images.REVIEW_RESULT_WARNING.createImage();
-					case PASSED:
-						return Images.REVIEW_RESULT_PASSED.createImage();
-					case NONE:
-						return Images.REVIEW_RESULT_NONE.createImage();
-
-					}
-				}
-				return null;
-			}
-
-			public String getColumnText(Object element, int columnIndex) {
-
-				ReviewSubTask subtask = (ReviewSubTask) element;
-				switch (columnIndex) {
-				case COLUMN_ID:
-					return subtask.getTask().getTaskId();
-				case COLUMN_PATCHFILE:
-					return subtask.getPatchDescription();
-				case COLUMN_AUTHOR:
-					return subtask.getAuthor();
-				case COLUMN_REVIEWER:
-					return subtask.getReviewer();
-				case COLUMN_RESULT:
-					return subtask.getResult().getName();
-				case COLUMN_COMMENT:
-					return subtask.getComment();
-				default:
-					return null;
-				}
-			}
-
-		});
-		reviewResults.setInput(getModel().getTask());
-		reviewResults.addDoubleClickListener(new IDoubleClickListener() {
-
-			public void doubleClick(DoubleClickEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					ITask task = ((ReviewSubTask) ((IStructuredSelection) event
-							.getSelection()).getFirstElement()).getTask();
-					TasksUiUtil.openTask(task);
-				}
-			}
-		});
-		return reviewResults;
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorInput.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorInput.java
deleted file mode 100644
index c9020428..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorInput.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.compare.patch.IFilePatch2;
-import org.eclipse.compare.patch.PatchConfiguration;
-import org.eclipse.compare.patch.PatchParser;
-import org.eclipse.compare.patch.ReaderCreator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.reviews.core.model.review.Patch;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.ui.Images;
-import org.eclipse.mylyn.reviews.ui.ReviewDiffModel;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-/*
- * @author Kilian Matt
- */
-public class ReviewTaskEditorInput implements IEditorInput {
-
-	private Review review;
-
-	public ReviewTaskEditorInput(Review review) {
-		this.review = review;
-	}
-
-	public Review getReview() {
-		return review;
-	}
-
-	public boolean exists() {
-		return false;
-	}
-
-	public ImageDescriptor getImageDescriptor() {
-		return Images.SMALL_ICON;
-	}
-
-	public String getName() {
-		// TODO
-		return Messages.ReviewTaskEditorInput_New_Review;//""Review of"" + model.getTask().getTaskKey() + "" "" +
-							// model.getTask().toString();
-	}
-
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-
-	public String getToolTipText() {
-		return Messages.NewReviewTaskEditorInput_Tooltip;
-	}
-
-	@SuppressWarnings(""rawtypes"")
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-	public List<ReviewDiffModel> getScope() {
-		try {
-
-			IFilePatch2[] patches = PatchParser.parsePatch(new ReaderCreator() {
-
-				@Override
-				public Reader createReader() throws CoreException {
-					return new InputStreamReader(new ByteArrayInputStream(
-							((Patch) review.getScope().get(0)).getContents()
-									.getBytes()));
-				}
-			});
-			List<ReviewDiffModel> model = new ArrayList<ReviewDiffModel>();
-			for (int i = 0; i < patches.length; i++) {
-				final PatchConfiguration configuration = new PatchConfiguration();
-
-				final IFilePatch2 currentPatch = patches[i];
-				model.add(new ReviewDiffModel(currentPatch, configuration));
-			}
-			return model;
-		} catch (Exception ex) {
-			ex.printStackTrace();
-			throw new RuntimeException(ex);
-		}
-	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java
deleted file mode 100644
index 2e4b4ddb..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.mylyn.reviews.ui.editors;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.reviews.core.ReviewConstants;
-import org.eclipse.mylyn.reviews.core.ReviewData;
-import org.eclipse.mylyn.reviews.core.ReviewDataManager;
-import org.eclipse.mylyn.reviews.core.ReviewsUtil;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.ui.ReviewCommentTaskAttachmentSource;
-import org.eclipse.mylyn.reviews.ui.ReviewsUiPlugin;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryModel;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
-import org.eclipse.mylyn.tasks.ui.editors.ITaskEditorPartDescriptorAdvisor;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor;
-
-public class ReviewTaskEditorPartAdvisor implements
-		ITaskEditorPartDescriptorAdvisor {
-
-	public boolean canCustomize(ITask task) {
-		if (!ReviewsUtil.hasReviewMarker(task)) {
-			try {
-				IRepositoryModel repositoryModel = TasksUi.getRepositoryModel();
-				TaskData taskData = TasksUiPlugin.getTaskDataManager()
-						.getTaskData(task);
-				if (ReviewsUtil.getReviewAttachments(repositoryModel, taskData)
-						.size() > 0) {
-					ReviewsUtil.markAsReview(task);
-				}
-			} catch (CoreException e) {
-				// FIXME
-				e.printStackTrace();
-			}
-		}
-
-		boolean isReview = ReviewsUtil.isMarkedAsReview(task);
-		return isReview;
-	}
-
-	public Set<String> getBlockingIds(ITask task) {
-		return Collections.emptySet();
-	}
-
-	public Set<String> getBlockingPaths(ITask task) {
-		Set<String> blockedPaths = new HashSet<String>();
-		blockedPaths.add(AbstractTaskEditorPage.PATH_ATTRIBUTES);
-		blockedPaths.add(AbstractTaskEditorPage.PATH_ATTACHMENTS);
-		blockedPaths.add(AbstractTaskEditorPage.PATH_PLANNING);
-
-		return blockedPaths;
-	}
-
-	public Set<TaskEditorPartDescriptor> getPartContributions(ITask task) {
-		Set<TaskEditorPartDescriptor> parts = new HashSet<TaskEditorPartDescriptor>();
-		parts.add(new TaskEditorPartDescriptor(
-				ReviewTaskEditorPart.ID_PART_REVIEW) {
-
-			@Override
-			public AbstractTaskEditorPart createPart() {
-				return new ReviewTaskEditorPart();
-			}
-		}.setPath(AbstractTaskEditorPage.PATH_ATTRIBUTES));
-		return parts;
-	}
-
-	public void taskMigration(ITask oldTask, ITask newTask) {
-		ReviewDataManager dataManager = ReviewsUiPlugin.getDataManager();
-		Review review = dataManager.getReviewData(oldTask).getReview();
-		dataManager.storeOutgoingTask(newTask, review);
-		ReviewsUtil.markAsReview(newTask);
-	}
-
-	public void afterSubmit(ITask task) {
-		try {
-			ReviewData reviewData = ReviewsUiPlugin.getDataManager()
-					.getReviewData(task);
-			Review review = reviewData.getReview();
-
-			if (reviewData.isOutgoing() || reviewData.isDirty()) {
-				reviewData.setDirty(false);
-				TaskRepository taskRepository = TasksUiPlugin
-						.getRepositoryManager().getRepository(
-								task.getRepositoryUrl());
-				TaskData taskData = TasksUiPlugin.getTaskDataManager()
-						.getTaskData(task);
-				// todo get which attachments have to be submitted
-				TaskAttribute attachmentAttribute = taskData
-						.getAttributeMapper().createTaskAttachment(taskData);
-				byte[] attachmentBytes = createAttachment(review);
-
-				ReviewCommentTaskAttachmentSource attachment = new ReviewCommentTaskAttachmentSource(
-						attachmentBytes);
-
-				AbstractRepositoryConnector connector = TasksUi
-						.getRepositoryConnector(taskRepository
-								.getConnectorKind());
-				connector.getTaskAttachmentHandler().postContent(
-						taskRepository, task, attachment, ""review result"", //$NON-NLS-1$
-						attachmentAttribute, new NullProgressMonitor());
-
-				TasksUiInternal.closeTaskEditorInAllPages(task, false);
-				TasksUiInternal.synchronizeTask(connector, task, false, null);
-				TasksUiInternal.openTaskInBackground(task, true);
-			}
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void prepareSubmit(ITask task) {
-	}
-
-	private byte[] createAttachment(Review review) {
-		try {
-			ResourceSet resourceSet = new ResourceSetImpl();
-
-			Resource resource = resourceSet.createResource(URI
-					.createFileURI("""")); //$NON-NLS-1$
-
-			resource.getContents().add(review);
-			resource.getContents().add(review.getScope().get(0));
-			if (review.getResult() != null)
-				resource.getContents().add(review.getResult());
-			ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-			ZipOutputStream outputStream = new ZipOutputStream(
-					byteArrayOutputStream);
-			outputStream.putNextEntry(new ZipEntry(
-					ReviewConstants.REVIEW_DATA_FILE));
-			resource.save(outputStream, null);
-			outputStream.closeEntry();
-			outputStream.close();
-			return byteArrayOutputStream.toByteArray();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/UpdateReviewTask.java b/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/UpdateReviewTask.java
deleted file mode 100644
index f51af485..00000000
--- a/tbr/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/UpdateReviewTask.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Research Group for Industrial Software (INSO), Vienna University of Technology
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Kilian Matt (Research Group for Industrial Software (INSO), Vienna University of Technology) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.ui.editors;
-
-import java.io.ByteArrayOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.mylyn.reviews.core.ReviewConstants;
-import org.eclipse.mylyn.reviews.core.model.review.Review;
-import org.eclipse.mylyn.reviews.ui.editors.Messages;
-import org.eclipse.mylyn.reviews.ui.ReviewCommentTaskAttachmentSource;
-import org.eclipse.mylyn.reviews.ui.ReviewsUiPlugin;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-
-/*
- * @author Kilian Matt
- */
-public class UpdateReviewTask extends Job {
-
-
-
-	private TaskDataModel model;
-	private Review review;
-	private TaskRepository taskRepository;
-	private AbstractRepositoryConnector connector;
-
-	public UpdateReviewTask(TaskDataModel model, Review review) {
-		super(Messages.UpdateReviewTask_Title);
-		this.model = model;
-		this.review = review;
-
-		this.taskRepository = model.getTaskRepository();
-
-		this.connector = TasksUi.getRepositoryConnector(taskRepository
-				.getConnectorKind());
-	}
-
-	@Override
-	protected IStatus run(final IProgressMonitor monitor) {
-		try {
-
-
-			final byte[] attachmentBytes = createAttachment(model, review);
-
-				TaskAttribute attachmentAttribute = model.getTaskData().getAttributeMapper()
-						.createTaskAttachment( model.getTaskData());
-				try {
-					ReviewCommentTaskAttachmentSource attachment = new ReviewCommentTaskAttachmentSource(
-							attachmentBytes);
-
-					monitor.subTask(org.eclipse.mylyn.reviews.ui.Messages.CreateTask_UploadingAttachment);
-					connector.getTaskAttachmentHandler().postContent(
-							taskRepository, model.getTask(), attachment,
-							""review result"", //$NON-NLS-1$
-							attachmentAttribute, monitor);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-
-
-			return new Status(IStatus.OK, ReviewsUiPlugin.PLUGIN_ID,
-					org.eclipse.mylyn.reviews.ui.Messages.CreateTask_Success);
-		} catch (Exception e) {
-			return new Status(IStatus.ERROR, ReviewsUiPlugin.PLUGIN_ID, e
-					.getMessage());
-		}
-	}
-
-	private byte[] createAttachment(TaskDataModel model, Review review) {
-		try {
-			ResourceSet resourceSet = new ResourceSetImpl();
-
-			Resource resource = resourceSet.createResource(URI
-					.createFileURI("""")); //$NON-NLS-1$
-
-			resource.getContents().add(review);
-			resource.getContents().add(review.getScope().get(0));
-			resource.getContents().add(review.getResult());
-			ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-			ZipOutputStream outputStream = new ZipOutputStream(
-					byteArrayOutputStream);
-			outputStream.putNextEntry(new ZipEntry(
-					ReviewConstants.REVIEW_DATA_FILE));
-			resource.save(outputStream, null);
-			outputStream.closeEntry();
-			outputStream.close();
-			return byteArrayOutputStream.toByteArray();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-
-	}
-
-}"
ab8caaab8f294a1c90109499dc57770253528446,camel,Updaed the mail component so that mail headers- are correctly copied over from message to message.  This highlighted the fact- that th TO: should always be what is specified on the outbound endpoint- instead of the To: in the message. Added a test the validates headers are- preserved.--git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@537937 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/camel,"diff --git a/camel-core/src/main/java/org/apache/camel/CamelTemplate.java b/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
index aa33dfae5268c..d19c27d2dc80b 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
@@ -146,6 +146,26 @@ public void process(Exchange exchange) {
         });
         return extractResultBody(result);
     }
+    
+    /**
+     * Sends the body to an endpoint with the specified headers and header values
+     *
+     * @param endpointUri the endpoint URI to send to
+     * @param body        the payload send
+     * @return the result
+     */
+    public Object sendBody(String endpointUri, final Object body, final Map<String, Object> headers) {
+        E result = send(endpointUri, new Processor() {
+            public void process(Exchange exchange) {
+                Message in = exchange.getIn();
+                for (Map.Entry<String, Object> header : headers.entrySet()) {
+                    in.setHeader(header.getKey(), header.getValue());
+				}
+                in.setBody(body);
+            }
+        });
+        return extractResultBody(result);
+    }
 
     // Methods using the default endpoint
     //-----------------------------------------------------------------------
diff --git a/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index 96ab82165d8bf..583c8534e09ad 100644
--- a/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++ b/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -17,15 +17,16 @@
  */
 package org.apache.camel.component.mail;
 
-import org.apache.camel.Exchange;
+import java.util.Map;
+import java.util.Set;
 
+import javax.mail.Address;
 import javax.mail.Message;
 import javax.mail.MessagingException;
-import javax.mail.Address;
-import javax.mail.internet.MimeMessage;
 import javax.mail.internet.InternetAddress;
-import java.util.Map;
-import java.util.Set;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.camel.Exchange;
 
 /**
  * A Strategy used to convert between a Camel {@Exchange} and {@Message} to and from a
@@ -38,11 +39,11 @@ public void populateMailMessage(MailEndpoint endpoint, MimeMessage mimeMessage,
         try {
             appendMailHeaders(mimeMessage, exchange.getIn());
 
-            if (empty(mimeMessage.getAllRecipients())) {
-                // lets default the address to the endpoint destination
-                String destination = endpoint.getConfiguration().getDestination();
+            String destination = endpoint.getConfiguration().getDestination();
+            if (destination != null ) {
                 mimeMessage.setRecipients(Message.RecipientType.TO, destination);
             }
+                        
             if (empty(mimeMessage.getFrom())) {
                 // lets default the address to the endpoint destination
                 String from = endpoint.getConfiguration().getFrom();
@@ -84,7 +85,23 @@ protected void appendMailHeaders(MimeMessage mimeMessage, org.apache.camel.Messa
             Object headerValue = entry.getValue();
             if (headerValue != null) {
                 if (shouldOutputHeader(camelMessage, headerName, headerValue)) {
-                    mimeMessage.setHeader(headerName, headerValue.toString());
+                	
+            		String[] values = new String[]{};
+            		Class stringArrayClazz = values.getClass();
+            		
+            		// Mail messages can repeat the same header...
+            		if( headerValue.getClass() == stringArrayClazz ) {
+            			mimeMessage.removeHeader(headerName);
+                		values = (String[]) headerValue;
+                		for (int i = 0; i < values.length; i++) {
+                            mimeMessage.addHeader(headerName, values[i]);
+						}
+            		} else if( headerValue.getClass() == String.class ) {
+                        mimeMessage.setHeader(headerName, (String) headerValue);
+            		} else {
+                		// Unknown type? then use toString()
+                        mimeMessage.setHeader(headerName, headerValue.toString());
+                	}
                 }
             }
         }
diff --git a/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java b/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
index 1100a66c1538e..f0ed90ee74e4a 100644
--- a/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
+++ b/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
@@ -19,6 +19,7 @@
 
 import org.apache.camel.impl.DefaultMessage;
 
+import javax.mail.Header;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import java.util.Enumeration;
@@ -67,7 +68,7 @@ public void setMessage(Message mailMessage) {
     }
 
     public Object getHeader(String name) {
-        Object answer = null;
+        String[] answer = null;
         if (mailMessage != null) {
             try {
                 answer = mailMessage.getHeader(name);
@@ -77,9 +78,12 @@ public Object getHeader(String name) {
             }
         }
         if (answer == null) {
-            answer = super.getHeader(name);
+            return super.getHeader(name);
         }
-        return answer;
+        if( answer.length > 0 ) {
+        	return answer[0];
+        }
+        return null;
     }
 
     @Override
@@ -105,15 +109,16 @@ protected void populateInitialHeaders(Map<String, Object> map) {
             catch (MessagingException e) {
                 throw new MessageHeaderNamesAccessException(e);
             }
-            while (names.hasMoreElements()) {
-                String name = names.nextElement().toString();
-                try {
-                    Object value = mailMessage.getHeader(name);
-                    map.put(name, value);
-                }
-                catch (MessagingException e) {
-                    throw new MessageHeaderAccessException(name, e);
-                }
+            
+            System.out.println(""Copying...."");
+            try {
+	            while (names.hasMoreElements()) {
+	                Header header = (Header) names.nextElement();
+	                map.put(header.getName(), header.getValue());
+	                System.out.println(""Set: ""+header.getName()+""=""+header.getValue());
+	            }
+            }catch (Throwable e) {
+                throw new MessageHeaderNamesAccessException(e);                
             }
         }
     }
diff --git a/camel-mail/src/main/java/org/apache/camel/component/mail/MessageHeaderNamesAccessException.java b/camel-mail/src/main/java/org/apache/camel/component/mail/MessageHeaderNamesAccessException.java
index e66353460aefd..1e4a0a1954e32 100644
--- a/camel-mail/src/main/java/org/apache/camel/component/mail/MessageHeaderNamesAccessException.java
+++ b/camel-mail/src/main/java/org/apache/camel/component/mail/MessageHeaderNamesAccessException.java
@@ -17,7 +17,6 @@
  */
 package org.apache.camel.component.mail;
 
-import javax.mail.MessagingException;
 
 /**
  * @version $Revision:520964 $
@@ -25,7 +24,7 @@
 public class MessageHeaderNamesAccessException extends RuntimeMailException {
     private static final long serialVersionUID = -6744171518099741324L;
 
-    public MessageHeaderNamesAccessException(MessagingException e) {
+    public MessageHeaderNamesAccessException(Throwable e) {
         super(""Failed to acess the Mail message property names"", e);
     }
 }
diff --git a/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index 21573151273f6..9a2c7eaba20e7 100644
--- a/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++ b/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -18,6 +18,7 @@
 package org.apache.camel.component.mail;
 
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.builder.RouteBuilder;
 import static org.apache.camel.util.ObjectHelper.asString;
@@ -27,6 +28,7 @@
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import java.io.IOException;
+import java.util.HashMap;
 
 /**
  * @version $Revision: 1.1 $
@@ -38,7 +40,9 @@ public void testSendAndReceiveMails() throws Exception {
         resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint(""mock:result"");
         resultEndpoint.expectedBodiesReceived(""hello world!"");
 
-        template.sendBody(""smtp://james@localhost"", ""hello world!"");
+        HashMap<String, Object> headers = new HashMap<String, Object>();
+        headers.put(""reply-to"", ""reply1@localhost"");
+        template.sendBody(""smtp://james@localhost"", ""hello world!"", headers);
 
         // lets test the first sent worked
         assertMailboxReceivedMessages(""james@localhost"");
@@ -48,7 +52,12 @@ public void testSendAndReceiveMails() throws Exception {
 
         // lets test the receive worked
         resultEndpoint.assertIsSatisfied();
-
+        
+        // Validate that the headers were preserved.
+        Exchange exchange = resultEndpoint.getReceivedExchanges().get(0);
+        String replyTo = (String) exchange.getIn().getHeader(""reply-to"");
+        assertEquals( ""reply1@localhost"", replyTo);
+        
         assertMailboxReceivedMessages(""copy@localhost"");
     }"
7bb429c9cde94494cde83b99715149c680c1dae9,intellij-community,external system: add clickable link to log- folder to the project import failure message--,a,https://github.com/JetBrains/intellij-community,"diff --git a/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties b/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties
index a2d53c3cf6433..1112ae3ca6c40 100644
--- a/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties
+++ b/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties
@@ -28,7 +28,8 @@ error.project.undefined=No external project config file is defined
 error.project.already.registered=The project is already registered
 error.cannot.parse.project=Can not parse {0} project
 error.resolve.with.reason={0}\n\nConsult IDE log for more details (Help | Show Log)
-error.resolve.generic=Resolve error
+error.resolve.with.log_link=<html>{0}<br><br>Consult IDE log for more details (<a href=""{1}"">Show Log</a>)<html>
+error.resolve.generic=Resolve Error
 error.resolve.already.running=Another 'refresh project' task is currently running for the project:  {0}
 
 # Tool window
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
index 6a3bb5ae28f26..c1e04c1af8627 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
@@ -1,6 +1,7 @@
 package com.intellij.openapi.externalSystem.service.project.wizard;
 
 import com.intellij.ide.util.projectWizard.WizardContext;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.externalSystem.model.DataNode;
@@ -276,8 +277,9 @@ public void onFailure(@NotNull String errorMessage, @Nullable String errorDetail
         if (!StringUtil.isEmpty(errorDetails)) {
           LOG.warn(errorDetails);
         }
-        error.set(new ConfigurationException(ExternalSystemBundle.message(""error.resolve.with.reason"", errorMessage),
-                                             ExternalSystemBundle.message(""error.resolve.generic"")));
+        error.set(new ConfigurationException(
+          ExternalSystemBundle.message(""error.resolve.with.log_link"", errorMessage, PathManager.getLogPath()),
+          ExternalSystemBundle.message(""error.resolve.generic"")));
       }
     };"
be86c7d216202c91a0ba0a43cd7f89b968146d62,drools,JBRULES-1590: fixing problem with shadow proxy- cloning for collections--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@19783 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,c,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/test/java/org/drools/MockPersistentSet.java b/drools-compiler/src/test/java/org/drools/MockPersistentSet.java
new file mode 100644
index 00000000000..24d85fdb07e
--- /dev/null
+++ b/drools-compiler/src/test/java/org/drools/MockPersistentSet.java
@@ -0,0 +1,45 @@
+package org.drools;
+
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public class MockPersistentSet extends AbstractSet implements Set
+{
+
+	private Set set;
+	
+	private boolean exception;
+
+	public MockPersistentSet()
+	{
+		exception = true;
+		set = new HashSet();
+	}
+	
+	public MockPersistentSet(boolean exception)
+	{
+		this.exception = exception;
+		set = new HashSet();
+	}
+	
+	public int size()
+	{
+		return set.size();
+	}
+	
+	public Iterator iterator()
+	{
+		return set.iterator();
+	}
+	
+	public boolean addAll(Collection c)
+	{
+		if (exception)
+			throw new MockPersistentSetException(""error message like PersistentSet"");
+		return set.addAll(c);
+	}
+
+}
diff --git a/drools-compiler/src/test/java/org/drools/MockPersistentSetException.java b/drools-compiler/src/test/java/org/drools/MockPersistentSetException.java
new file mode 100644
index 00000000000..2b0253fb0d1
--- /dev/null
+++ b/drools-compiler/src/test/java/org/drools/MockPersistentSetException.java
@@ -0,0 +1,9 @@
+package org.drools;
+
+public class MockPersistentSetException extends RuntimeException
+{
+	public MockPersistentSetException(String message)
+	{
+		super(message);
+	}
+}
diff --git a/drools-compiler/src/test/java/org/drools/ObjectWithSet.java b/drools-compiler/src/test/java/org/drools/ObjectWithSet.java
new file mode 100644
index 00000000000..806137f4393
--- /dev/null
+++ b/drools-compiler/src/test/java/org/drools/ObjectWithSet.java
@@ -0,0 +1,35 @@
+package org.drools;
+
+import java.util.Set;
+
+public class ObjectWithSet
+{
+	private Set set;
+
+	private String message;
+	
+	public String getMessage()
+	{
+		return message;
+	}
+	
+	public void setMessage(String message)
+	{
+		this.message = message;
+	}
+	
+	public ObjectWithSet()
+	{
+	}
+
+	public Set getSet()
+	{
+		return set;
+	}
+
+	public void setSet(Set set)
+	{
+		this.set = set;
+	}
+
+}
diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
index 023d759a24e..943a188f84b 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
@@ -54,6 +54,8 @@
 import org.drools.IndexedNumber;
 import org.drools.InsertedObject;
 import org.drools.Message;
+import org.drools.MockPersistentSet;
+import org.drools.ObjectWithSet;
 import org.drools.Order;
 import org.drools.OrderItem;
 import org.drools.OuterClass;
@@ -4418,6 +4420,38 @@ public void testShadowProxyOnCollections() throws Exception {
                       cheesery.getCheeses().get( 0 ) );
     }
 
+    public void testShadowProxyOnCollections2() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_ShadowProxyOnCollections2.drl"" ) ) );
+        final Package pkg = builder.getPackage();
+
+        final RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        final StatefulSession workingMemory = ruleBase.newStatefulSession();
+
+        final List results = new ArrayList();
+        workingMemory.setGlobal( ""results"",
+                                 results );
+
+        List list = new ArrayList();
+        list.add( ""example1"" );
+        list.add( ""example2"" );
+
+        MockPersistentSet mockPersistentSet = new MockPersistentSet( false );
+        mockPersistentSet.addAll( list );
+        org.drools.ObjectWithSet objectWithSet = new ObjectWithSet();
+        objectWithSet.setSet( mockPersistentSet );
+
+        workingMemory.insert( objectWithSet );
+
+        workingMemory.fireAllRules();
+
+        assertEquals( 1,
+                      results.size() );
+        assertEquals( ""show"",
+                      objectWithSet.getMessage() );
+    }
+
     public void testQueryWithCollect() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_Query.drl"" ) ) );
@@ -4848,30 +4882,31 @@ public void testModifyRetractAndModifyInsert() throws Exception {
 
     public void testAlphaCompositeConstraints() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
-        builder.addPackageFromDrl(new InputStreamReader(getClass()
-                .getResourceAsStream(""test_AlphaCompositeConstraints.drl"")));
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_AlphaCompositeConstraints.drl"" ) ) );
         final Package pkg = builder.getPackage();
 
         final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage(pkg);
+        ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newStatefulSession();
 
         final List list = new ArrayList();
-        workingMemory.setGlobal(""results"", list);
+        workingMemory.setGlobal( ""results"",
+                                 list );
 
-        Person bob = new Person( ""bob"", 30 );
+        Person bob = new Person( ""bob"",
+                                 30 );
 
-        workingMemory.insert(bob);
+        workingMemory.insert( bob );
         workingMemory.fireAllRules();
 
-        assertEquals( 1, list.size());
+        assertEquals( 1,
+                      list.size() );
     }
 
-	public void testModifyBlock() throws Exception {
-		final PackageBuilder builder = new PackageBuilder();
-		builder.addPackageFromDrl(new InputStreamReader(getClass()
-				.getResourceAsStream(""test_ModifyBlock.drl"")));
-		final Package pkg = builder.getPackage();
+    public void testModifyBlock() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( ""test_ModifyBlock.drl"" ) ) );
+        final Package pkg = builder.getPackage();
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newStatefulSession();
@@ -4919,7 +4954,7 @@ public void testJavaModifyBlock() throws Exception {
         workingMemory.insert( new Cheese() );
         workingMemory.insert( new OuterClass.InnerClass( 1 ) );
 
-        workingMemory.fireAllRules( );
+        workingMemory.fireAllRules();
 
         assertEquals( 2,
                       list.size() );
@@ -4928,7 +4963,7 @@ public void testJavaModifyBlock() throws Exception {
         assertEquals( 31,
                       bob.getAge() );
         assertEquals( 2,
-                      ((OuterClass.InnerClass)list.get( 1 )).getIntAttr() );
+                      ((OuterClass.InnerClass) list.get( 1 )).getIntAttr() );
     }
 
     public void testOrCE() throws Exception {
diff --git a/drools-compiler/src/test/resources/org/drools/integrationtests/test_ShadowProxyOnCollections2.drl b/drools-compiler/src/test/resources/org/drools/integrationtests/test_ShadowProxyOnCollections2.drl
new file mode 100644
index 00000000000..22825890c28
--- /dev/null
+++ b/drools-compiler/src/test/resources/org/drools/integrationtests/test_ShadowProxyOnCollections2.drl
@@ -0,0 +1,14 @@
+package org.drools;
+
+import java.util.ArrayList;
+
+global java.util.List results;
+
+rule ""shadow proxy on collections2""
+	when
+		obj:ObjectWithSet( set != null && set.empty == false )
+	then
+		obj.setMessage(""show"");
+		results.add( ""OK"" );
+end
+
diff --git a/drools-core/src/main/java/org/drools/util/ShadowProxyUtils.java b/drools-core/src/main/java/org/drools/util/ShadowProxyUtils.java
index eae3422325a..3475e97ce5d 100644
--- a/drools-core/src/main/java/org/drools/util/ShadowProxyUtils.java
+++ b/drools-core/src/main/java/org/drools/util/ShadowProxyUtils.java
@@ -53,6 +53,7 @@ public static Object cloneObject(Object original) {
             } catch ( Exception e ) {
                 /* Failed to clone.  Don't worry about it, and just return
                  * the original object. */
+                clone = null;
             }
         }
 
@@ -82,6 +83,7 @@ public static Object cloneObject(Object original) {
             } catch ( Exception e ) {
                 /* Failed to clone.  Don't worry about it, and just return
                  * the original object. */
+                clone = null;
             }
         }"
a467e88ae4c1dacb022288fe6d4805a7f719cd12,hadoop,YARN-1883. TestRMAdminService fails due to- inconsistent entries in UserGroups (Mit Desai via jeagles)--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582865 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2a850e01e22d7..48fe1e261710a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -33,6 +33,9 @@ Release 2.5.0 - UNRELEASED
     YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He
     via jeagles)
 
+    YARN-1883. TestRMAdminService fails due to inconsistent entries in
+    UserGroups (Mit Desai via jeagles)
+
   OPTIMIZATIONS
 
   BUG FIXES 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
index ab199d1d39ebe..32e78ebf1828a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
@@ -90,6 +90,9 @@ public void setup() throws IOException {
     fs.delete(tmpDir, true);
     fs.mkdirs(workingPath);
     fs.mkdirs(tmpDir);
+
+    // reset the groups to what it default test settings
+    MockUnixGroupsMapping.resetGroups();
   }
 
   @After
@@ -785,12 +788,7 @@ private void uploadDefaultConfiguration() throws IOException {
   private static class MockUnixGroupsMapping implements
       GroupMappingServiceProvider {
 
-    @SuppressWarnings(""serial"")
-    private static List<String> group = new ArrayList<String>() {{
-      add(""test_group_A"");
-      add(""test_group_B"");
-      add(""test_group_C"");
-    }};
+    private static List<String> group = new ArrayList<String>();
 
     @Override
     public List<String> getGroups(String user) throws IOException {
@@ -813,6 +811,13 @@ public static void updateGroups() {
       group.add(""test_group_E"");
       group.add(""test_group_F"");
     }
+    
+    public static void resetGroups() {
+      group.clear();
+      group.add(""test_group_A"");
+      group.add(""test_group_B"");
+      group.add(""test_group_C"");
+    }
   }
 
 }"
9521bc3d3eb5d1cc164417b9ca072393bb9cccda,hadoop,MAPREDUCE-3238. Small cleanup in SchedulerApp.- (Todd Lipcon via mahadev) - Merging r1206921 from trunk--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206924 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/hadoop,"diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 34252d944233d..c760640e179ad 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -56,6 +56,8 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3371. Review and improve the yarn-api javadocs. (Ravi Prakash
     via mahadev)
 
+    MAPREDUCE-3238. Small cleanup in SchedulerApp. (Todd Lipcon via mahadev)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java
index 5ee6d46e95cbb..e3798c0defc15 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApp.java
@@ -53,6 +53,14 @@
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerReservedEvent;
 import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
 
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multiset;
+
+/**
+ * Represents an Application from the viewpoint of the scheduler.
+ * Each running Application in the RM corresponds to one instance
+ * of this class.
+ */
 public class SchedulerApp {
 
   private static final Log LOG = LogFactory.getLog(SchedulerApp.class);
@@ -76,11 +84,16 @@ public class SchedulerApp {
   final Map<Priority, Map<NodeId, RMContainer>> reservedContainers = 
       new HashMap<Priority, Map<NodeId, RMContainer>>();
   
-  Map<Priority, Integer> schedulingOpportunities = 
-      new HashMap<Priority, Integer>();
+  /**
+   * Count how many times the application has been given an opportunity
+   * to schedule a task at each priority. Each time the scheduler
+   * asks the application for a task at this priority, it is incremented,
+   * and each time the application successfully schedules a task, it
+   * is reset to 0.
+   */
+  Multiset<Priority> schedulingOpportunities = HashMultiset.create();
   
-  Map<Priority, Integer> reReservations =
-      new HashMap<Priority, Integer>();
+  Multiset<Priority> reReservations = HashMultiset.create();
 
   Resource currentReservation = recordFactory
       .newRecordInstance(Resource.class);
@@ -282,49 +295,33 @@ public synchronized RMContainer getRMContainer(ContainerId id) {
   }
 
   synchronized public void resetSchedulingOpportunities(Priority priority) {
-    this.schedulingOpportunities.put(priority, Integer.valueOf(0));
+    this.schedulingOpportunities.setCount(priority, 0);
   }
 
   synchronized public void addSchedulingOpportunity(Priority priority) {
-    Integer schedulingOpportunities = 
-        this.schedulingOpportunities.get(priority);
-    if (schedulingOpportunities == null) {
-      schedulingOpportunities = 0;
-    }
-    ++schedulingOpportunities;
-    this.schedulingOpportunities.put(priority, schedulingOpportunities);
+    this.schedulingOpportunities.setCount(priority,
+        schedulingOpportunities.count(priority) + 1);
   }
 
+  /**
+   * Return the number of times the application has been given an opportunity
+   * to schedule a task at the given priority since the last time it
+   * successfully did so.
+   */
   synchronized public int getSchedulingOpportunities(Priority priority) {
-    Integer schedulingOpportunities = 
-        this.schedulingOpportunities.get(priority);
-    if (schedulingOpportunities == null) {
-      schedulingOpportunities = 0;
-      this.schedulingOpportunities.put(priority, schedulingOpportunities);
-    }
-    return schedulingOpportunities;
+    return this.schedulingOpportunities.count(priority);
   }
 
   synchronized void resetReReservations(Priority priority) {
-    this.reReservations.put(priority, Integer.valueOf(0));
+    this.reReservations.setCount(priority, 0);
   }
 
   synchronized void addReReservation(Priority priority) {
-    Integer reReservations = this.reReservations.get(priority);
-    if (reReservations == null) {
-      reReservations = 0;
-    }
-    ++reReservations;
-    this.reReservations.put(priority, reReservations);
+    this.reReservations.add(priority);
   }
 
   synchronized public int getReReservations(Priority priority) {
-    Integer reReservations = this.reReservations.get(priority);
-    if (reReservations == null) {
-      reReservations = 0;
-      this.reReservations.put(priority, reReservations);
-    }
-    return reReservations;
+    return this.reReservations.count(priority);
   }
 
   public synchronized int getNumReservedContainers(Priority priority) {"
35c49ea2db324c527a45be9a219cc05f2a718950,Mylyn Reviews,"ANTLR based dsl implementation

removed existing xtext based dsl and replaced with antlr impl.
",c,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
index aad5c57d..75b03c6e 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewTaskMapper.java
@@ -23,104 +23,153 @@
 import org.eclipse.mylyn.reviews.tasks.core.PatchScopeItem;
 import org.eclipse.mylyn.reviews.tasks.core.Rating;
 import org.eclipse.mylyn.reviews.tasks.core.ResourceScopeItem;
+import org.eclipse.mylyn.reviews.tasks.core.ReviewResult;
 import org.eclipse.mylyn.reviews.tasks.core.ReviewScope;
 import org.eclipse.mylyn.reviews.tasks.core.TaskComment;
-import org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr.ReviewDslParser;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.AttachmentSource;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ChangedReviewScope;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ChangesetDef;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.PatchDef;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ResourceDef;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ResultEnum;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslFactory;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScopeItem;
-import org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.Source;
-import org.eclipse.xtext.parser.IParseResult;
-import org.eclipse.xtext.parsetree.reconstr.Serializer;
+import org.eclipse.mylyn.reviews.tasks.dsl.IReviewDslMapper;
+import org.eclipse.mylyn.reviews.tasks.dsl.IReviewDslSerializer;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem.Type;
+import org.eclipse.mylyn.reviews.tasks.dsl.ParseException;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslChangesetScopeItem;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScope;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScopeItem;
 
 /**
  * @author mattk
  * 
  */
 public class ReviewTaskMapper implements IReviewMapper {
-	private ReviewDslParser parser;
-	private Serializer serializer;
+	private IReviewDslMapper parser;
+	private IReviewDslSerializer serializer;
 
-	public ReviewTaskMapper(ReviewDslParser parser, Serializer serializer) {
+	public ReviewTaskMapper(IReviewDslMapper parser,
+			IReviewDslSerializer serializer) {
 		this.parser = parser;
 		this.serializer = serializer;
 	}
 
-	private org.eclipse.mylyn.reviews.tasks.core.ReviewResult mapResult(
-			org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult parsed,
-			TaskComment comment) {
-		if (parsed == null)
-			return null;
+	@Override
+	public ReviewScope mapTaskToScope(ITaskProperties properties)
+			throws CoreException {
+		Assert.isNotNull(properties);
+		try {
+			ReviewDslScope parsedReviewScope = parser
+					.parseReviewScope(properties.getDescription());
+			ReviewScope originalScope = mapReviewScope(properties,
+					parsedReviewScope);
+			// FIXME changed review scope
+			// for (TaskComment comment : properties.getComments()) {
+			// if (properties.getReporter().equals(comment.getAuthor())) {
+			// ChangedReviewScope changedScope =
+			// parser.parseChangedReviewScope(comment.getText());
+			// applyChangedScope(properties, originalScope, changedScope);
+			// }
+			// }
+			// }
+			return originalScope;
+		} catch (ParseException ex) {
+			// ignore
+		}
+		return null;
 
-		org.eclipse.mylyn.reviews.tasks.core.ReviewResult result = new org.eclipse.mylyn.reviews.tasks.core.ReviewResult();
-		result.setReviewer(comment.getAuthor());
-		result.setDate(comment.getDate());
-		result.setRating(mapRating(parsed.getResult()));
-		result.setComment(parsed.getComment());
-		return result;
 	}
 
-	private Rating mapRating(ResultEnum result) {
-		switch (result) {
+	@Override
+	public void mapScopeToTask(ReviewScope scope, ITaskProperties taskProperties) {
+		ReviewDslScope scope2 = mapScope(scope);
+
+		taskProperties.setDescription(serializer.serialize(scope2));
+	}
+
+	@Override
+	public void mapResultToTask(
+			org.eclipse.mylyn.reviews.tasks.core.ReviewResult res,
+			ITaskProperties taskProperties) {
+		ReviewDslResult result = new ReviewDslResult();
+		ReviewDslResult.Rating rating = ReviewDslResult.Rating.WARNING;
+		switch (res.getRating()) {
+		case FAIL:
+			rating = ReviewDslResult.Rating.FAILED;
+			break;
 		case PASSED:
-			return Rating.PASSED;
-		case FAILED:
-			return Rating.FAIL;
-		case WARNING:
-			return Rating.WARNING;
+			rating = ReviewDslResult.Rating.PASSED;
+			break;
 		case TODO:
-			return Rating.TODO;
+			rating = ReviewDslResult.Rating.TODO;
+			break;
+		case WARNING:
+			rating = ReviewDslResult.Rating.WARNING;
+			break;
 		}
-		throw new IllegalArgumentException();
+		result.setRating(rating);
+		result.setComment(res.getComment());
+
+		String resultAsText = serializer.serialize(result);
+		taskProperties.setNewCommentText(resultAsText);
 	}
 
 	@Override
-	public ReviewScope mapTaskToScope(ITaskProperties properties)
-			throws CoreException {
-		Assert.isNotNull(properties);
-		IParseResult parsed = parser.doParse(properties.getDescription());
+	public org.eclipse.mylyn.reviews.tasks.core.ReviewResult mapCurrentReviewResult(
+			ITaskProperties taskProperties) {
+		Assert.isNotNull(taskProperties);
+		if (taskProperties.getNewCommentText() == null)
+			return null;
+		ReviewResult result = null;
+		try {
+			ReviewDslResult res = parser.parseReviewResult(taskProperties
+					.getNewCommentText());
+			result = new ReviewResult();
+			if (res == null)
+				return null;
+			result.setComment(res.getComment());
+			result.setRating(mapRating(res.getRating()));
+			// FIXME filecomment, linecomment
+			// FIXME author is current
+			// result.setReviewer()
+			// result.setDate()
+		} catch (ParseException ex) {
+			/* ignore */
+		}
+		return result;
+	}
 
-		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope = (org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope) parsed
-				.getRootASTElement();
-		ReviewScope originalScope = mapReviewScope(properties, scope);
-		for (TaskComment comment : properties.getComments()) {
-			if (properties.getReporter().equals(comment.getAuthor())) {
-				parsed = parser.doParse(comment.getText());
-				if (parsed.getRootASTElement() instanceof ChangedReviewScope) {
-					ChangedReviewScope changedScope = (ChangedReviewScope) parsed
-							.getRootASTElement();
-					applyChangedScope(properties, originalScope, changedScope);
+	@Override
+	public List<ReviewResult> mapTaskToResults(ITaskProperties taskProperties) {
+		List<ReviewResult> results = new ArrayList<ReviewResult>();
+		for (TaskComment comment : taskProperties.getComments()) {
+			try {
+				ReviewDslResult parsed = parser.parseReviewResult(comment
+						.getText());
+				if (parsed != null) {
+					results.add(mapResult(parsed, comment));
 				}
+			} catch (ParseException ex) {
+				// ignore
 			}
 		}
-		return originalScope;
+		return results;
 	}
 
-	private void applyChangedScope(ITaskProperties properties,
-			ReviewScope originalScope, ChangedReviewScope changedScope)
-			throws CoreException {
-		for (ReviewScopeItem scope : changedScope.getScope()) {
-			IReviewScopeItem item = mapReviewScopeItem(properties, scope);
-			originalScope.addScope(item);
-		}
-	}
+	// FIXME Changed Review scope
+	// private void applyChangedScope(ITaskProperties properties,
+	// ReviewScope originalScope, ChangedReviewScope changedScope)
+	// throws CoreException {
+	// for (ReviewScopeItem scope : changedScope.getScope()) {
+	// IReviewScopeItem item = mapReviewScopeItem(properties, scope);
+	// originalScope.addScope(item);
+	// }
+	// }
 
 	private ReviewScope mapReviewScope(ITaskProperties properties,
-			org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope)
-			throws CoreException {
+			ReviewDslScope scope) throws CoreException {
 		if (scope == null)
 			return null;
 
 		ReviewScope mappedScope = new ReviewScope();
 		mappedScope.setCreator(properties.getReporter());
-		for (org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScopeItem s : scope
-				.getScope()) {
+		for (ReviewDslScopeItem s : scope.getItems()) {
 			IReviewScopeItem item = mapReviewScopeItem(properties, s);
 			if (item != null) {
 				mappedScope.addScope(item);
@@ -130,174 +179,93 @@ private ReviewScope mapReviewScope(ITaskProperties properties,
 	}
 
 	private IReviewScopeItem mapReviewScopeItem(ITaskProperties properties,
-			org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScopeItem s)
-			throws CoreException {
+			ReviewDslScopeItem s) throws CoreException {
 		IReviewScopeItem item = null;
-		if (s instanceof PatchDef) {
-			item = mapPatchDef(properties, (PatchDef) s);
-		} else if (s instanceof ResourceDef) {
-			ResourceDef res = (ResourceDef) s;
-			item = mapResourceDef(properties, res);
-		} else if (s instanceof ChangesetDef) {
-			ChangesetDef res = (ChangesetDef) s;
-			item = mapChangesetDef(properties, res);
+		if (s instanceof ReviewDslAttachmentScopeItem) {
+			item = mapPatchDef(properties, (ReviewDslAttachmentScopeItem) s);
+		} else if (s instanceof ReviewDslChangesetScopeItem) {
+			item = mapChangesetDef(properties, (ReviewDslChangesetScopeItem) s);
 		}
 		return item;
 	}
 
 	private ChangesetScopeItem mapChangesetDef(ITaskProperties properties,
-			ChangesetDef cs) throws CoreException {
-		return new ChangesetScopeItem(cs.getRevision(), cs.getUrl());
+			ReviewDslChangesetScopeItem cs) throws CoreException {
+		return new ChangesetScopeItem(cs.getRevision(), cs.getRepoUrl());
 	}
 
-	private ResourceScopeItem mapResourceDef(ITaskProperties properties,
-			ResourceDef res) throws CoreException {
-		Source source = res.getSource();
-		Attachment att = null;
-		if (source instanceof AttachmentSource) {
-			att = parseAttachmenSource(properties, source);
-		}
-		return new ResourceScopeItem(att);
-	}
+	private IReviewScopeItem mapPatchDef(ITaskProperties properties,
+			ReviewDslAttachmentScopeItem scopeItem) throws CoreException {
 
-	private PatchScopeItem mapPatchDef(ITaskProperties properties,
-			PatchDef patch) throws CoreException {
-		Source source = patch.getSource();
-		Attachment att = null;
-		if (source instanceof AttachmentSource) {
-			att = parseAttachmenSource(properties, source);
+		Attachment att = ReviewsUtil.findAttachment(scopeItem.getFileName(),
+				scopeItem.getAuthor(), scopeItem.getCreatedDate(),
+				properties.loadFor(scopeItem.getTaskId()));
+		if (scopeItem.getType() == Type.PATCH) {
+			return new PatchScopeItem(att);
+		} else {
+			return new ResourceScopeItem(att);
 		}
-		return new PatchScopeItem(att);
 	}
 
-	private Attachment parseAttachmenSource(ITaskProperties properties,
-			Source source) throws CoreException {
-		AttachmentSource attachment = (AttachmentSource) source;
+	private ReviewResult mapResult(ReviewDslResult parsed, TaskComment comment) {
+		if (parsed == null)
+			return null;
 
-		Attachment att = ReviewsUtil.findAttachment(attachment.getFilename(),
-				attachment.getAuthor(), attachment.getCreatedDate(),
-				properties.loadFor(attachment.getTaskId()));
-		return att;
+		ReviewResult result = new ReviewResult();
+		result.setReviewer(comment.getAuthor());
+		result.setDate(comment.getDate());
+		result.setRating(mapRating(parsed.getRating()));
+		result.setComment(parsed.getComment());
+		return result;
 	}
 
-	@Override
-	public void mapScopeToTask(ReviewScope scope, ITaskProperties taskProperties) {
-		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope2 = mapScope(scope);
-
-		taskProperties.setDescription(serializer.serialize(scope2));
+	private Rating mapRating(ReviewDslResult.Rating result) {
+		switch (result) {
+		case PASSED:
+			return Rating.PASSED;
+		case FAILED:
+			return Rating.FAIL;
+		case WARNING:
+			return Rating.WARNING;
+		case TODO:
+			return Rating.TODO;
+		}
+		throw new IllegalArgumentException();
 	}
 
-	private org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope mapScope(
-			ReviewScope scope) {
-		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScope scope2 = ReviewDslFactory.eINSTANCE
-				.createReviewScope();
+	private ReviewDslScope mapScope(ReviewScope scope) {
+		ReviewDslScope scope2 = new ReviewDslScope();
+
 		for (IReviewScopeItem item : scope.getItems()) {
-			scope2.getScope().add(mapScopeItem(item));
+			scope2.getItems().add(mapScopeItem(item));
 		}
 		return scope2;
 	}
 
-	private org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewScopeItem mapScopeItem(
-			IReviewScopeItem item) {
+	private ReviewDslScopeItem mapScopeItem(IReviewScopeItem item) {
 		if (item instanceof PatchScopeItem) {
 			PatchScopeItem patchItem = (PatchScopeItem) item;
-			PatchDef patch = ReviewDslFactory.eINSTANCE.createPatchDef();
-			Attachment attachment = patchItem.getAttachment();
-			AttachmentSource source = mapAttachment(attachment);
-			patch.setSource(source);
-
-			return patch;
+			return createAttachmentScopeItem(Type.PATCH,
+					patchItem.getAttachment());
 		} else if (item instanceof ResourceScopeItem) {
 			ResourceScopeItem resourceItem = (ResourceScopeItem) item;
-			ResourceDef resource = ReviewDslFactory.eINSTANCE
-					.createResourceDef();
-			Attachment attachment = resourceItem.getAttachment();
-			AttachmentSource source = mapAttachment(attachment);
-			resource.setSource(source);
-			return resource;
+			return createAttachmentScopeItem(Type.RESOURCE,
+					resourceItem.getAttachment());
 		} else if (item instanceof ChangesetScopeItem) {
 			ChangesetScopeItem changesetItem = (ChangesetScopeItem) item;
-			ChangesetDef changeset = ReviewDslFactory.eINSTANCE
-					.createChangesetDef();
+			ReviewDslChangesetScopeItem changeset = new ReviewDslChangesetScopeItem();
 			changeset.setRevision(changesetItem.getRevisionId());
-			changeset.setUrl(changesetItem.getRepositoryUrl());
+			changeset.setRepoUrl(changesetItem.getRepositoryUrl());
 			return changeset;
 		}
 		return null;
 	}
 
-	private AttachmentSource mapAttachment(Attachment attachment) {
-		AttachmentSource source = ReviewDslFactory.eINSTANCE
-				.createAttachmentSource();
-		source.setAuthor(attachment.getAuthor());
-		source.setCreatedDate(attachment.getDate());
-		source.setFilename(attachment.getFileName());
-		source.setTaskId(attachment.getTask().getTaskId());
-		return source;
-	}
-
-	@Override
-	public void mapResultToTask(
-			org.eclipse.mylyn.reviews.tasks.core.ReviewResult res,
-			ITaskProperties taskProperties) {
-		ReviewResult result = ReviewDslFactory.eINSTANCE.createReviewResult();
-		ResultEnum rating = ResultEnum.WARNING;
-		switch (res.getRating()) {
-		case FAIL:
-			rating = ResultEnum.FAILED;
-			break;
-		case PASSED:
-			rating = ResultEnum.PASSED;
-			break;
-		case TODO:
-			rating = ResultEnum.TODO;
-			break;
-		case WARNING:
-			rating = ResultEnum.WARNING;
-			break;
-		}
-		result.setResult(rating);
-		result.setComment(res.getComment());
-
-		String resultAsText = serializer.serialize(result);
-		taskProperties.setNewCommentText(resultAsText);
-	}
-
-	@Override
-	public org.eclipse.mylyn.reviews.tasks.core.ReviewResult mapCurrentReviewResult(
-			ITaskProperties taskProperties) {
-		Assert.isNotNull(taskProperties);
-		if (taskProperties.getNewCommentText() == null)
-			return null;
-		IParseResult parsed = parser
-				.doParse(taskProperties.getNewCommentText());
-
-		org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult res = (org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult) parsed
-				.getRootASTElement();
-		org.eclipse.mylyn.reviews.tasks.core.ReviewResult result = new org.eclipse.mylyn.reviews.tasks.core.ReviewResult();
-		if (res == null)
-			return null;
-		result.setComment(res.getComment());
-		result.setRating(mapRating(res.getResult()));
-		// FIXME author is current
-		// result.setReviewer()
-		// result.setDate()
-		return result;
-	}
-
-	@Override
-	public List<org.eclipse.mylyn.reviews.tasks.core.ReviewResult> mapTaskToResults(
-			ITaskProperties taskProperties) {
-		List<org.eclipse.mylyn.reviews.tasks.core.ReviewResult> results = new ArrayList<org.eclipse.mylyn.reviews.tasks.core.ReviewResult>();
-		for (TaskComment comment : taskProperties.getComments()) {
-			IParseResult parsed = parser.doParse(comment.getText());
-			if (parsed.getRootASTElement() != null) {
-				results.add(mapResult(
-						(org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewResult) parsed
-								.getRootASTElement(), comment));
-			}
-		}
-		return results;
+	private ReviewDslAttachmentScopeItem createAttachmentScopeItem(Type type,
+			Attachment attachment) {
+		return new ReviewDslAttachmentScopeItem(type, attachment.getFileName(),
+				attachment.getAuthor(), attachment.getDate(), attachment
+						.getTask().getTaskId());
 	}
 
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java
index 5907e378..1cb3bcc8 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewsUtil.java
@@ -23,14 +23,11 @@
 import org.eclipse.mylyn.reviews.tasks.core.patch.GitPatchPathFindingStrategy;
 import org.eclipse.mylyn.reviews.tasks.core.patch.ITargetPathStrategy;
 import org.eclipse.mylyn.reviews.tasks.core.patch.SimplePathFindingStrategy;
-import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslStandaloneSetup;
-import org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr.ReviewDslParser;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslMapper;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslSerializer;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.ITaskContainer;
 import org.eclipse.mylyn.tasks.core.data.ITaskDataManager;
-import org.eclipse.xtext.parsetree.reconstr.Serializer;
-
-import com.google.inject.Injector;
 
 /**
  * @author Kilian Matt
@@ -91,14 +88,9 @@ public static Attachment findAttachment(String filename, String author,
 		return null;
 	}
 
-	public static ReviewTaskMapper createMapper() {
-		Injector createInjectorAndDoEMFRegistration = new ReviewDslStandaloneSetup()
-				.createInjectorAndDoEMFRegistration();
-		ReviewDslParser parser = createInjectorAndDoEMFRegistration
-				.getInstance(ReviewDslParser.class);
-		Serializer serializer = createInjectorAndDoEMFRegistration
-				.getInstance(Serializer.class);
-		return new ReviewTaskMapper(parser, serializer);
+	public static IReviewMapper createMapper() {
+		return new ReviewTaskMapper(new ReviewDslMapper(),
+				new ReviewDslSerializer());
 	}
 
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath
index 7e8449de..304e8618 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/.classpath
@@ -1,7 +1,6 @@
 <?xml version=""1.0"" encoding=""UTF-8""?>
 <classpath>
 	<classpathentry kind=""src"" path=""src""/>
-	<classpathentry kind=""src"" path=""src-gen""/>
 	<classpathentry kind=""con"" path=""org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5""/>
 	<classpathentry kind=""con"" path=""org.eclipse.pde.core.requiredPlugins""/>
 	<classpathentry kind=""output"" path=""bin""/>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
index de4ab427..e28d532f 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/META-INF/MANIFEST.MF
@@ -5,27 +5,9 @@ Bundle-Vendor: Eclipse Mylyn
 Bundle-Version: 0.7.0.qualifier
 Bundle-SymbolicName: org.eclipse.mylyn.reviews.tasks.dsl;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime
+Require-Bundle: org.antlr.runtime;bundle-version=""3.0.0""
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.reviews.tasks.dsl,
- org.eclipse.mylyn.reviews.tasks.dsl.parseTreeConstruction,
- org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr,
- org.eclipse.mylyn.reviews.tasks.dsl.parser.antlr.internal,
- org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl,
- org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.impl,
- org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.util,
- org.eclipse.mylyn.reviews.tasks.dsl.services,
- org.eclipse.mylyn.reviews.tasks.dsl.validation
+ org.eclipse.mylyn.reviews.tasks.dsl.internal
 
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml
index 8881d7bf..20bb679e 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml
@@ -3,13 +3,6 @@
 
 <plugin>
 
-  <extension point=""org.eclipse.emf.ecore.generated_package"">
-    <package 
-       uri = ""http://www.eclipse.org/mylyn/reviews/tasks/dsl/ReviewDsl"" 
-       class = ""org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslPackage""
-       genModel = ""org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.genmodel"" /> 
-	
-  </extension>
 
 
 
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml_gen b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml_gen
deleted file mode 100644
index 8881d7bf..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/plugin.xml_gen
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version=""1.0"" encoding=""UTF-8""?>
-<?eclipse version=""3.0""?>
-
-<plugin>
-
-  <extension point=""org.eclipse.emf.ecore.generated_package"">
-    <package 
-       uri = ""http://www.eclipse.org/mylyn/reviews/tasks/dsl/ReviewDsl"" 
-       class = ""org.eclipse.mylyn.reviews.tasks.dsl.reviewDsl.ReviewDslPackage""
-       genModel = ""org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.genmodel"" /> 
-	
-  </extension>
-
-
-
-
-
-</plugin>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/pom.xml b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/pom.xml
index 0eaa057b..a652c89f 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/pom.xml
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/pom.xml
@@ -17,14 +17,6 @@
       <resource><directory>target/classes</directory></resource>
     </resources>
     <plugins>
-      <plugin>
-	<groupId>org.fornax.toolsupport</groupId>
-	<artifactId>fornax-oaw-m2-plugin</artifactId>
-	  <configuration>
-	    <workflowEngine>mwe2</workflowEngine>
-	    <workflowDescriptor>${project.basedir}/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2</workflowDescriptor>
-	  </configuration>
-      </plugin>
       <plugin>
         <groupId>org.sonatype.tycho</groupId>
         <artifactId>maven-osgi-source-plugin</artifactId>
@@ -38,41 +30,5 @@
         <artifactId>maven-pmd-plugin</artifactId>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-	<plugin>
-	  <groupId>org.fornax.toolsupport</groupId>
-	  <artifactId>fornax-oaw-m2-plugin</artifactId>
-	  <version>3.2.0-SNAPSHOT</version>
-	  <configuration>
-	    <workflowEngine>mwe2</workflowEngine>
-          </configuration>
-	  <executions>
-	    <execution>
-	      <phase>generate-sources</phase>
-	      <goals>
-	        <goal>run-workflow</goal>
-	      </goals>
-	    </execution>
-	  </executions>
-	</plugin>
-      </plugins>
-    </pluginManagement>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>fornax-snapshots</id>
-      <url>http://fornax.itemis.de/nexus/content/repositories/snapshots</url>
-      <releases>
-	<enabled>false</enabled>
-      </releases>
-      <snapshots>
-	<enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>fornax-releases</id>
-      <url>http://fornax.itemis.de/nexus/content/repositories/releases/</url>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2 b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2
deleted file mode 100644
index 06d08ac7..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/GenerateReviewDsl.mwe2
+++ /dev/null
@@ -1,100 +0,0 @@
-module org.eclipse.mylyn.reviews.tasks.dsl.ReviewDsl
-
-import org.eclipse.emf.mwe.utils.*
-import org.eclipse.xtext.generator.*
-import org.eclipse.xtext.ui.generator.*
-
-var grammarURI = ""classpath:/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext""
-var file.extensions = ""review-dsl""
-var projectName = ""org.eclipse.mylyn.reviews.tasks.dsl""
-var runtimeProject = ""../${projectName}""
-
-Workflow {
-    bean = StandaloneSetup {
-		platformUri = ""${runtimeProject}/..""
-	}
-
-	component = DirectoryCleaner {
-		directory = ""${runtimeProject}/src-gen""
-	}
-
-	component = DirectoryCleaner {
-		directory = ""${runtimeProject}.ui/src-gen""
-	}
-
-	component = Generator {
-		pathRtProject = runtimeProject
-		pathUiProject = ""${runtimeProject}.ui""
-		projectNameRt = projectName
-		projectNameUi = ""${projectName}.ui""
-		language = {
-			uri = grammarURI
-			fileExtensions = file.extensions
-
-			// Java API to access grammar elements (required by several other fragments)
-			fragment = grammarAccess.GrammarAccessFragment {}
-
-			// generates Java API for the generated EPackages 
-			fragment = ecore.EcoreGeneratorFragment {
-			// referencedGenModels = ""uri to genmodel, uri to next genmodel""
-			}
-
-			// the serialization component
-			fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
-
-			// a custom ResourceFactory for use with EMF 
-			fragment = resourceFactory.ResourceFactoryFragment {
-				fileExtensions = file.extensions
-			}
-
-			// The antlr parser generator fragment.
-			fragment = parser.antlr.XtextAntlrGeneratorFragment {
-			//  options = {
-			//		backtrack = true
-			//	}
-			}
-
-			// java-based API for validation 
-			fragment = validation.JavaValidatorFragment {
-				composedCheck = ""org.eclipse.xtext.validation.ImportUriValidator""
-				composedCheck = ""org.eclipse.xtext.validation.NamesAreUniqueValidator""
-				// registerForImportedPackages = true
-			}
-
-			// scoping and exporting API
-			// fragment = scoping.ImportURIScopingFragment {}
-			// fragment = exporting.SimpleNamesFragment {}
-
-			// scoping and exporting API 
-			fragment = scoping.ImportNamespacesScopingFragment {}
-			fragment = exporting.QualifiedNamesFragment {}
-			fragment = builder.BuilderIntegrationFragment {}
-
-			// formatter API 
-			fragment = formatting.FormatterFragment {}
-
-			// labeling API 
-			fragment = labeling.LabelProviderFragment {}
-
-			// outline API 
-			fragment = outline.TransformerFragment {}
-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
-			fragment = outline.QuickOutlineFragment {}
-
-			// quickfix API 
-			fragment = quickfix.QuickfixProviderFragment {}
-
-			// content assist API  
-			fragment = contentAssist.JavaBasedContentAssistFragment {}
-
-			// generates a more lightweight Antlr parser and lexer tailored for content assist  
-			fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
-
-			// project wizard (optional) 
-			// fragment = projectWizard.SimpleProjectWizardFragment {
-			// 		generatorProjectName = ""${projectName}.generator"" 
-			//		modelFileExtension = file.extensions
-			// }
-		}
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/IReviewDslMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/IReviewDslMapper.java
new file mode 100644
index 00000000..6d2de436
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/IReviewDslMapper.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public interface IReviewDslMapper {
+
+	public abstract ReviewDslResult parseReviewResult(String text)
+			throws ParseException;
+
+	public abstract ReviewDslScope parseReviewScope(String text)
+			throws ParseException;
+
+	public abstract ReviewDslResult parseChangedReviewScope(String text);
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/IReviewDslSerializer.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/IReviewDslSerializer.java
new file mode 100644
index 00000000..a014d272
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/IReviewDslSerializer.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public interface IReviewDslSerializer {
+
+	public abstract String serialize(ReviewDslScope scope);
+
+	public abstract String serialize(ReviewDslResult result);
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ParseException.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ParseException.java
new file mode 100644
index 00000000..5dc74dea
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ParseException.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ParseException extends Exception {
+
+	private static final long serialVersionUID = -7998527695103083639L;
+
+	public ParseException(String message) {
+		super(message);
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext
deleted file mode 100644
index ea536461..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDsl.xtext
+++ /dev/null
@@ -1,55 +0,0 @@
-grammar org.eclipse.mylyn.reviews.tasks.dsl.ReviewDsl with org.eclipse.xtext.common.Terminals
-
-generate reviewDsl ""http://www.eclipse.org/mylyn/reviews/tasks/dsl/ReviewDsl""
-
-Model:
-	ReviewResult | ReviewScope | ChangedReviewScope;
-
-ReviewResult:
-	""Review result:"" result=ResultEnum
-	(""Comment:"" comment=STRING)? (filecomments+=FileComment)*;
-
-enum ResultEnum:
-	passed=""PASSED"" | failed=""FAILED""
-	| todo=""TODO"" | warning=""WARNING"";
-
-FileComment:
-	""File"" path=STRING "":"" comment=STRING?
-	linecomments+=LineComment*;
-
-LineComment:
-	""Line"" start=INT (""-"" end=INT)? "":"" comment=STRING;
-
-ReviewScope:
-	{ReviewScope} ""Review scope:""
-	(scope+=ReviewScopeItem)*;
-
-ChangedReviewScope:
-	""Updated review scope:""
-	//(refines"" (refineOriginal?=""original scope""| (""scope from comment #"" refineComment=INT))  "":"" 
-	(scope+=ReviewScopeItem)+;
-
-ChangesetDef:
-	(""Changeset"" revision=STRING ""from"" url=STRING);
-
-ReviewScopeItem:
-	ResourceDef | PatchDef | ChangesetDef;
-
-ResourceDef:
-	(""Resource"" source=Source);
-
-PatchDef:
-	(""Patch"" source=Source);
-
-Source:
-	AttachmentSource;
-
-AttachmentSource:
-	""from Attachment"" filename=STRING
-	""by"" author=STRING
-	""on"" createdDate=STRING
-	""of task"" taskId=TASK_ID;
-
-terminal TASK_ID:
-	('a'..'z' | 'A'..'Z' | '_' | '-' | '0'..'9')*;
-	
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslAttachmentScopeItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslAttachmentScopeItem.java
new file mode 100644
index 00000000..044f346c
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslAttachmentScopeItem.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+/**
+ * 
+ * @author mattk
+ * 
+ */
+public class ReviewDslAttachmentScopeItem extends ReviewDslScopeItem {
+
+	public enum Type {
+		PATCH, RESOURCE
+	}
+
+	private Type type;
+	private String fileName;
+	private String author;
+	private String createdDate;
+	private String taskId;
+
+	public ReviewDslAttachmentScopeItem(Type type, String fileName,
+			String author, String createdDate, String taskId) {
+		super();
+		this.type = type;
+		this.fileName = fileName;
+		this.author = author;
+		this.createdDate = createdDate;
+		this.taskId = taskId;
+	}
+
+	public Type getType() {
+		return type;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public String getCreatedDate() {
+		return createdDate;
+	}
+
+	public String getTaskId() {
+		return taskId;
+	}
+
+	@Override
+	public StringBuilder serialize(StringBuilder sb) {
+		sb.append(type == Type.PATCH ? ""Patch"" : ""Resource"");
+		sb.append(""from Attachment \"""");
+		sb.append(fileName);
+		sb.append(""\"" by \"""");
+		sb.append(author);
+		sb.append(""\"" on \"""");
+		sb.append(createdDate);
+		sb.append(""\"" of task "");
+		sb.append(taskId);
+		return sb;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslChangesetScopeItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslChangesetScopeItem.java
new file mode 100644
index 00000000..bfb5ff27
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslChangesetScopeItem.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+/**
+ * 
+ * @author mattk
+ * 
+ */
+public class ReviewDslChangesetScopeItem extends ReviewDslScopeItem {
+
+	private String revision;
+	private String repoUrl;
+
+	public String getRevision() {
+		return revision;
+	}
+
+	public void setRevision(String revision) {
+		this.revision = revision;
+	}
+
+	public String getRepoUrl() {
+		return repoUrl;
+	}
+
+	public void setRepoUrl(String repoUrl) {
+		this.repoUrl = repoUrl;
+	}
+
+	@Override
+	public StringBuilder serialize(StringBuilder sb) {
+		sb.append(""Changeset \"""");
+		sb.append(revision);
+		sb.append(""\"" from \"""");
+		sb.append(repoUrl);
+		sb.append(""\"""");
+		return sb;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslResult.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslResult.java
new file mode 100644
index 00000000..ee0063d8
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslResult.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewDslResult {
+	public enum Rating {
+		PASSED, FAILED, WARNING, TODO
+	}
+
+	public static class FileComment {
+
+		private String fileName;
+		private String comment;
+		private List<LineComment> lineComments = new ArrayList<LineComment>();
+
+		public String getFileName() {
+			return fileName;
+		}
+
+		public String getComment() {
+			return comment;
+		}
+
+		public void setFileName(String path) {
+			this.fileName = path;
+		}
+
+		public void setComment(String comment) {
+			this.comment = comment;
+		}
+
+		public List<LineComment> getLineComments() {
+			return lineComments;
+		}
+
+		public StringBuilder serialize(StringBuilder sb) {
+			sb.append(""File \"""");
+			sb.append(fileName);
+			sb.append(""\"""");
+			if (comment != null) {
+				sb.append("" \"""");
+				sb.append(comment);
+				sb.append(""\"""");
+			}
+			for (LineComment c : lineComments) {
+				sb.append(""\n"");
+				c.serialize(sb);
+			}
+			return sb;
+		}
+
+	}
+
+	public static class LineComment {
+		private int begin;
+		private int end;
+		private String comment;
+
+		public int getBegin() {
+			return begin;
+		}
+
+		public StringBuilder serialize(StringBuilder sb) {
+			sb.append(""Line "");
+			sb.append(begin);
+			if (begin != end) {
+				sb.append("" - "");
+				sb.append(end);
+			}
+			sb.append("": \"""");
+			sb.append(comment);
+			sb.append(""\"""");
+			return sb;
+		}
+
+		public void setBegin(int begin) {
+			this.begin = begin;
+		}
+
+		public int getEnd() {
+			return end;
+		}
+
+		public void setEnd(int end) {
+			this.end = end;
+		}
+
+		public String getComment() {
+			return comment;
+		}
+
+		public void setComment(String comment) {
+			this.comment = comment;
+		}
+
+	}
+
+	private Rating rating;
+	private String comment;
+	private List<FileComment> fileComments = new ArrayList<FileComment>();
+
+	public Rating getRating() {
+		return rating;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setRating(Rating rating) {
+		this.rating = rating;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public List<FileComment> getFileComments() {
+		return fileComments;
+	}
+
+	public StringBuilder serialize(StringBuilder sb) {
+		sb.append(""Review result: "");
+		sb.append(rating.toString());
+		if (comment != null) {
+			sb.append("" \"""");
+			sb.append(comment);
+			sb.append(""\"""");
+		}
+		for (FileComment c : fileComments) {
+			sb.append(""\n"");
+			c.serialize(sb);
+		}
+		return sb;
+	}
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslRuntimeModule.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslRuntimeModule.java
deleted file mode 100644
index 7bf5ed9f..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslRuntimeModule.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.mylyn.reviews.tasks.dsl;
-
-
-/**
- * Use this class to register components to be used at runtime / without the Equinox extension registry.
- */
-public class ReviewDslRuntimeModule extends org.eclipse.mylyn.reviews.tasks.dsl.AbstractReviewDslRuntimeModule {
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslScope.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslScope.java
new file mode 100644
index 00000000..90b9859c
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslScope.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewDslScope {
+	List<ReviewDslScopeItem> items = new ArrayList<ReviewDslScopeItem>();
+	public void addItem(ReviewDslScopeItem item) {
+		items.add(item);
+	}
+
+	public List<ReviewDslScopeItem> getItems() {
+		return Collections.unmodifiableList(items);
+	}
+
+	public StringBuilder serialize(StringBuilder sb) {
+		sb.append(""Review scope:"");
+		for(ReviewDslScopeItem item : items) {
+			item.serialize(sb);
+			sb.append(""\n"");
+		}
+		return sb;
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslScopeItem.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslScopeItem.java
new file mode 100644
index 00000000..fc1952b8
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslScopeItem.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.dsl;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public abstract class ReviewDslScopeItem {
+
+	public abstract StringBuilder serialize(StringBuilder sb) ;
+
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslStandaloneSetup.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslStandaloneSetup.java
deleted file mode 100644
index e5caf580..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/ReviewDslStandaloneSetup.java
+++ /dev/null
@@ -1,16 +0,0 @@
-
-package org.eclipse.mylyn.reviews.tasks.dsl;
-
-import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslStandaloneSetupGenerated;
-
-/**
- * Initialization support for running Xtext languages 
- * without equinox extension registry
- */
-public class ReviewDslStandaloneSetup extends ReviewDslStandaloneSetupGenerated{
-
-	public static void doSetup() {
-		new ReviewDslStandaloneSetup().createInjectorAndDoEMFRegistration();
-	}
-}
-
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/formatting/ReviewDslFormatter.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/formatting/ReviewDslFormatter.java
deleted file mode 100644
index 35f59b67..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/formatting/ReviewDslFormatter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.mylyn.reviews.tasks.dsl.formatting;
-
-import org.eclipse.mylyn.reviews.tasks.dsl.services.ReviewDslGrammarAccess;
-import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter;
-import org.eclipse.xtext.formatting.impl.FormattingConfig;
-
-/**
- * This class contains custom formatting description.
- * 
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- * 
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an
- * example
- */
-public class ReviewDslFormatter extends AbstractDeclarativeFormatter {
-
-	@Override
-	protected void configureFormatting(FormattingConfig c) {
-		ReviewDslGrammarAccess grammar = (ReviewDslGrammarAccess) getGrammarAccess();
-		c.setLinewrap().after(grammar.getModelRule());
-		c.setIndentationIncrement().before(grammar.getReviewScopeItemRule());
-		c.setIndentationDecrement().after(grammar.getReviewScopeItemRule());
-		c.setLinewrap().after(grammar.getReviewScopeItemRule());
-		c.setLinewrap().before(
-				grammar.getReviewResultAccess().getCommentKeyword_2_0());
-		c.setLinewrap().after(
-				grammar.getReviewResultAccess().getCommentAssignment_2_1());
-	}
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java
new file mode 100644
index 00000000..69cf5513
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslLexer.java
@@ -0,0 +1,2399 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.reviews.tasks.dsl.internal;
+
+// $ANTLR 3.0 ReviewDsl.g 2011-03-06 18:30:25
+
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewDslLexer extends Lexer {
+    public static final int TASK_ID=6;
+    public static final int UNICODE_ESC=8;
+    public static final int OCTAL_ESC=9;
+    public static final int HEX_DIGIT=10;
+    public static final int T29=29;
+    public static final int INT=5;
+    public static final int T28=28;
+    public static final int T27=27;
+    public static final int T26=26;
+    public static final int T25=25;
+    public static final int Tokens=33;
+    public static final int T24=24;
+    public static final int EOF=-1;
+    public static final int T23=23;
+    public static final int T22=22;
+    public static final int T21=21;
+    public static final int T20=20;
+    public static final int ESC_SEQ=7;
+    public static final int WS=11;
+    public static final int T12=12;
+    public static final int T13=13;
+    public static final int T14=14;
+    public static final int T15=15;
+    public static final int T16=16;
+    public static final int T17=17;
+    public static final int T18=18;
+    public static final int T30=30;
+    public static final int T19=19;
+    public static final int T32=32;
+    public static final int STRING=4;
+    public static final int T31=31;
+    public ReviewDslLexer() {;} 
+    public ReviewDslLexer(CharStream input) {
+        super(input);
+    }
+    public String getGrammarFileName() { return ""ReviewDsl.g""; }
+
+    // $ANTLR start T12
+    public final void mT12() throws RecognitionException {
+        try {
+            int _type = T12;
+            // ReviewDsl.g:3:7: ( 'Review' )
+            // ReviewDsl.g:3:7: 'Review'
+            {
+            match(""Review""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T12
+
+    // $ANTLR start T13
+    public final void mT13() throws RecognitionException {
+        try {
+            int _type = T13;
+            // ReviewDsl.g:4:7: ( 'result:' )
+            // ReviewDsl.g:4:7: 'result:'
+            {
+            match(""result:""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T13
+
+    // $ANTLR start T14
+    public final void mT14() throws RecognitionException {
+        try {
+            int _type = T14;
+            // ReviewDsl.g:5:7: ( 'Comment:' )
+            // ReviewDsl.g:5:7: 'Comment:'
+            {
+            match(""Comment:""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T14
+
+    // $ANTLR start T15
+    public final void mT15() throws RecognitionException {
+        try {
+            int _type = T15;
+            // ReviewDsl.g:6:7: ( 'PASSED' )
+            // ReviewDsl.g:6:7: 'PASSED'
+            {
+            match(""PASSED""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T15
+
+    // $ANTLR start T16
+    public final void mT16() throws RecognitionException {
+        try {
+            int _type = T16;
+            // ReviewDsl.g:7:7: ( 'WARNING' )
+            // ReviewDsl.g:7:7: 'WARNING'
+            {
+            match(""WARNING""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T16
+
+    // $ANTLR start T17
+    public final void mT17() throws RecognitionException {
+        try {
+            int _type = T17;
+            // ReviewDsl.g:8:7: ( 'FAILED' )
+            // ReviewDsl.g:8:7: 'FAILED'
+            {
+            match(""FAILED""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T17
+
+    // $ANTLR start T18
+    public final void mT18() throws RecognitionException {
+        try {
+            int _type = T18;
+            // ReviewDsl.g:9:7: ( 'TODO' )
+            // ReviewDsl.g:9:7: 'TODO'
+            {
+            match(""TODO""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T18
+
+    // $ANTLR start T19
+    public final void mT19() throws RecognitionException {
+        try {
+            int _type = T19;
+            // ReviewDsl.g:10:7: ( 'File' )
+            // ReviewDsl.g:10:7: 'File'
+            {
+            match(""File""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T19
+
+    // $ANTLR start T20
+    public final void mT20() throws RecognitionException {
+        try {
+            int _type = T20;
+            // ReviewDsl.g:11:7: ( ':' )
+            // ReviewDsl.g:11:7: ':'
+            {
+            match(':'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T20
+
+    // $ANTLR start T21
+    public final void mT21() throws RecognitionException {
+        try {
+            int _type = T21;
+            // ReviewDsl.g:12:7: ( 'Line' )
+            // ReviewDsl.g:12:7: 'Line'
+            {
+            match(""Line""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T21
+
+    // $ANTLR start T22
+    public final void mT22() throws RecognitionException {
+        try {
+            int _type = T22;
+            // ReviewDsl.g:13:7: ( '-' )
+            // ReviewDsl.g:13:7: '-'
+            {
+            match('-'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T22
+
+    // $ANTLR start T23
+    public final void mT23() throws RecognitionException {
+        try {
+            int _type = T23;
+            // ReviewDsl.g:14:7: ( 'scope:' )
+            // ReviewDsl.g:14:7: 'scope:'
+            {
+            match(""scope:""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T23
+
+    // $ANTLR start T24
+    public final void mT24() throws RecognitionException {
+        try {
+            int _type = T24;
+            // ReviewDsl.g:15:7: ( 'Resource' )
+            // ReviewDsl.g:15:7: 'Resource'
+            {
+            match(""Resource""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T24
+
+    // $ANTLR start T25
+    public final void mT25() throws RecognitionException {
+        try {
+            int _type = T25;
+            // ReviewDsl.g:16:7: ( 'Changeset' )
+            // ReviewDsl.g:16:7: 'Changeset'
+            {
+            match(""Changeset""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T25
+
+    // $ANTLR start T26
+    public final void mT26() throws RecognitionException {
+        try {
+            int _type = T26;
+            // ReviewDsl.g:17:7: ( 'from' )
+            // ReviewDsl.g:17:7: 'from'
+            {
+            match(""from""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T26
+
+    // $ANTLR start T27
+    public final void mT27() throws RecognitionException {
+        try {
+            int _type = T27;
+            // ReviewDsl.g:18:7: ( 'Patch' )
+            // ReviewDsl.g:18:7: 'Patch'
+            {
+            match(""Patch""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T27
+
+    // $ANTLR start T28
+    public final void mT28() throws RecognitionException {
+        try {
+            int _type = T28;
+            // ReviewDsl.g:19:7: ( 'Attachment' )
+            // ReviewDsl.g:19:7: 'Attachment'
+            {
+            match(""Attachment""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T28
+
+    // $ANTLR start T29
+    public final void mT29() throws RecognitionException {
+        try {
+            int _type = T29;
+            // ReviewDsl.g:20:7: ( 'by' )
+            // ReviewDsl.g:20:7: 'by'
+            {
+            match(""by""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T29
+
+    // $ANTLR start T30
+    public final void mT30() throws RecognitionException {
+        try {
+            int _type = T30;
+            // ReviewDsl.g:21:7: ( 'on' )
+            // ReviewDsl.g:21:7: 'on'
+            {
+            match(""on""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T30
+
+    // $ANTLR start T31
+    public final void mT31() throws RecognitionException {
+        try {
+            int _type = T31;
+            // ReviewDsl.g:22:7: ( 'of' )
+            // ReviewDsl.g:22:7: 'of'
+            {
+            match(""of""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T31
+
+    // $ANTLR start T32
+    public final void mT32() throws RecognitionException {
+        try {
+            int _type = T32;
+            // ReviewDsl.g:23:7: ( 'task' )
+            // ReviewDsl.g:23:7: 'task'
+            {
+            match(""task""); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T32
+
+    // $ANTLR start TASK_ID
+    public final void mTASK_ID() throws RecognitionException {
+        try {
+            int _type = TASK_ID;
+            // ReviewDsl.g:72:2: ( ( 'a' .. 'z' | 'A' .. 'Z' )+ ( '_' | '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | INT )+ )
+            // ReviewDsl.g:72:2: ( 'a' .. 'z' | 'A' .. 'Z' )+ ( '_' | '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | INT )+
+            {
+            // ReviewDsl.g:72:2: ( 'a' .. 'z' | 'A' .. 'Z' )+
+            int cnt1=0;
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( ((LA1_0>='a' && LA1_0<='z')) ) {
+                    alt1=1;
+                }
+                else if ( ((LA1_0>='A' && LA1_0<='Z')) ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+            	case 1 :
+            	    // ReviewDsl.g:
+            	    {
+            	    if ( (input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt1 >= 1 ) break loop1;
+                        EarlyExitException eee =
+                            new EarlyExitException(1, input);
+                        throw eee;
+                }
+                cnt1++;
+            } while (true);
+
+            // ReviewDsl.g:72:25: ( '_' | '-' )?
+            int alt2=2;
+            int LA2_0 = input.LA(1);
+
+            if ( (LA2_0=='-'||LA2_0=='_') ) {
+                alt2=1;
+            }
+            switch (alt2) {
+                case 1 :
+                    // ReviewDsl.g:
+                    {
+                    if ( input.LA(1)=='-'||input.LA(1)=='_' ) {
+                        input.consume();
+
+                    }
+                    else {
+                        MismatchedSetException mse =
+                            new MismatchedSetException(null,input);
+                        recover(mse);    throw mse;
+                    }
+
+
+                    }
+                    break;
+
+            }
+
+            // ReviewDsl.g:72:38: ( 'a' .. 'z' | 'A' .. 'Z' | INT )+
+            int cnt3=0;
+            loop3:
+            do {
+                int alt3=4;
+                switch ( input.LA(1) ) {
+                case 'a':
+                case 'b':
+                case 'c':
+                case 'd':
+                case 'e':
+                case 'f':
+                case 'g':
+                case 'h':
+                case 'i':
+                case 'j':
+                case 'k':
+                case 'l':
+                case 'm':
+                case 'n':
+                case 'o':
+                case 'p':
+                case 'q':
+                case 'r':
+                case 's':
+                case 't':
+                case 'u':
+                case 'v':
+                case 'w':
+                case 'x':
+                case 'y':
+                case 'z':
+                    {
+                    alt3=1;
+                    }
+                    break;
+                case 'A':
+                case 'B':
+                case 'C':
+                case 'D':
+                case 'E':
+                case 'F':
+                case 'G':
+                case 'H':
+                case 'I':
+                case 'J':
+                case 'K':
+                case 'L':
+                case 'M':
+                case 'N':
+                case 'O':
+                case 'P':
+                case 'Q':
+                case 'R':
+                case 'S':
+                case 'T':
+                case 'U':
+                case 'V':
+                case 'W':
+                case 'X':
+                case 'Y':
+                case 'Z':
+                    {
+                    alt3=2;
+                    }
+                    break;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    {
+                    alt3=3;
+                    }
+                    break;
+
+                }
+
+                switch (alt3) {
+            	case 1 :
+            	    // ReviewDsl.g:72:39: 'a' .. 'z'
+            	    {
+            	    matchRange('a','z'); 
+
+            	    }
+            	    break;
+            	case 2 :
+            	    // ReviewDsl.g:72:50: 'A' .. 'Z'
+            	    {
+            	    matchRange('A','Z'); 
+
+            	    }
+            	    break;
+            	case 3 :
+            	    // ReviewDsl.g:72:61: INT
+            	    {
+            	    mINT(); 
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt3 >= 1 ) break loop3;
+                        EarlyExitException eee =
+                            new EarlyExitException(3, input);
+                        throw eee;
+                }
+                cnt3++;
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end TASK_ID
+
+    // $ANTLR start INT
+    public final void mINT() throws RecognitionException {
+        try {
+            int _type = INT;
+            // ReviewDsl.g:75:2: ( ( '0' .. '9' )+ )
+            // ReviewDsl.g:75:2: ( '0' .. '9' )+
+            {
+            // ReviewDsl.g:75:2: ( '0' .. '9' )+
+            int cnt4=0;
+            loop4:
+            do {
+                int alt4=2;
+                int LA4_0 = input.LA(1);
+
+                if ( ((LA4_0>='0' && LA4_0<='9')) ) {
+                    alt4=1;
+                }
+
+
+                switch (alt4) {
+            	case 1 :
+            	    // ReviewDsl.g:75:2: '0' .. '9'
+            	    {
+            	    matchRange('0','9'); 
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt4 >= 1 ) break loop4;
+                        EarlyExitException eee =
+                            new EarlyExitException(4, input);
+                        throw eee;
+                }
+                cnt4++;
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end INT
+
+    // $ANTLR start STRING
+    public final void mSTRING() throws RecognitionException {
+        try {
+            int _type = STRING;
+            // ReviewDsl.g:79:8: ( '\""' ( ESC_SEQ | ~ ( '\\\\' | '\""' ) )* '\""' )
+            // ReviewDsl.g:79:8: '\""' ( ESC_SEQ | ~ ( '\\\\' | '\""' ) )* '\""'
+            {
+            match('\""'); 
+            // ReviewDsl.g:79:12: ( ESC_SEQ | ~ ( '\\\\' | '\""' ) )*
+            loop5:
+            do {
+                int alt5=3;
+                int LA5_0 = input.LA(1);
+
+                if ( (LA5_0=='\\') ) {
+                    alt5=1;
+                }
+                else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
+                    alt5=2;
+                }
+
+
+                switch (alt5) {
+            	case 1 :
+            	    // ReviewDsl.g:79:14: ESC_SEQ
+            	    {
+            	    mESC_SEQ(); 
+
+            	    }
+            	    break;
+            	case 2 :
+            	    // ReviewDsl.g:79:24: ~ ( '\\\\' | '\""' )
+            	    {
+            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop5;
+                }
+            } while (true);
+
+            match('\""'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end STRING
+
+    // $ANTLR start ESC_SEQ
+    public final void mESC_SEQ() throws RecognitionException {
+        try {
+            // ReviewDsl.g:83:9: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\""' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
+            int alt6=3;
+            int LA6_0 = input.LA(1);
+
+            if ( (LA6_0=='\\') ) {
+                switch ( input.LA(2) ) {
+                case 'u':
+                    {
+                    alt6=2;
+                    }
+                    break;
+                case '\""':
+                case '\'':
+                case '\\':
+                case 'b':
+                case 'f':
+                case 'n':
+                case 'r':
+                case 't':
+                    {
+                    alt6=1;
+                    }
+                    break;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                    {
+                    alt6=3;
+                    }
+                    break;
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException(""81:1: fragment ESC_SEQ : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\""' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC );"", 6, 1, input);
+
+                    throw nvae;
+                }
+
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""81:1: fragment ESC_SEQ : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\""' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC );"", 6, 0, input);
+
+                throw nvae;
+            }
+            switch (alt6) {
+                case 1 :
+                    // ReviewDsl.g:83:9: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\""' | '\\'' | '\\\\' )
+                    {
+                    match('\\'); 
+                    if ( input.LA(1)=='\""'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
+                        input.consume();
+
+                    }
+                    else {
+                        MismatchedSetException mse =
+                            new MismatchedSetException(null,input);
+                        recover(mse);    throw mse;
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // ReviewDsl.g:84:9: UNICODE_ESC
+                    {
+                    mUNICODE_ESC(); 
+
+                    }
+                    break;
+                case 3 :
+                    // ReviewDsl.g:85:9: OCTAL_ESC
+                    {
+                    mOCTAL_ESC(); 
+
+                    }
+                    break;
+
+            }
+        }
+        finally {
+        }
+    }
+    // $ANTLR end ESC_SEQ
+
+    // $ANTLR start OCTAL_ESC
+    public final void mOCTAL_ESC() throws RecognitionException {
+        try {
+            // ReviewDsl.g:89:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            int alt7=3;
+            int LA7_0 = input.LA(1);
+
+            if ( (LA7_0=='\\') ) {
+                int LA7_1 = input.LA(2);
+
+                if ( ((LA7_1>='0' && LA7_1<='3')) ) {
+                    int LA7_2 = input.LA(3);
+
+                    if ( ((LA7_2>='0' && LA7_2<='7')) ) {
+                        int LA7_5 = input.LA(4);
+
+                        if ( ((LA7_5>='0' && LA7_5<='7')) ) {
+                            alt7=1;
+                        }
+                        else {
+                            alt7=2;}
+                    }
+                    else {
+                        alt7=3;}
+                }
+                else if ( ((LA7_1>='4' && LA7_1<='7')) ) {
+                    int LA7_3 = input.LA(3);
+
+                    if ( ((LA7_3>='0' && LA7_3<='7')) ) {
+                        alt7=2;
+                    }
+                    else {
+                        alt7=3;}
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException(""87:1: fragment OCTAL_ESC : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );"", 7, 1, input);
+
+                    throw nvae;
+                }
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""87:1: fragment OCTAL_ESC : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );"", 7, 0, input);
+
+                throw nvae;
+            }
+            switch (alt7) {
+                case 1 :
+                    // ReviewDsl.g:89:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    {
+                    match('\\'); 
+                    // ReviewDsl.g:89:14: ( '0' .. '3' )
+                    // ReviewDsl.g:89:15: '0' .. '3'
+                    {
+                    matchRange('0','3'); 
+
+                    }
+
+                    // ReviewDsl.g:89:25: ( '0' .. '7' )
+                    // ReviewDsl.g:89:26: '0' .. '7'
+                    {
+                    matchRange('0','7'); 
+
+                    }
+
+                    // ReviewDsl.g:89:36: ( '0' .. '7' )
+                    // ReviewDsl.g:89:37: '0' .. '7'
+                    {
+                    matchRange('0','7'); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // ReviewDsl.g:90:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    {
+                    match('\\'); 
+                    // ReviewDsl.g:90:14: ( '0' .. '7' )
+                    // ReviewDsl.g:90:15: '0' .. '7'
+                    {
+                    matchRange('0','7'); 
+
+                    }
+
+                    // ReviewDsl.g:90:25: ( '0' .. '7' )
+                    // ReviewDsl.g:90:26: '0' .. '7'
+                    {
+                    matchRange('0','7'); 
+
+                    }
+
+
+                    }
+                    break;
+                case 3 :
+                    // ReviewDsl.g:91:9: '\\\\' ( '0' .. '7' )
+                    {
+                    match('\\'); 
+                    // ReviewDsl.g:91:14: ( '0' .. '7' )
+                    // ReviewDsl.g:91:15: '0' .. '7'
+                    {
+                    matchRange('0','7'); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        finally {
+        }
+    }
+    // $ANTLR end OCTAL_ESC
+
+    // $ANTLR start UNICODE_ESC
+    public final void mUNICODE_ESC() throws RecognitionException {
+        try {
+            // ReviewDsl.g:95:9: ( '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT )
+            // ReviewDsl.g:95:9: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+            {
+            match('\\'); 
+            match('u'); 
+            mHEX_DIGIT(); 
+            mHEX_DIGIT(); 
+            mHEX_DIGIT(); 
+            mHEX_DIGIT(); 
+
+            }
+
+        }
+        finally {
+        }
+    }
+    // $ANTLR end UNICODE_ESC
+
+    // $ANTLR start HEX_DIGIT
+    public final void mHEX_DIGIT() throws RecognitionException {
+        try {
+            // ReviewDsl.g:99:13: ( ( INT | 'a' .. 'f' | 'A' .. 'F' ) )
+            // ReviewDsl.g:99:13: ( INT | 'a' .. 'f' | 'A' .. 'F' )
+            {
+            // ReviewDsl.g:99:13: ( INT | 'a' .. 'f' | 'A' .. 'F' )
+            int alt8=3;
+            switch ( input.LA(1) ) {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                {
+                alt8=1;
+                }
+                break;
+            case 'a':
+            case 'b':
+            case 'c':
+            case 'd':
+            case 'e':
+            case 'f':
+                {
+                alt8=2;
+                }
+                break;
+            case 'A':
+            case 'B':
+            case 'C':
+            case 'D':
+            case 'E':
+            case 'F':
+                {
+                alt8=3;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException(""99:13: ( INT | 'a' .. 'f' | 'A' .. 'F' )"", 8, 0, input);
+
+                throw nvae;
+            }
+
+            switch (alt8) {
+                case 1 :
+                    // ReviewDsl.g:99:14: INT
+                    {
+                    mINT(); 
+
+                    }
+                    break;
+                case 2 :
+                    // ReviewDsl.g:99:18: 'a' .. 'f'
+                    {
+                    matchRange('a','f'); 
+
+                    }
+                    break;
+                case 3 :
+                    // ReviewDsl.g:99:27: 'A' .. 'F'
+                    {
+                    matchRange('A','F'); 
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+        }
+        finally {
+        }
+    }
+    // $ANTLR end HEX_DIGIT
+
+    // $ANTLR start WS
+    public final void mWS() throws RecognitionException {
+        try {
+            // ReviewDsl.g:102:9: ( ( ' ' | '\\t' | '\\r' | '\\n' ) )
+            // ReviewDsl.g:102:9: ( ' ' | '\\t' | '\\r' | '\\n' )
+            {
+            if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse =
+                    new MismatchedSetException(null,input);
+                recover(mse);    throw mse;
+            }
+
+            channel=HIDDEN;
+
+            }
+
+        }
+        finally {
+        }
+    }
+    // $ANTLR end WS
+
+    public void mTokens() throws RecognitionException {
+        // ReviewDsl.g:1:10: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING )
+        int alt9=24;
+        switch ( input.LA(1) ) {
+        case 'R':
+            {
+            int LA9_1 = input.LA(2);
+
+            if ( (LA9_1=='e') ) {
+                switch ( input.LA(3) ) {
+                case 'v':
+                    {
+                    int LA9_38 = input.LA(4);
+
+                    if ( (LA9_38=='i') ) {
+                        int LA9_57 = input.LA(5);
+
+                        if ( (LA9_57=='e') ) {
+                            int LA9_73 = input.LA(6);
+
+                            if ( (LA9_73=='w') ) {
+                                int LA9_89 = input.LA(7);
+
+                                if ( (LA9_89=='-'||(LA9_89>='0' && LA9_89<='9')||(LA9_89>='A' && LA9_89<='Z')||LA9_89=='_'||(LA9_89>='a' && LA9_89<='z')) ) {
+                                    alt9=22;
+                                }
+                                else {
+                                    alt9=1;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                    }
+                    break;
+                case 's':
+                    {
+                    int LA9_39 = input.LA(4);
+
+                    if ( (LA9_39=='o') ) {
+                        int LA9_58 = input.LA(5);
+
+                        if ( (LA9_58=='u') ) {
+                            int LA9_74 = input.LA(6);
+
+                            if ( (LA9_74=='r') ) {
+                                int LA9_90 = input.LA(7);
+
+                                if ( (LA9_90=='c') ) {
+                                    int LA9_101 = input.LA(8);
+
+                                    if ( (LA9_101=='e') ) {
+                                        int LA9_109 = input.LA(9);
+
+                                        if ( (LA9_109=='-'||(LA9_109>='0' && LA9_109<='9')||(LA9_109>='A' && LA9_109<='Z')||LA9_109=='_'||(LA9_109>='a' && LA9_109<='z')) ) {
+                                            alt9=22;
+                                        }
+                                        else {
+                                            alt9=13;}
+                                    }
+                                    else {
+                                        alt9=22;}
+                                }
+                                else {
+                                    alt9=22;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                    }
+                    break;
+                default:
+                    alt9=22;}
+
+            }
+            else if ( (LA9_1=='-'||(LA9_1>='0' && LA9_1<='9')||(LA9_1>='A' && LA9_1<='Z')||LA9_1=='_'||(LA9_1>='a' && LA9_1<='d')||(LA9_1>='f' && LA9_1<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 1, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'r':
+            {
+            int LA9_2 = input.LA(2);
+
+            if ( (LA9_2=='e') ) {
+                int LA9_21 = input.LA(3);
+
+                if ( (LA9_21=='s') ) {
+                    int LA9_40 = input.LA(4);
+
+                    if ( (LA9_40=='u') ) {
+                        int LA9_59 = input.LA(5);
+
+                        if ( (LA9_59=='l') ) {
+                            int LA9_75 = input.LA(6);
+
+                            if ( (LA9_75=='t') ) {
+                                int LA9_91 = input.LA(7);
+
+                                if ( (LA9_91==':') ) {
+                                    alt9=2;
+                                }
+                                else {
+                                    alt9=22;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_2=='-'||(LA9_2>='0' && LA9_2<='9')||(LA9_2>='A' && LA9_2<='Z')||LA9_2=='_'||(LA9_2>='a' && LA9_2<='d')||(LA9_2>='f' && LA9_2<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 2, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'C':
+            {
+            switch ( input.LA(2) ) {
+            case 'h':
+                {
+                int LA9_22 = input.LA(3);
+
+                if ( (LA9_22=='a') ) {
+                    int LA9_41 = input.LA(4);
+
+                    if ( (LA9_41=='n') ) {
+                        int LA9_60 = input.LA(5);
+
+                        if ( (LA9_60=='g') ) {
+                            int LA9_76 = input.LA(6);
+
+                            if ( (LA9_76=='e') ) {
+                                int LA9_92 = input.LA(7);
+
+                                if ( (LA9_92=='s') ) {
+                                    int LA9_103 = input.LA(8);
+
+                                    if ( (LA9_103=='e') ) {
+                                        int LA9_110 = input.LA(9);
+
+                                        if ( (LA9_110=='t') ) {
+                                            int LA9_115 = input.LA(10);
+
+                                            if ( (LA9_115=='-'||(LA9_115>='0' && LA9_115<='9')||(LA9_115>='A' && LA9_115<='Z')||LA9_115=='_'||(LA9_115>='a' && LA9_115<='z')) ) {
+                                                alt9=22;
+                                            }
+                                            else {
+                                                alt9=14;}
+                                        }
+                                        else {
+                                            alt9=22;}
+                                    }
+                                    else {
+                                        alt9=22;}
+                                }
+                                else {
+                                    alt9=22;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+                }
+                break;
+            case 'o':
+                {
+                int LA9_23 = input.LA(3);
+
+                if ( (LA9_23=='m') ) {
+                    int LA9_42 = input.LA(4);
+
+                    if ( (LA9_42=='m') ) {
+                        int LA9_61 = input.LA(5);
+
+                        if ( (LA9_61=='e') ) {
+                            int LA9_77 = input.LA(6);
+
+                            if ( (LA9_77=='n') ) {
+                                int LA9_93 = input.LA(7);
+
+                                if ( (LA9_93=='t') ) {
+                                    int LA9_104 = input.LA(8);
+
+                                    if ( (LA9_104==':') ) {
+                                        alt9=3;
+                                    }
+                                    else {
+                                        alt9=22;}
+                                }
+                                else {
+                                    alt9=22;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+                }
+                break;
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case 'A':
+            case 'B':
+            case 'C':
+            case 'D':
+            case 'E':
+            case 'F':
+            case 'G':
+            case 'H':
+            case 'I':
+            case 'J':
+            case 'K':
+            case 'L':
+            case 'M':
+            case 'N':
+            case 'O':
+            case 'P':
+            case 'Q':
+            case 'R':
+            case 'S':
+            case 'T':
+            case 'U':
+            case 'V':
+            case 'W':
+            case 'X':
+            case 'Y':
+            case 'Z':
+            case '_':
+            case 'a':
+            case 'b':
+            case 'c':
+            case 'd':
+            case 'e':
+            case 'f':
+            case 'g':
+            case 'i':
+            case 'j':
+            case 'k':
+            case 'l':
+            case 'm':
+            case 'n':
+            case 'p':
+            case 'q':
+            case 'r':
+            case 's':
+            case 't':
+            case 'u':
+            case 'v':
+            case 'w':
+            case 'x':
+            case 'y':
+            case 'z':
+                {
+                alt9=22;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 3, input);
+
+                throw nvae;
+            }
+
+            }
+            break;
+        case 'P':
+            {
+            switch ( input.LA(2) ) {
+            case 'a':
+                {
+                int LA9_24 = input.LA(3);
+
+                if ( (LA9_24=='t') ) {
+                    int LA9_43 = input.LA(4);
+
+                    if ( (LA9_43=='c') ) {
+                        int LA9_62 = input.LA(5);
+
+                        if ( (LA9_62=='h') ) {
+                            int LA9_78 = input.LA(6);
+
+                            if ( (LA9_78=='-'||(LA9_78>='0' && LA9_78<='9')||(LA9_78>='A' && LA9_78<='Z')||LA9_78=='_'||(LA9_78>='a' && LA9_78<='z')) ) {
+                                alt9=22;
+                            }
+                            else {
+                                alt9=16;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+                }
+                break;
+            case 'A':
+                {
+                int LA9_25 = input.LA(3);
+
+                if ( (LA9_25=='S') ) {
+                    int LA9_44 = input.LA(4);
+
+                    if ( (LA9_44=='S') ) {
+                        int LA9_63 = input.LA(5);
+
+                        if ( (LA9_63=='E') ) {
+                            int LA9_79 = input.LA(6);
+
+                            if ( (LA9_79=='D') ) {
+                                int LA9_95 = input.LA(7);
+
+                                if ( (LA9_95=='-'||(LA9_95>='0' && LA9_95<='9')||(LA9_95>='A' && LA9_95<='Z')||LA9_95=='_'||(LA9_95>='a' && LA9_95<='z')) ) {
+                                    alt9=22;
+                                }
+                                else {
+                                    alt9=4;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+                }
+                break;
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case 'B':
+            case 'C':
+            case 'D':
+            case 'E':
+            case 'F':
+            case 'G':
+            case 'H':
+            case 'I':
+            case 'J':
+            case 'K':
+            case 'L':
+            case 'M':
+            case 'N':
+            case 'O':
+            case 'P':
+            case 'Q':
+            case 'R':
+            case 'S':
+            case 'T':
+            case 'U':
+            case 'V':
+            case 'W':
+            case 'X':
+            case 'Y':
+            case 'Z':
+            case '_':
+            case 'b':
+            case 'c':
+            case 'd':
+            case 'e':
+            case 'f':
+            case 'g':
+            case 'h':
+            case 'i':
+            case 'j':
+            case 'k':
+            case 'l':
+            case 'm':
+            case 'n':
+            case 'o':
+            case 'p':
+            case 'q':
+            case 'r':
+            case 's':
+            case 't':
+            case 'u':
+            case 'v':
+            case 'w':
+            case 'x':
+            case 'y':
+            case 'z':
+                {
+                alt9=22;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 4, input);
+
+                throw nvae;
+            }
+
+            }
+            break;
+        case 'W':
+            {
+            int LA9_5 = input.LA(2);
+
+            if ( (LA9_5=='A') ) {
+                int LA9_26 = input.LA(3);
+
+                if ( (LA9_26=='R') ) {
+                    int LA9_45 = input.LA(4);
+
+                    if ( (LA9_45=='N') ) {
+                        int LA9_64 = input.LA(5);
+
+                        if ( (LA9_64=='I') ) {
+                            int LA9_80 = input.LA(6);
+
+                            if ( (LA9_80=='N') ) {
+                                int LA9_96 = input.LA(7);
+
+                                if ( (LA9_96=='G') ) {
+                                    int LA9_106 = input.LA(8);
+
+                                    if ( (LA9_106=='-'||(LA9_106>='0' && LA9_106<='9')||(LA9_106>='A' && LA9_106<='Z')||LA9_106=='_'||(LA9_106>='a' && LA9_106<='z')) ) {
+                                        alt9=22;
+                                    }
+                                    else {
+                                        alt9=5;}
+                                }
+                                else {
+                                    alt9=22;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_5=='-'||(LA9_5>='0' && LA9_5<='9')||(LA9_5>='B' && LA9_5<='Z')||LA9_5=='_'||(LA9_5>='a' && LA9_5<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 5, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'F':
+            {
+            switch ( input.LA(2) ) {
+            case 'A':
+                {
+                int LA9_27 = input.LA(3);
+
+                if ( (LA9_27=='I') ) {
+                    int LA9_46 = input.LA(4);
+
+                    if ( (LA9_46=='L') ) {
+                        int LA9_65 = input.LA(5);
+
+                        if ( (LA9_65=='E') ) {
+                            int LA9_81 = input.LA(6);
+
+                            if ( (LA9_81=='D') ) {
+                                int LA9_97 = input.LA(7);
+
+                                if ( (LA9_97=='-'||(LA9_97>='0' && LA9_97<='9')||(LA9_97>='A' && LA9_97<='Z')||LA9_97=='_'||(LA9_97>='a' && LA9_97<='z')) ) {
+                                    alt9=22;
+                                }
+                                else {
+                                    alt9=6;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+                }
+                break;
+            case 'i':
+                {
+                int LA9_28 = input.LA(3);
+
+                if ( (LA9_28=='l') ) {
+                    int LA9_47 = input.LA(4);
+
+                    if ( (LA9_47=='e') ) {
+                        int LA9_66 = input.LA(5);
+
+                        if ( (LA9_66=='-'||(LA9_66>='0' && LA9_66<='9')||(LA9_66>='A' && LA9_66<='Z')||LA9_66=='_'||(LA9_66>='a' && LA9_66<='z')) ) {
+                            alt9=22;
+                        }
+                        else {
+                            alt9=8;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+                }
+                break;
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case 'B':
+            case 'C':
+            case 'D':
+            case 'E':
+            case 'F':
+            case 'G':
+            case 'H':
+            case 'I':
+            case 'J':
+            case 'K':
+            case 'L':
+            case 'M':
+            case 'N':
+            case 'O':
+            case 'P':
+            case 'Q':
+            case 'R':
+            case 'S':
+            case 'T':
+            case 'U':
+            case 'V':
+            case 'W':
+            case 'X':
+            case 'Y':
+            case 'Z':
+            case '_':
+            case 'a':
+            case 'b':
+            case 'c':
+            case 'd':
+            case 'e':
+            case 'f':
+            case 'g':
+            case 'h':
+            case 'j':
+            case 'k':
+            case 'l':
+            case 'm':
+            case 'n':
+            case 'o':
+            case 'p':
+            case 'q':
+            case 'r':
+            case 's':
+            case 't':
+            case 'u':
+            case 'v':
+            case 'w':
+            case 'x':
+            case 'y':
+            case 'z':
+                {
+                alt9=22;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 6, input);
+
+                throw nvae;
+            }
+
+            }
+            break;
+        case 'T':
+            {
+            int LA9_7 = input.LA(2);
+
+            if ( (LA9_7=='O') ) {
+                int LA9_29 = input.LA(3);
+
+                if ( (LA9_29=='D') ) {
+                    int LA9_48 = input.LA(4);
+
+                    if ( (LA9_48=='O') ) {
+                        int LA9_67 = input.LA(5);
+
+                        if ( (LA9_67=='-'||(LA9_67>='0' && LA9_67<='9')||(LA9_67>='A' && LA9_67<='Z')||LA9_67=='_'||(LA9_67>='a' && LA9_67<='z')) ) {
+                            alt9=22;
+                        }
+                        else {
+                            alt9=7;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_7=='-'||(LA9_7>='0' && LA9_7<='9')||(LA9_7>='A' && LA9_7<='N')||(LA9_7>='P' && LA9_7<='Z')||LA9_7=='_'||(LA9_7>='a' && LA9_7<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 7, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case ':':
+            {
+            alt9=9;
+            }
+            break;
+        case 'L':
+            {
+            int LA9_9 = input.LA(2);
+
+            if ( (LA9_9=='i') ) {
+                int LA9_30 = input.LA(3);
+
+                if ( (LA9_30=='n') ) {
+                    int LA9_49 = input.LA(4);
+
+                    if ( (LA9_49=='e') ) {
+                        int LA9_68 = input.LA(5);
+
+                        if ( (LA9_68=='-'||(LA9_68>='0' && LA9_68<='9')||(LA9_68>='A' && LA9_68<='Z')||LA9_68=='_'||(LA9_68>='a' && LA9_68<='z')) ) {
+                            alt9=22;
+                        }
+                        else {
+                            alt9=10;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_9=='-'||(LA9_9>='0' && LA9_9<='9')||(LA9_9>='A' && LA9_9<='Z')||LA9_9=='_'||(LA9_9>='a' && LA9_9<='h')||(LA9_9>='j' && LA9_9<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 9, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case '-':
+            {
+            alt9=11;
+            }
+            break;
+        case 's':
+            {
+            int LA9_11 = input.LA(2);
+
+            if ( (LA9_11=='c') ) {
+                int LA9_31 = input.LA(3);
+
+                if ( (LA9_31=='o') ) {
+                    int LA9_50 = input.LA(4);
+
+                    if ( (LA9_50=='p') ) {
+                        int LA9_69 = input.LA(5);
+
+                        if ( (LA9_69=='e') ) {
+                            int LA9_85 = input.LA(6);
+
+                            if ( (LA9_85==':') ) {
+                                alt9=12;
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_11=='-'||(LA9_11>='0' && LA9_11<='9')||(LA9_11>='A' && LA9_11<='Z')||LA9_11=='_'||(LA9_11>='a' && LA9_11<='b')||(LA9_11>='d' && LA9_11<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 11, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'f':
+            {
+            int LA9_12 = input.LA(2);
+
+            if ( (LA9_12=='r') ) {
+                int LA9_32 = input.LA(3);
+
+                if ( (LA9_32=='o') ) {
+                    int LA9_51 = input.LA(4);
+
+                    if ( (LA9_51=='m') ) {
+                        int LA9_70 = input.LA(5);
+
+                        if ( (LA9_70=='-'||(LA9_70>='0' && LA9_70<='9')||(LA9_70>='A' && LA9_70<='Z')||LA9_70=='_'||(LA9_70>='a' && LA9_70<='z')) ) {
+                            alt9=22;
+                        }
+                        else {
+                            alt9=15;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_12=='-'||(LA9_12>='0' && LA9_12<='9')||(LA9_12>='A' && LA9_12<='Z')||LA9_12=='_'||(LA9_12>='a' && LA9_12<='q')||(LA9_12>='s' && LA9_12<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 12, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'A':
+            {
+            int LA9_13 = input.LA(2);
+
+            if ( (LA9_13=='t') ) {
+                int LA9_33 = input.LA(3);
+
+                if ( (LA9_33=='t') ) {
+                    int LA9_52 = input.LA(4);
+
+                    if ( (LA9_52=='a') ) {
+                        int LA9_71 = input.LA(5);
+
+                        if ( (LA9_71=='c') ) {
+                            int LA9_87 = input.LA(6);
+
+                            if ( (LA9_87=='h') ) {
+                                int LA9_99 = input.LA(7);
+
+                                if ( (LA9_99=='m') ) {
+                                    int LA9_108 = input.LA(8);
+
+                                    if ( (LA9_108=='e') ) {
+                                        int LA9_113 = input.LA(9);
+
+                                        if ( (LA9_113=='n') ) {
+                                            int LA9_116 = input.LA(10);
+
+                                            if ( (LA9_116=='t') ) {
+                                                int LA9_118 = input.LA(11);
+
+                                                if ( (LA9_118=='-'||(LA9_118>='0' && LA9_118<='9')||(LA9_118>='A' && LA9_118<='Z')||LA9_118=='_'||(LA9_118>='a' && LA9_118<='z')) ) {
+                                                    alt9=22;
+                                                }
+                                                else {
+                                                    alt9=17;}
+                                            }
+                                            else {
+                                                alt9=22;}
+                                        }
+                                        else {
+                                            alt9=22;}
+                                    }
+                                    else {
+                                        alt9=22;}
+                                }
+                                else {
+                                    alt9=22;}
+                            }
+                            else {
+                                alt9=22;}
+                        }
+                        else {
+                            alt9=22;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_13=='-'||(LA9_13>='0' && LA9_13<='9')||(LA9_13>='A' && LA9_13<='Z')||LA9_13=='_'||(LA9_13>='a' && LA9_13<='s')||(LA9_13>='u' && LA9_13<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 13, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'b':
+            {
+            int LA9_14 = input.LA(2);
+
+            if ( (LA9_14=='y') ) {
+                int LA9_34 = input.LA(3);
+
+                if ( (LA9_34=='-'||(LA9_34>='0' && LA9_34<='9')||(LA9_34>='A' && LA9_34<='Z')||LA9_34=='_'||(LA9_34>='a' && LA9_34<='z')) ) {
+                    alt9=22;
+                }
+                else {
+                    alt9=18;}
+            }
+            else if ( (LA9_14=='-'||(LA9_14>='0' && LA9_14<='9')||(LA9_14>='A' && LA9_14<='Z')||LA9_14=='_'||(LA9_14>='a' && LA9_14<='x')||LA9_14=='z') ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 14, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'o':
+            {
+            switch ( input.LA(2) ) {
+            case 'n':
+                {
+                int LA9_35 = input.LA(3);
+
+                if ( (LA9_35=='-'||(LA9_35>='0' && LA9_35<='9')||(LA9_35>='A' && LA9_35<='Z')||LA9_35=='_'||(LA9_35>='a' && LA9_35<='z')) ) {
+                    alt9=22;
+                }
+                else {
+                    alt9=19;}
+                }
+                break;
+            case 'f':
+                {
+                int LA9_36 = input.LA(3);
+
+                if ( (LA9_36=='-'||(LA9_36>='0' && LA9_36<='9')||(LA9_36>='A' && LA9_36<='Z')||LA9_36=='_'||(LA9_36>='a' && LA9_36<='z')) ) {
+                    alt9=22;
+                }
+                else {
+                    alt9=20;}
+                }
+                break;
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case 'A':
+            case 'B':
+            case 'C':
+            case 'D':
+            case 'E':
+            case 'F':
+            case 'G':
+            case 'H':
+            case 'I':
+            case 'J':
+            case 'K':
+            case 'L':
+            case 'M':
+            case 'N':
+            case 'O':
+            case 'P':
+            case 'Q':
+            case 'R':
+            case 'S':
+            case 'T':
+            case 'U':
+            case 'V':
+            case 'W':
+            case 'X':
+            case 'Y':
+            case 'Z':
+            case '_':
+            case 'a':
+            case 'b':
+            case 'c':
+            case 'd':
+            case 'e':
+            case 'g':
+            case 'h':
+            case 'i':
+            case 'j':
+            case 'k':
+            case 'l':
+            case 'm':
+            case 'o':
+            case 'p':
+            case 'q':
+            case 'r':
+            case 's':
+            case 't':
+            case 'u':
+            case 'v':
+            case 'w':
+            case 'x':
+            case 'y':
+            case 'z':
+                {
+                alt9=22;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 15, input);
+
+                throw nvae;
+            }
+
+            }
+            break;
+        case 't':
+            {
+            int LA9_16 = input.LA(2);
+
+            if ( (LA9_16=='a') ) {
+                int LA9_37 = input.LA(3);
+
+                if ( (LA9_37=='s') ) {
+                    int LA9_56 = input.LA(4);
+
+                    if ( (LA9_56=='k') ) {
+                        int LA9_72 = input.LA(5);
+
+                        if ( (LA9_72=='-'||(LA9_72>='0' && LA9_72<='9')||(LA9_72>='A' && LA9_72<='Z')||LA9_72=='_'||(LA9_72>='a' && LA9_72<='z')) ) {
+                            alt9=22;
+                        }
+                        else {
+                            alt9=21;}
+                    }
+                    else {
+                        alt9=22;}
+                }
+                else {
+                    alt9=22;}
+            }
+            else if ( (LA9_16=='-'||(LA9_16>='0' && LA9_16<='9')||(LA9_16>='A' && LA9_16<='Z')||LA9_16=='_'||(LA9_16>='b' && LA9_16<='z')) ) {
+                alt9=22;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 16, input);
+
+                throw nvae;
+            }
+            }
+            break;
+        case 'B':
+        case 'D':
+        case 'E':
+        case 'G':
+        case 'H':
+        case 'I':
+        case 'J':
+        case 'K':
+        case 'M':
+        case 'N':
+        case 'O':
+        case 'Q':
+        case 'S':
+        case 'U':
+        case 'V':
+        case 'X':
+        case 'Y':
+        case 'Z':
+        case 'a':
+        case 'c':
+        case 'd':
+        case 'e':
+        case 'g':
+        case 'h':
+        case 'i':
+        case 'j':
+        case 'k':
+        case 'l':
+        case 'm':
+        case 'n':
+        case 'p':
+        case 'q':
+        case 'u':
+        case 'v':
+        case 'w':
+        case 'x':
+        case 'y':
+        case 'z':
+            {
+            alt9=22;
+            }
+            break;
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+            {
+            alt9=23;
+            }
+            break;
+        case '\""':
+            {
+            alt9=24;
+            }
+            break;
+        default:
+            NoViableAltException nvae =
+                new NoViableAltException(""1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | TASK_ID | INT | STRING );"", 9, 0, input);
+
+            throw nvae;
+        }
+
+        switch (alt9) {
+            case 1 :
+                // ReviewDsl.g:1:10: T12
+                {
+                mT12(); 
+
+                }
+                break;
+            case 2 :
+                // ReviewDsl.g:1:14: T13
+                {
+                mT13(); 
+
+                }
+                break;
+            case 3 :
+                // ReviewDsl.g:1:18: T14
+                {
+                mT14(); 
+
+                }
+                break;
+            case 4 :
+                // ReviewDsl.g:1:22: T15
+                {
+                mT15(); 
+
+                }
+                break;
+            case 5 :
+                // ReviewDsl.g:1:26: T16
+                {
+                mT16(); 
+
+                }
+                break;
+            case 6 :
+                // ReviewDsl.g:1:30: T17
+                {
+                mT17(); 
+
+                }
+                break;
+            case 7 :
+                // ReviewDsl.g:1:34: T18
+                {
+                mT18(); 
+
+                }
+                break;
+            case 8 :
+                // ReviewDsl.g:1:38: T19
+                {
+                mT19(); 
+
+                }
+                break;
+            case 9 :
+                // ReviewDsl.g:1:42: T20
+                {
+                mT20(); 
+
+                }
+                break;
+            case 10 :
+                // ReviewDsl.g:1:46: T21
+                {
+                mT21(); 
+
+                }
+                break;
+            case 11 :
+                // ReviewDsl.g:1:50: T22
+                {
+                mT22(); 
+
+                }
+                break;
+            case 12 :
+                // ReviewDsl.g:1:54: T23
+                {
+                mT23(); 
+
+                }
+                break;
+            case 13 :
+                // ReviewDsl.g:1:58: T24
+                {
+                mT24(); 
+
+                }
+                break;
+            case 14 :
+                // ReviewDsl.g:1:62: T25
+                {
+                mT25(); 
+
+                }
+                break;
+            case 15 :
+                // ReviewDsl.g:1:66: T26
+                {
+                mT26(); 
+
+                }
+                break;
+            case 16 :
+                // ReviewDsl.g:1:70: T27
+                {
+                mT27(); 
+
+                }
+                break;
+            case 17 :
+                // ReviewDsl.g:1:74: T28
+                {
+                mT28(); 
+
+                }
+                break;
+            case 18 :
+                // ReviewDsl.g:1:78: T29
+                {
+                mT29(); 
+
+                }
+                break;
+            case 19 :
+                // ReviewDsl.g:1:82: T30
+                {
+                mT30(); 
+
+                }
+                break;
+            case 20 :
+                // ReviewDsl.g:1:86: T31
+                {
+                mT31(); 
+
+                }
+                break;
+            case 21 :
+                // ReviewDsl.g:1:90: T32
+                {
+                mT32(); 
+
+                }
+                break;
+            case 22 :
+                // ReviewDsl.g:1:94: TASK_ID
+                {
+                mTASK_ID(); 
+
+                }
+                break;
+            case 23 :
+                // ReviewDsl.g:1:102: INT
+                {
+                mINT(); 
+
+                }
+                break;
+            case 24 :
+                // ReviewDsl.g:1:106: STRING
+                {
+                mSTRING(); 
+
+                }
+                break;
+
+        }
+
+    }
+
+
+ 
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
new file mode 100644
index 00000000..93fed735
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslMapper.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.tasks.dsl.internal;
+
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.tree.TreeAdaptor;
+import org.eclipse.mylyn.reviews.tasks.dsl.IReviewDslMapper;
+import org.eclipse.mylyn.reviews.tasks.dsl.ParseException;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslChangesetScopeItem;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslAttachmentScopeItem.Type;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult.FileComment;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult.LineComment;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult.Rating;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScope;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScopeItem;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.attachmentSource_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.changesetDef_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.fileComment_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.lineComment_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.patchDef_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.resourceDef_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.reviewResult_return;
+import org.eclipse.mylyn.reviews.tasks.dsl.internal.ReviewDslParser.reviewScope_return;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewDslMapper implements IReviewDslMapper {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#parseReviewResult(java.lang.String)
+	 */
+	@Override
+	public ReviewDslResult parseReviewResult(String text) throws ParseException {
+		ReviewDslLexer lexer = new ReviewDslLexer(new ANTLRStringStream(text));
+		TokenStream input = new CommonTokenStream(lexer);
+		ReviewDslParser parser = new ReviewDslParser(input);
+		try {
+			return mapResult(parser.reviewResult(), parser.getTreeAdaptor());
+		} catch (RecognitionException e) {
+			throw new ParseException(e.getMessage());
+		}
+
+	}
+
+	private ReviewDslResult mapResult(reviewResult_return reviewResult,
+			TreeAdaptor treeAdaptor) {
+		ReviewDslResult result = new ReviewDslResult();
+
+		result.setRating(Rating.valueOf(reviewResult.result));
+		result.setComment(convertStr(reviewResult.comment));
+		if (reviewResult.fileComments != null) {
+			for (int i = 0; i < reviewResult.fileComments.size(); i++) {
+				fileComment_return fc = (fileComment_return) reviewResult.fileComments
+						.get(i);
+				result.getFileComments().add(map(fc));
+			}
+		}
+		return result;
+	}
+
+	private FileComment map(fileComment_return fc) {
+		FileComment fileComment = new FileComment();
+		fileComment.setFileName(convertStr(fc.path));
+		fileComment.setComment(convertStr(fc.comment));
+		if (fc.lineComments != null) {
+			for (int i = 0; i < fc.lineComments.size(); i++) {
+				lineComment_return lc = (lineComment_return) fc.lineComments
+						.get(i);
+				fileComment.getLineComments().add(map(lc));
+			}
+		}
+		return fileComment;
+	}
+
+	private LineComment map(lineComment_return lc) {
+		LineComment lineComment = new LineComment();
+		lineComment.setBegin(lc.begin);
+		if (lc.end != null) {
+			lineComment.setEnd(Integer.parseInt(lc.end));
+		} else {
+			lineComment.setEnd(lineComment.getBegin());
+		}
+		lineComment.setComment(convertStr(lc.comment));
+
+		return lineComment;
+	}
+
+	private String convertStr(String string) {
+		if (string == null)
+			return string;
+		int startIdx = 0;
+		int endIdx = string.length();
+		if (string.startsWith(""\""""))
+			startIdx = 1;
+		if (string.endsWith(""\""""))
+			endIdx--;
+		return string.substring(startIdx, endIdx);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslMapper#parseReviewScope(java.lang.String)
+	 */
+	@Override
+	public ReviewDslScope parseReviewScope(String text) throws ParseException {
+		ReviewDslLexer lexer = new ReviewDslLexer(new ANTLRStringStream(text));
+		TokenStream input = new CommonTokenStream(lexer);
+		ReviewDslParser parser = new ReviewDslParser(input);
+		try {
+			return mapScope(parser.reviewScope(), parser.getTreeAdaptor());
+		} catch (RecognitionException e) {
+			throw new ParseException(e.getMessage());
+		}
+	}
+
+	private ReviewDslScope mapScope(reviewScope_return reviewScope,
+			TreeAdaptor treeAdaptor) {
+		if (reviewScope == null)
+			return null;
+		ReviewDslScope scope = new ReviewDslScope();
+
+		if (reviewScope.scopeItems != null) {
+			for (int i = 0; i < reviewScope.scopeItems.size(); i++) {
+				Object child = reviewScope.scopeItems.get(i);
+				if (patchDef_return.class.equals(child.getClass())) {
+					scope.addItem(parsePatch((patchDef_return) child,
+							treeAdaptor));
+				} else if (resourceDef_return.class.equals(child.getClass())) {
+					scope.addItem(parseResource((resourceDef_return) child,
+							treeAdaptor));
+				} else if (changesetDef_return.class.equals(child.getClass())) {
+					scope.addItem(parseChangeSet((changesetDef_return) child));
+				}
+			}
+		}
+		return scope;
+	}
+
+	private ReviewDslChangesetScopeItem parseChangeSet(changesetDef_return child) {
+		ReviewDslChangesetScopeItem item = new ReviewDslChangesetScopeItem();
+		item.setRevision(convertStr(child.revision));
+		item.setRepoUrl(convertStr(child.repoUrl));
+		return item;
+	}
+
+	private ReviewDslAttachmentScopeItem parseResource(
+			resourceDef_return child, TreeAdaptor treeAdaptor) {
+		AttachmentSource source = parseAttachmentSource(
+				(attachmentSource_return) child.source);
+		return new ReviewDslAttachmentScopeItem(Type.RESOURCE, source.fileName,
+				source.author, source.createdDate, source.taskId);
+	}
+
+	private ReviewDslAttachmentScopeItem parsePatch(patchDef_return child,
+			TreeAdaptor treeAdaptor) {
+	
+		AttachmentSource source = parseAttachmentSource(
+				(attachmentSource_return) 	child.source);
+		return new ReviewDslAttachmentScopeItem(Type.PATCH, source.fileName,
+				source.author, source.createdDate, source.taskId);
+	}
+
+	private AttachmentSource parseAttachmentSource(
+			attachmentSource_return child) {
+		AttachmentSource source = new AttachmentSource();
+		source.fileName = convertStr(child.filename);
+		source.author = convertStr(child.author);
+		source.createdDate =convertStr(child.createdDate);
+		source.taskId = convertStr(child.taskId);
+		return source;
+	}
+
+	private static class AttachmentSource {
+		public String fileName;
+		public String author;
+		public String createdDate;
+		public String taskId;
+	}
+
+	public static void main(String[] args) throws Exception {
+		// String text = ""Review result: TODO Comment: \""test\"""";
+		String text = ""Review scope: Patch from Attachment \""0001-Extension-point-for-scm-connector-defined-jaxb-model.patch\"" by \""Jane@inso.tuwien.ac.at\"" on \""2010-06-25 17:42:00\"" of task 85"";
+		IReviewDslMapper reviewDslMapper = new ReviewDslMapper();
+		ReviewDslScope parseReviewScope = reviewDslMapper
+				.parseReviewScope(text);
+
+		if (parseReviewScope != null) {
+			for (ReviewDslScopeItem item : parseReviewScope.getItems()) {
+				System.err.println(item);
+			}
+		}
+	}
+
+	@Override
+	public ReviewDslResult parseChangedReviewScope(String text) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java
new file mode 100644
index 00000000..5291ed39
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java
@@ -0,0 +1,1154 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+// $ANTLR 3.0 ReviewDsl.g 2011-03-06 18:30:25
+
+package org.eclipse.mylyn.reviews.tasks.dsl.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.ParserRuleReturnScope;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RuleReturnScope;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.CommonTreeAdaptor;
+import org.antlr.runtime.tree.TreeAdaptor;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewDslParser extends Parser {
+	public static final String[] tokenNames = new String[] { ""<invalid>"",
+			""<EOR>"", ""<DOWN>"", ""<UP>"", ""STRING"", ""INT"", ""TASK_ID"", ""ESC_SEQ"",
+			""UNICODE_ESC"", ""OCTAL_ESC"", ""HEX_DIGIT"", ""WS"", ""'Review'"",
+			""'result:'"", ""'Comment:'"", ""'PASSED'"", ""'WARNING'"", ""'FAILED'"",
+			""'TODO'"", ""'File'"", ""':'"", ""'Line'"", ""'-'"", ""'scope:'"",
+			""'Resource'"", ""'Changeset'"", ""'from'"", ""'Patch'"", ""'Attachment'"",
+			""'by'"", ""'on'"", ""'of'"", ""'task'"" };
+	public static final int WS = 11;
+	public static final int ESC_SEQ = 7;
+	public static final int TASK_ID = 6;
+	public static final int UNICODE_ESC = 8;
+	public static final int OCTAL_ESC = 9;
+	public static final int HEX_DIGIT = 10;
+	public static final int INT = 5;
+	public static final int EOF = -1;
+	public static final int STRING = 4;
+
+	public ReviewDslParser(TokenStream input) {
+		super(input);
+	}
+
+	protected TreeAdaptor adaptor = new CommonTreeAdaptor();
+
+	public void setTreeAdaptor(TreeAdaptor adaptor) {
+		this.adaptor = adaptor;
+	}
+
+	public TreeAdaptor getTreeAdaptor() {
+		return adaptor;
+	}
+
+	public String[] getTokenNames() {
+		return tokenNames;
+	}
+
+	public String getGrammarFileName() {
+		return ""ReviewDsl.g"";
+	}
+
+	public static class reviewResult_return extends ParserRuleReturnScope {
+		public String result;
+		public String comment;
+		public List fileComments;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start reviewResult
+	// ReviewDsl.g:14:1: reviewResult returns [String result, String comment,
+	// List fileComments] : 'Review' 'result:' res= resultEnum ( 'Comment:' c=
+	// STRING )? ( (fc+= fileComment )+ )? ;
+	public final reviewResult_return reviewResult() throws RecognitionException {
+		reviewResult_return retval = new reviewResult_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token c = null;
+		Token string_literal1 = null;
+		Token string_literal2 = null;
+		Token string_literal3 = null;
+		List list_fc = null;
+		resultEnum_return res = null;
+
+		RuleReturnScope fc = null;
+		CommonTree c_tree = null;
+		CommonTree string_literal1_tree = null;
+		CommonTree string_literal2_tree = null;
+		CommonTree string_literal3_tree = null;
+
+		try {
+			// ReviewDsl.g:15:3: ( 'Review' 'result:' res= resultEnum (
+			// 'Comment:' c= STRING )? ( (fc+= fileComment )+ )? )
+			// ReviewDsl.g:15:3: 'Review' 'result:' res= resultEnum ( 'Comment:'
+			// c= STRING )? ( (fc+= fileComment )+ )?
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal1 = (Token) input.LT(1);
+				match(input, 12, FOLLOW_12_in_reviewResult39);
+				string_literal1_tree = (CommonTree) adaptor
+						.create(string_literal1);
+				adaptor.addChild(root_0, string_literal1_tree);
+
+				string_literal2 = (Token) input.LT(1);
+				match(input, 13, FOLLOW_13_in_reviewResult41);
+				string_literal2_tree = (CommonTree) adaptor
+						.create(string_literal2);
+				adaptor.addChild(root_0, string_literal2_tree);
+
+				pushFollow(FOLLOW_resultEnum_in_reviewResult46);
+				res = resultEnum();
+				_fsp--;
+
+				adaptor.addChild(root_0, res.getTree());
+				// ReviewDsl.g:16:3: ( 'Comment:' c= STRING )?
+				int alt1 = 2;
+				int LA1_0 = input.LA(1);
+
+				if ((LA1_0 == 14)) {
+					alt1 = 1;
+				}
+				switch (alt1) {
+				case 1:
+					// ReviewDsl.g:16:4: 'Comment:' c= STRING
+				{
+					string_literal3 = (Token) input.LT(1);
+					match(input, 14, FOLLOW_14_in_reviewResult52);
+					string_literal3_tree = (CommonTree) adaptor
+							.create(string_literal3);
+					adaptor.addChild(root_0, string_literal3_tree);
+
+					c = (Token) input.LT(1);
+					match(input, STRING, FOLLOW_STRING_in_reviewResult56);
+					c_tree = (CommonTree) adaptor.create(c);
+					adaptor.addChild(root_0, c_tree);
+
+				}
+					break;
+
+				}
+
+				// ReviewDsl.g:17:2: ( (fc+= fileComment )+ )?
+				int alt3 = 2;
+				int LA3_0 = input.LA(1);
+
+				if ((LA3_0 == 19)) {
+					alt3 = 1;
+				}
+				switch (alt3) {
+				case 1:
+					// ReviewDsl.g:17:3: (fc+= fileComment )+
+				{
+					// ReviewDsl.g:17:5: (fc+= fileComment )+
+					int cnt2 = 0;
+					loop2: do {
+						int alt2 = 2;
+						int LA2_0 = input.LA(1);
+
+						if ((LA2_0 == 19)) {
+							alt2 = 1;
+						}
+
+						switch (alt2) {
+						case 1:
+							// ReviewDsl.g:17:5: fc+= fileComment
+						{
+							pushFollow(FOLLOW_fileComment_in_reviewResult64);
+							fc = fileComment();
+							_fsp--;
+
+							adaptor.addChild(root_0, fc.getTree());
+							if (list_fc == null)
+								list_fc = new ArrayList();
+							list_fc.add(fc);
+
+						}
+							break;
+
+						default:
+							if (cnt2 >= 1)
+								break loop2;
+							EarlyExitException eee = new EarlyExitException(2,
+									input);
+							throw eee;
+						}
+						cnt2++;
+					} while (true);
+
+				}
+					break;
+
+				}
+
+				retval.result = input.toString(res.start, res.stop);
+				retval.comment = c != null ? c.getText() : null;
+				retval.fileComments = list_fc;
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end reviewResult
+
+	public static class resultEnum_return extends ParserRuleReturnScope {
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start resultEnum
+	// ReviewDsl.g:21:1: resultEnum : ( 'PASSED' | 'WARNING' | 'FAILED' | 'TODO'
+	// );
+	public final resultEnum_return resultEnum() throws RecognitionException {
+		resultEnum_return retval = new resultEnum_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token set4 = null;
+
+		CommonTree set4_tree = null;
+
+		try {
+			// ReviewDsl.g:22:3: ( 'PASSED' | 'WARNING' | 'FAILED' | 'TODO' )
+			// ReviewDsl.g:
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				set4 = (Token) input.LT(1);
+				if ((input.LA(1) >= 15 && input.LA(1) <= 18)) {
+					input.consume();
+					adaptor.addChild(root_0, adaptor.create(set4));
+					errorRecovery = false;
+				} else {
+					MismatchedSetException mse = new MismatchedSetException(
+							null, input);
+					recoverFromMismatchedSet(input, mse,
+							FOLLOW_set_in_resultEnum0);
+					throw mse;
+				}
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end resultEnum
+
+	public static class fileComment_return extends ParserRuleReturnScope {
+		public String path;
+		public String comment;
+		public List lineComments;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start fileComment
+	// ReviewDsl.g:24:1: fileComment returns [String path, String comment, List
+	// lineComments] : 'File' p= STRING ':' (c= STRING )? (lc+= lineComment )* ;
+	public final fileComment_return fileComment() throws RecognitionException {
+		fileComment_return retval = new fileComment_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token p = null;
+		Token c = null;
+		Token string_literal5 = null;
+		Token char_literal6 = null;
+		List list_lc = null;
+		RuleReturnScope lc = null;
+		CommonTree p_tree = null;
+		CommonTree c_tree = null;
+		CommonTree string_literal5_tree = null;
+		CommonTree char_literal6_tree = null;
+
+		try {
+			// ReviewDsl.g:25:2: ( 'File' p= STRING ':' (c= STRING )? (lc+=
+			// lineComment )* )
+			// ReviewDsl.g:25:2: 'File' p= STRING ':' (c= STRING )? (lc+=
+			// lineComment )*
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal5 = (Token) input.LT(1);
+				match(input, 19, FOLLOW_19_in_fileComment98);
+				string_literal5_tree = (CommonTree) adaptor
+						.create(string_literal5);
+				adaptor.addChild(root_0, string_literal5_tree);
+
+				p = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_fileComment102);
+				p_tree = (CommonTree) adaptor.create(p);
+				adaptor.addChild(root_0, p_tree);
+
+				char_literal6 = (Token) input.LT(1);
+				match(input, 20, FOLLOW_20_in_fileComment104);
+				char_literal6_tree = (CommonTree) adaptor.create(char_literal6);
+				adaptor.addChild(root_0, char_literal6_tree);
+
+				// ReviewDsl.g:25:22: (c= STRING )?
+				int alt4 = 2;
+				int LA4_0 = input.LA(1);
+
+				if ((LA4_0 == STRING)) {
+					alt4 = 1;
+				}
+				switch (alt4) {
+				case 1:
+					// ReviewDsl.g:25:23: c= STRING
+				{
+					c = (Token) input.LT(1);
+					match(input, STRING, FOLLOW_STRING_in_fileComment109);
+					c_tree = (CommonTree) adaptor.create(c);
+					adaptor.addChild(root_0, c_tree);
+
+				}
+					break;
+
+				}
+
+				// ReviewDsl.g:26:3: (lc+= lineComment )*
+				loop5: do {
+					int alt5 = 2;
+					int LA5_0 = input.LA(1);
+
+					if ((LA5_0 == 21)) {
+						alt5 = 1;
+					}
+
+					switch (alt5) {
+					case 1:
+						// ReviewDsl.g:26:3: lc+= lineComment
+					{
+						pushFollow(FOLLOW_lineComment_in_fileComment115);
+						lc = lineComment();
+						_fsp--;
+
+						adaptor.addChild(root_0, lc.getTree());
+						if (list_lc == null)
+							list_lc = new ArrayList();
+						list_lc.add(lc);
+
+					}
+						break;
+
+					default:
+						break loop5;
+					}
+				} while (true);
+
+				retval.path = p.getText();
+				retval.comment = c.getText();
+				retval.lineComments = list_lc;
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end fileComment
+
+	public static class lineComment_return extends ParserRuleReturnScope {
+		public int begin;
+		public String end;
+		public String comment;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start lineComment
+	// ReviewDsl.g:29:1: lineComment returns [int begin, String end, String
+	// comment] : 'Line' s= INT ( '-' e= INT )? ':' c= STRING ;
+	public final lineComment_return lineComment() throws RecognitionException {
+		lineComment_return retval = new lineComment_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token s = null;
+		Token e = null;
+		Token c = null;
+		Token string_literal7 = null;
+		Token char_literal8 = null;
+		Token char_literal9 = null;
+
+		CommonTree s_tree = null;
+		CommonTree e_tree = null;
+		CommonTree c_tree = null;
+		CommonTree string_literal7_tree = null;
+		CommonTree char_literal8_tree = null;
+		CommonTree char_literal9_tree = null;
+
+		try {
+			// ReviewDsl.g:30:3: ( 'Line' s= INT ( '-' e= INT )? ':' c= STRING )
+			// ReviewDsl.g:30:3: 'Line' s= INT ( '-' e= INT )? ':' c= STRING
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal7 = (Token) input.LT(1);
+				match(input, 21, FOLLOW_21_in_lineComment130);
+				string_literal7_tree = (CommonTree) adaptor
+						.create(string_literal7);
+				adaptor.addChild(root_0, string_literal7_tree);
+
+				s = (Token) input.LT(1);
+				match(input, INT, FOLLOW_INT_in_lineComment134);
+				s_tree = (CommonTree) adaptor.create(s);
+				adaptor.addChild(root_0, s_tree);
+
+				// ReviewDsl.g:30:16: ( '-' e= INT )?
+				int alt6 = 2;
+				int LA6_0 = input.LA(1);
+
+				if ((LA6_0 == 22)) {
+					alt6 = 1;
+				}
+				switch (alt6) {
+				case 1:
+					// ReviewDsl.g:30:17: '-' e= INT
+				{
+					char_literal8 = (Token) input.LT(1);
+					match(input, 22, FOLLOW_22_in_lineComment137);
+					char_literal8_tree = (CommonTree) adaptor
+							.create(char_literal8);
+					adaptor.addChild(root_0, char_literal8_tree);
+
+					e = (Token) input.LT(1);
+					match(input, INT, FOLLOW_INT_in_lineComment141);
+					e_tree = (CommonTree) adaptor.create(e);
+					adaptor.addChild(root_0, e_tree);
+
+				}
+					break;
+
+				}
+
+				char_literal9 = (Token) input.LT(1);
+				match(input, 20, FOLLOW_20_in_lineComment145);
+				char_literal9_tree = (CommonTree) adaptor.create(char_literal9);
+				adaptor.addChild(root_0, char_literal9_tree);
+
+				c = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_lineComment150);
+				c_tree = (CommonTree) adaptor.create(c);
+				adaptor.addChild(root_0, c_tree);
+
+				retval.begin = Integer.parseInt(s.getText());
+				retval.end = e != null ? e.getText() : null;
+				retval.comment = c.getText();
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end lineComment
+
+	public static class reviewScope_return extends ParserRuleReturnScope {
+		public List scopeItems;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start reviewScope
+	// ReviewDsl.g:35:1: reviewScope returns [List scopeItems] : 'Review'
+	// 'scope:' (s+= ( resourceDef | patchDef | changesetDef ) )* ;
+	public final reviewScope_return reviewScope() throws RecognitionException {
+		reviewScope_return retval = new reviewScope_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token string_literal10 = null;
+		Token string_literal11 = null;
+		Token s = null;
+		List list_s = new ArrayList();
+		resourceDef_return resourceDef12 = null;
+
+		patchDef_return patchDef13 = null;
+
+		changesetDef_return changesetDef14 = null;
+
+		CommonTree string_literal10_tree = null;
+		CommonTree string_literal11_tree = null;
+		CommonTree s_tree = null;
+
+		try {
+			// ReviewDsl.g:36:4: ( 'Review' 'scope:' (s+= ( resourceDef |
+			// patchDef | changesetDef ) )* )
+			// ReviewDsl.g:36:4: 'Review' 'scope:' (s+= ( resourceDef | patchDef
+			// | changesetDef ) )*
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal10 = (Token) input.LT(1);
+				match(input, 12, FOLLOW_12_in_reviewScope167);
+				string_literal10_tree = (CommonTree) adaptor
+						.create(string_literal10);
+				adaptor.addChild(root_0, string_literal10_tree);
+
+				string_literal11 = (Token) input.LT(1);
+				match(input, 23, FOLLOW_23_in_reviewScope169);
+				string_literal11_tree = (CommonTree) adaptor
+						.create(string_literal11);
+				adaptor.addChild(root_0, string_literal11_tree);
+
+				// ReviewDsl.g:36:22: (s+= ( resourceDef | patchDef |
+				// changesetDef ) )*
+				loop8: do {
+					int alt8 = 2;
+					int LA8_0 = input.LA(1);
+
+					if (((LA8_0 >= 24 && LA8_0 <= 25) || LA8_0 == 27)) {
+						alt8 = 1;
+					}
+
+					switch (alt8) {
+					case 1:
+						// ReviewDsl.g:36:23: s+= ( resourceDef | patchDef |
+						// changesetDef )
+					{
+						// ReviewDsl.g:36:26: ( resourceDef | patchDef |
+						// changesetDef )
+						int alt7 = 3;
+						switch (input.LA(1)) {
+						case 24: {
+							alt7 = 1;
+						}
+							break;
+						case 27: {
+							alt7 = 2;
+						}
+							break;
+						case 25: {
+							alt7 = 3;
+						}
+							break;
+						default:
+							NoViableAltException nvae = new NoViableAltException(
+									""36:26: ( resourceDef | patchDef | changesetDef )"",
+									7, 0, input);
+
+							throw nvae;
+						}
+
+						switch (alt7) {
+						case 1:
+							// ReviewDsl.g:36:27: resourceDef
+						{
+							pushFollow(FOLLOW_resourceDef_in_reviewScope175);
+							resourceDef12 = resourceDef();
+							list_s.add(resourceDef12);
+							_fsp--;
+
+							adaptor.addChild(root_0, resourceDef12.getTree());
+
+						}
+							break;
+						case 2:
+							// ReviewDsl.g:36:40: patchDef
+						{
+							pushFollow(FOLLOW_patchDef_in_reviewScope178);
+							patchDef13 = patchDef();
+							list_s.add(patchDef13);
+							_fsp--;
+
+							adaptor.addChild(root_0, patchDef13.getTree());
+
+						}
+							break;
+						case 3:
+							// ReviewDsl.g:36:52: changesetDef
+						{
+							pushFollow(FOLLOW_changesetDef_in_reviewScope183);
+							changesetDef14 = changesetDef();
+							list_s.add(changesetDef14);
+							_fsp--;
+
+							adaptor.addChild(root_0, changesetDef14.getTree());
+
+						}
+							break;
+
+						}
+
+					}
+						break;
+
+					default:
+						break loop8;
+					}
+				} while (true);
+
+				retval.scopeItems = list_s;
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end reviewScope
+
+	public static class resourceDef_return extends ParserRuleReturnScope {
+		public Object source;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start resourceDef
+	// ReviewDsl.g:40:1: resourceDef returns [Object source] : 'Resource' s=
+	// attachmentSource ;
+	public final resourceDef_return resourceDef() throws RecognitionException {
+		resourceDef_return retval = new resourceDef_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token string_literal15 = null;
+		attachmentSource_return s = null;
+
+		CommonTree string_literal15_tree = null;
+
+		try {
+			// ReviewDsl.g:41:4: ( 'Resource' s= attachmentSource )
+			// ReviewDsl.g:41:4: 'Resource' s= attachmentSource
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal15 = (Token) input.LT(1);
+				match(input, 24, FOLLOW_24_in_resourceDef205);
+				string_literal15_tree = (CommonTree) adaptor
+						.create(string_literal15);
+				adaptor.addChild(root_0, string_literal15_tree);
+
+				pushFollow(FOLLOW_attachmentSource_in_resourceDef210);
+				s = attachmentSource();
+				_fsp--;
+
+				adaptor.addChild(root_0, s.getTree());
+				retval.source = s;
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end resourceDef
+
+	public static class changesetDef_return extends ParserRuleReturnScope {
+		public String revision;
+		public String repoUrl;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start changesetDef
+	// ReviewDsl.g:44:1: changesetDef returns [String revision, String repoUrl]
+	// : 'Changeset' rev= STRING 'from' url= STRING ;
+	public final changesetDef_return changesetDef() throws RecognitionException {
+		changesetDef_return retval = new changesetDef_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token rev = null;
+		Token url = null;
+		Token string_literal16 = null;
+		Token string_literal17 = null;
+
+		CommonTree rev_tree = null;
+		CommonTree url_tree = null;
+		CommonTree string_literal16_tree = null;
+		CommonTree string_literal17_tree = null;
+
+		try {
+			// ReviewDsl.g:45:4: ( 'Changeset' rev= STRING 'from' url= STRING )
+			// ReviewDsl.g:45:4: 'Changeset' rev= STRING 'from' url= STRING
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal16 = (Token) input.LT(1);
+				match(input, 25, FOLLOW_25_in_changesetDef226);
+				string_literal16_tree = (CommonTree) adaptor
+						.create(string_literal16);
+				adaptor.addChild(root_0, string_literal16_tree);
+
+				rev = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_changesetDef230);
+				rev_tree = (CommonTree) adaptor.create(rev);
+				adaptor.addChild(root_0, rev_tree);
+
+				string_literal17 = (Token) input.LT(1);
+				match(input, 26, FOLLOW_26_in_changesetDef233);
+				string_literal17_tree = (CommonTree) adaptor
+						.create(string_literal17);
+				adaptor.addChild(root_0, string_literal17_tree);
+
+				url = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_changesetDef237);
+				url_tree = (CommonTree) adaptor.create(url);
+				adaptor.addChild(root_0, url_tree);
+
+				retval.revision = rev.getText();
+				retval.repoUrl = url.getText();
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end changesetDef
+
+	public static class patchDef_return extends ParserRuleReturnScope {
+		public Object source;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start patchDef
+	// ReviewDsl.g:48:1: patchDef returns [Object source] : 'Patch' s=
+	// attachmentSource ;
+	public final patchDef_return patchDef() throws RecognitionException {
+		patchDef_return retval = new patchDef_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token string_literal18 = null;
+		attachmentSource_return s = null;
+
+		CommonTree string_literal18_tree = null;
+
+		try {
+			// ReviewDsl.g:49:2: ( 'Patch' s= attachmentSource )
+			// ReviewDsl.g:49:2: 'Patch' s= attachmentSource
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal18 = (Token) input.LT(1);
+				match(input, 27, FOLLOW_27_in_patchDef252);
+				string_literal18_tree = (CommonTree) adaptor
+						.create(string_literal18);
+				adaptor.addChild(root_0, string_literal18_tree);
+
+				pushFollow(FOLLOW_attachmentSource_in_patchDef256);
+				s = attachmentSource();
+				_fsp--;
+
+				adaptor.addChild(root_0, s.getTree());
+				retval.source = s;
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end patchDef
+
+	public static class attachmentSource_return extends ParserRuleReturnScope {
+		public String filename;
+		public String author;
+		String createdDate;
+		public String taskId;
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start attachmentSource
+	// ReviewDsl.g:52:1: attachmentSource returns [String filename, String
+	// author; String createdDate, String taskId] : 'from' 'Attachment' fn=
+	// STRING 'by' a= STRING 'on' d= STRING 'of' 'task' t= taskIdDef ;
+	public final attachmentSource_return attachmentSource()
+			throws RecognitionException {
+		attachmentSource_return retval = new attachmentSource_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token fn = null;
+		Token a = null;
+		Token d = null;
+		Token string_literal19 = null;
+		Token string_literal20 = null;
+		Token string_literal21 = null;
+		Token string_literal22 = null;
+		Token string_literal23 = null;
+		Token string_literal24 = null;
+		taskIdDef_return t = null;
+
+		CommonTree fn_tree = null;
+		CommonTree a_tree = null;
+		CommonTree d_tree = null;
+		CommonTree string_literal19_tree = null;
+		CommonTree string_literal20_tree = null;
+		CommonTree string_literal21_tree = null;
+		CommonTree string_literal22_tree = null;
+		CommonTree string_literal23_tree = null;
+		CommonTree string_literal24_tree = null;
+
+		try {
+			// ReviewDsl.g:53:2: ( 'from' 'Attachment' fn= STRING 'by' a= STRING
+			// 'on' d= STRING 'of' 'task' t= taskIdDef )
+			// ReviewDsl.g:53:2: 'from' 'Attachment' fn= STRING 'by' a= STRING
+			// 'on' d= STRING 'of' 'task' t= taskIdDef
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				string_literal19 = (Token) input.LT(1);
+				match(input, 26, FOLLOW_26_in_attachmentSource274);
+				string_literal19_tree = (CommonTree) adaptor
+						.create(string_literal19);
+				adaptor.addChild(root_0, string_literal19_tree);
+
+				string_literal20 = (Token) input.LT(1);
+				match(input, 28, FOLLOW_28_in_attachmentSource276);
+				string_literal20_tree = (CommonTree) adaptor
+						.create(string_literal20);
+				adaptor.addChild(root_0, string_literal20_tree);
+
+				fn = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_attachmentSource280);
+				fn_tree = (CommonTree) adaptor.create(fn);
+				adaptor.addChild(root_0, fn_tree);
+
+				string_literal21 = (Token) input.LT(1);
+				match(input, 29, FOLLOW_29_in_attachmentSource284);
+				string_literal21_tree = (CommonTree) adaptor
+						.create(string_literal21);
+				adaptor.addChild(root_0, string_literal21_tree);
+
+				a = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_attachmentSource288);
+				a_tree = (CommonTree) adaptor.create(a);
+				adaptor.addChild(root_0, a_tree);
+
+				string_literal22 = (Token) input.LT(1);
+				match(input, 30, FOLLOW_30_in_attachmentSource292);
+				string_literal22_tree = (CommonTree) adaptor
+						.create(string_literal22);
+				adaptor.addChild(root_0, string_literal22_tree);
+
+				d = (Token) input.LT(1);
+				match(input, STRING, FOLLOW_STRING_in_attachmentSource296);
+				d_tree = (CommonTree) adaptor.create(d);
+				adaptor.addChild(root_0, d_tree);
+
+				string_literal23 = (Token) input.LT(1);
+				match(input, 31, FOLLOW_31_in_attachmentSource300);
+				string_literal23_tree = (CommonTree) adaptor
+						.create(string_literal23);
+				adaptor.addChild(root_0, string_literal23_tree);
+
+				string_literal24 = (Token) input.LT(1);
+				match(input, 32, FOLLOW_32_in_attachmentSource302);
+				string_literal24_tree = (CommonTree) adaptor
+						.create(string_literal24);
+				adaptor.addChild(root_0, string_literal24_tree);
+
+				pushFollow(FOLLOW_taskIdDef_in_attachmentSource306);
+				t = taskIdDef();
+				_fsp--;
+
+				adaptor.addChild(root_0, t.getTree());
+				retval.filename = fn.getText();
+				retval.author = a.getText();
+				retval.createdDate = d.getText();
+				retval.taskId = input.toString(t.start, t.stop);
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end attachmentSource
+
+	public static class taskIdDef_return extends ParserRuleReturnScope {
+		CommonTree tree;
+
+		public Object getTree() {
+			return tree;
+		}
+	};
+
+	// $ANTLR start taskIdDef
+	// ReviewDsl.g:60:1: taskIdDef : ( TASK_ID | INT );
+	public final taskIdDef_return taskIdDef() throws RecognitionException {
+		taskIdDef_return retval = new taskIdDef_return();
+		retval.start = input.LT(1);
+
+		CommonTree root_0 = null;
+
+		Token set25 = null;
+
+		CommonTree set25_tree = null;
+
+		try {
+			// ReviewDsl.g:61:4: ( TASK_ID | INT )
+			// ReviewDsl.g:
+			{
+				root_0 = (CommonTree) adaptor.nil();
+
+				set25 = (Token) input.LT(1);
+				if ((input.LA(1) >= INT && input.LA(1) <= TASK_ID)) {
+					input.consume();
+					adaptor.addChild(root_0, adaptor.create(set25));
+					errorRecovery = false;
+				} else {
+					MismatchedSetException mse = new MismatchedSetException(
+							null, input);
+					recoverFromMismatchedSet(input, mse,
+							FOLLOW_set_in_taskIdDef0);
+					throw mse;
+				}
+
+			}
+
+			retval.stop = input.LT(-1);
+
+			retval.tree = (CommonTree) adaptor.rulePostProcessing(root_0);
+			adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+		} catch (RecognitionException re) {
+			reportError(re);
+			recover(input, re);
+		} finally {
+		}
+		return retval;
+	}
+
+	// $ANTLR end taskIdDef
+
+	public static final BitSet FOLLOW_12_in_reviewResult39 = new BitSet(
+			new long[] { 0x0000000000002000L });
+	public static final BitSet FOLLOW_13_in_reviewResult41 = new BitSet(
+			new long[] { 0x0000000000078000L });
+	public static final BitSet FOLLOW_resultEnum_in_reviewResult46 = new BitSet(
+			new long[] { 0x0000000000084002L });
+	public static final BitSet FOLLOW_14_in_reviewResult52 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_reviewResult56 = new BitSet(
+			new long[] { 0x0000000000080002L });
+	public static final BitSet FOLLOW_fileComment_in_reviewResult64 = new BitSet(
+			new long[] { 0x0000000000080002L });
+	public static final BitSet FOLLOW_set_in_resultEnum0 = new BitSet(
+			new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_19_in_fileComment98 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_fileComment102 = new BitSet(
+			new long[] { 0x0000000000100000L });
+	public static final BitSet FOLLOW_20_in_fileComment104 = new BitSet(
+			new long[] { 0x0000000000200012L });
+	public static final BitSet FOLLOW_STRING_in_fileComment109 = new BitSet(
+			new long[] { 0x0000000000200002L });
+	public static final BitSet FOLLOW_lineComment_in_fileComment115 = new BitSet(
+			new long[] { 0x0000000000200002L });
+	public static final BitSet FOLLOW_21_in_lineComment130 = new BitSet(
+			new long[] { 0x0000000000000020L });
+	public static final BitSet FOLLOW_INT_in_lineComment134 = new BitSet(
+			new long[] { 0x0000000000500000L });
+	public static final BitSet FOLLOW_22_in_lineComment137 = new BitSet(
+			new long[] { 0x0000000000000020L });
+	public static final BitSet FOLLOW_INT_in_lineComment141 = new BitSet(
+			new long[] { 0x0000000000100000L });
+	public static final BitSet FOLLOW_20_in_lineComment145 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_lineComment150 = new BitSet(
+			new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_12_in_reviewScope167 = new BitSet(
+			new long[] { 0x0000000000800000L });
+	public static final BitSet FOLLOW_23_in_reviewScope169 = new BitSet(
+			new long[] { 0x000000000B000002L });
+	public static final BitSet FOLLOW_resourceDef_in_reviewScope175 = new BitSet(
+			new long[] { 0x000000000B000002L });
+	public static final BitSet FOLLOW_patchDef_in_reviewScope178 = new BitSet(
+			new long[] { 0x000000000B000002L });
+	public static final BitSet FOLLOW_changesetDef_in_reviewScope183 = new BitSet(
+			new long[] { 0x000000000B000002L });
+	public static final BitSet FOLLOW_24_in_resourceDef205 = new BitSet(
+			new long[] { 0x0000000004000000L });
+	public static final BitSet FOLLOW_attachmentSource_in_resourceDef210 = new BitSet(
+			new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_25_in_changesetDef226 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_changesetDef230 = new BitSet(
+			new long[] { 0x0000000004000000L });
+	public static final BitSet FOLLOW_26_in_changesetDef233 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_changesetDef237 = new BitSet(
+			new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_27_in_patchDef252 = new BitSet(
+			new long[] { 0x0000000004000000L });
+	public static final BitSet FOLLOW_attachmentSource_in_patchDef256 = new BitSet(
+			new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_26_in_attachmentSource274 = new BitSet(
+			new long[] { 0x0000000010000000L });
+	public static final BitSet FOLLOW_28_in_attachmentSource276 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_attachmentSource280 = new BitSet(
+			new long[] { 0x0000000020000000L });
+	public static final BitSet FOLLOW_29_in_attachmentSource284 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_attachmentSource288 = new BitSet(
+			new long[] { 0x0000000040000000L });
+	public static final BitSet FOLLOW_30_in_attachmentSource292 = new BitSet(
+			new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_STRING_in_attachmentSource296 = new BitSet(
+			new long[] { 0x0000000080000000L });
+	public static final BitSet FOLLOW_31_in_attachmentSource300 = new BitSet(
+			new long[] { 0x0000000100000000L });
+	public static final BitSet FOLLOW_32_in_attachmentSource302 = new BitSet(
+			new long[] { 0x0000000000000060L });
+	public static final BitSet FOLLOW_taskIdDef_in_attachmentSource306 = new BitSet(
+			new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_set_in_taskIdDef0 = new BitSet(
+			new long[] { 0x0000000000000002L });
+
+}
\ No newline at end of file
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java
new file mode 100644
index 00000000..567758f3
--- /dev/null
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslSerializer.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Research Group for Industrial Software (INSO), Vienna University of Technology.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Research Group for Industrial Software (INSO), Vienna University of Technology - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.tasks.dsl.internal;
+
+import org.eclipse.mylyn.reviews.tasks.dsl.IReviewDslSerializer;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult;
+import org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScope;
+
+/**
+ * 
+ * @author mattk
+ *
+ */
+public class ReviewDslSerializer implements IReviewDslSerializer {
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslSerializer#serialize(org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslScope)
+	 */
+	@Override
+	public String serialize(ReviewDslScope scope) {
+		return scope.serialize(new StringBuilder()).toString();
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.mylyn.reviews.tasks.dsl.internal.IReviewDslSerializer#serialize(org.eclipse.mylyn.reviews.tasks.dsl.ReviewDslResult)
+	 */
+	@Override
+	public String serialize(ReviewDslResult result) {
+		return result.serialize(new StringBuilder()).toString();
+	}
+}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/scoping/ReviewDslScopeProvider.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/scoping/ReviewDslScopeProvider.java
deleted file mode 100644
index b763d9b4..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/scoping/ReviewDslScopeProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.mylyn.reviews.tasks.dsl.scoping;
-
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-
-/**
- * This class contains custom scoping description.
- * 
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping
- * on how and when to use it 
- *
- */
-public class ReviewDslScopeProvider extends AbstractDeclarativeScopeProvider {
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/validation/ReviewDslJavaValidator.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/validation/ReviewDslJavaValidator.java
deleted file mode 100644
index 1ebad0a8..00000000
--- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/validation/ReviewDslJavaValidator.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.mylyn.reviews.tasks.dsl.validation;
- 
-
-public class ReviewDslJavaValidator extends AbstractReviewDslJavaValidator {
-
-//	@Check
-//	public void checkGreetingStartsWithCapital(Greeting greeting) {
-//		if (!Character.isUpperCase(greeting.getName().charAt(0))) {
-//			warning(""Name should start with a capital"", MyDslPackage.GREETING__NAME);
-//		}
-//	}
-
-}
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java
index 1d0602c9..a54bb134 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java
@@ -29,7 +29,7 @@ public class ReviewsUiPlugin extends AbstractUIPlugin {
 	// The shared instance
 	private static ReviewsUiPlugin plugin;
 
-	private static ReviewTaskMapper mapper;
+	private static IReviewMapper mapper;
 
 	/**
 	 * The constructor"
5f2ee6ded78a158ec352a376b7d6ee5381e70599,drools,JBRULES-233 for leaps--git-svn-id: https://svn.jboss.org/repos/labs/labs/jbossrules/trunk@4214 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70-,a,https://github.com/kiegroup/drools,"diff --git a/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java b/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
index 6471a4b1fd2..82960c9491d 100644
--- a/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
+++ b/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
@@ -162,9 +162,4 @@ public void testXorGroups() throws Exception {
         assertTrue( ""rule2"",
                     list.contains( ""rule2"" ) );
     }
-    
-    public void testLogicalAssertionsDynamicRule() throws Exception {
-        // TODO FIXME
-    }
-
 }
diff --git a/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java b/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
index d561015325a..23a3167ef02 100644
--- a/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
+++ b/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
@@ -111,7 +111,9 @@ abstract public class AbstractWorkingMemory implements WorkingMemory,
     protected long                            propagationIdCounter;
 
     private ReentrantLock                     lock                                          = new ReentrantLock( );
-    
+
+    private List                              factQueue                                     = new ArrayList( );
+
     public AbstractWorkingMemory(RuleBase ruleBase,
                                  FactHandleFactory handleFactory) {
         this.ruleBase = ruleBase;
@@ -377,8 +379,52 @@ public PrimitiveLongMap getJustified() {
         return this.justified;
     }
 
+    public long getNextPropagationIdCounter() {
+        return this.propagationIdCounter++;
+    }
+
     abstract public void dispose();
 
+    public void removeLogicalDependencies(Activation activation,
+                                          PropagationContext context,
+                                          Rule rule) throws FactException {
+        org.drools.util.LinkedList list = activation.getLogicalDependencies();
+        if ( list == null || list.isEmpty() ) {
+            return;
+        }
+        for ( LogicalDependency node = (LogicalDependency) list.getFirst(); node != null; node = (LogicalDependency) node.getNext() ) {
+            InternalFactHandle handle = (InternalFactHandle) node.getFactHandle();
+            Set set = (Set) this.justified.get( handle.getId( ) );
+            // check set for null because in some weird cases on logical assertion  
+            // it comes back with the same activation/handle and tries on
+            // already cleaned this.justified. only happens on removal of rule 
+            // from the working memory
+            if (set != null) {
+                set.remove( node );
+                if (set.isEmpty( )) {
+                    this.justified.remove( handle.getId( ) );
+                    // this needs to be scheduled so we don't upset the current
+                    // working memory operation
+                    this.factQueue.add( new WorkingMemoryRetractAction( handle,
+                                                                        false,
+                                                                        true,
+                                                                        context.getRuleOrigin( ),
+                                                                        context.getActivationOrigin( ) ) );
+                }
+            }
+        }
+    }
+
+    public void removeLogicalDependencies(FactHandle handle) throws FactException {
+        Set set = (Set) this.justified.remove( ((InternalFactHandle) handle).getId() );
+        if ( set != null && !set.isEmpty() ) {
+            for ( Iterator it = set.iterator(); it.hasNext(); ) {
+                LogicalDependency node = (LogicalDependency) it.next();
+                node.getJustifier().getLogicalDependencies().remove( node );
+            }
+        }
+    }
+
     public void addLogicalDependency(FactHandle handle,
                                      Activation activation,
                                      PropagationContext context,
@@ -395,34 +441,12 @@ public void addLogicalDependency(FactHandle handle,
         set.add( node );
     }
 
-    public void removeLogicalDependencies( Activation activation,
-                                          PropagationContext context,
-                                          Rule rule ) throws FactException {
-        org.drools.util.LinkedList list = activation.getLogicalDependencies();
-        if (list == null || list.isEmpty( )) {
-            return;
-        }
-        for (LogicalDependency node = (LogicalDependency) list.getFirst( ); node != null; node = (LogicalDependency) node.getNext( )) {
-            InternalFactHandle handle = (InternalFactHandle) node.getFactHandle( );
-            Set set = (Set) this.justified.get( handle.getId( ) );
-            set.remove( node );
-            if (set.isEmpty( )) {
-                this.justified.remove( handle.getId( ) );
-                retractObject( handle,
-                               false,
-                               true,
-                               context.getRuleOrigin( ),
-                               context.getActivationOrigin( ) );
-            }
-        }
-    }
-
-    public void removeLogicalDependencies(FactHandle handle) throws FactException {
-        Set set = (Set) this.justified.remove( ((InternalFactHandle) handle).getId() );
-        if ( set != null && !set.isEmpty() ) {
-            for ( Iterator it = set.iterator(); it.hasNext(); ) {
-                LogicalDependency node = (LogicalDependency) it.next();
-                node.getJustifier().getLogicalDependencies().remove( node );
+    protected void propagateQueuedActions() {
+        if (!this.factQueue.isEmpty( )) {
+            for (Iterator it = this.factQueue.iterator( ); it.hasNext( );) {
+                WorkingMemoryAction action = (WorkingMemoryAction) it.next( );
+                it.remove( );
+                action.propagate( );
             }
         }
     }
@@ -431,6 +455,41 @@ public Lock getLock() {
         return this.lock;
     }
  
+    private interface WorkingMemoryAction {
+        public void propagate();
+    }
+    
+    private class WorkingMemoryRetractAction implements WorkingMemoryAction {
+        private InternalFactHandle factHandle;
+        private boolean removeLogical;
+        private boolean updateEqualsMap;
+        private Rule ruleOrigin;
+        private Activation activationOrigin;
+        
+        
+        
+        public WorkingMemoryRetractAction(InternalFactHandle factHandle,
+                                          boolean removeLogical,
+                                          boolean updateEqualsMap,
+                                          Rule ruleOrigin,
+                                          Activation activationOrigin) {
+            super();
+            this.factHandle = factHandle;
+            this.removeLogical = removeLogical;
+            this.updateEqualsMap = updateEqualsMap;
+            this.ruleOrigin = ruleOrigin;
+            this.activationOrigin = activationOrigin;
+        }
+
+        public void propagate() {
+            retractObject( this.factHandle,
+                           this.removeLogical,
+                           this.updateEqualsMap,
+                           this.ruleOrigin,
+                           this.activationOrigin );
+        }
+    }
+
     protected static class FactStatus {
         private int            counter;
         private String         status;
diff --git a/drools-core/src/main/java/org/drools/leaps/FactTable.java b/drools-core/src/main/java/org/drools/leaps/FactTable.java
index 9da995d6a05..f57f08a5922 100644
--- a/drools-core/src/main/java/org/drools/leaps/FactTable.java
+++ b/drools-core/src/main/java/org/drools/leaps/FactTable.java
@@ -46,7 +46,7 @@ class FactTable extends Table {
      * Tuples that are either already on agenda or are very close (missing
      * exists or have not facts matching)
      */
-    private final LinkedList       tuples;
+    private LinkedList       tuples;
 
     /**
      * initializes base LeapsTable with appropriate Comparator and positive and
@@ -67,9 +67,8 @@ public FactTable(ConflictResolver conflictResolver) {
      * @param workingMemory
      * @param ruleHandle
      */
-    public void addRule(WorkingMemoryImpl workingMemory,
-                        RuleHandle ruleHandle) {
-        if ( !this.rules.contains( ruleHandle ) ) {
+    public void addRule( WorkingMemoryImpl workingMemory, RuleHandle ruleHandle ) {
+        if (!this.rules.contains( ruleHandle )) {
             this.rules.add( ruleHandle );
             // push facts back to stack if needed
             this.checkAndAddFactsToStack( workingMemory );
@@ -81,8 +80,18 @@ public void addRule(WorkingMemoryImpl workingMemory,
      * 
      * @param ruleHandle
      */
-    public void removeRule(RuleHandle ruleHandle) {
+    public void removeRule( RuleHandle ruleHandle ) {
         this.rules.remove( ruleHandle );
+        // remove tuples that are still there
+        LinkedList list = new LinkedList( );
+
+        for (Iterator it = this.getTuplesIterator( ); it.hasNext( );) {
+            LeapsTuple tuple = (LeapsTuple) it.next( );
+            if (ruleHandle.getLeapsRule( ).getRule( ) != tuple.getLeapsRule( ).getRule( )) {
+                list.add( tuple );
+            }
+        }
+        this.tuples = list;
     }
 
     /**
diff --git a/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java b/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java
index f0e796876df..8a12a47303d 100644
--- a/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java
+++ b/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java
@@ -74,6 +74,8 @@ class WorkingMemoryImpl extends AbstractWorkingMemory
 
     private final IdentityMap leapsRulesToHandlesMap = new IdentityMap( );
 
+    private final IdentityMap rulesActivationsMap = new IdentityMap( );
+
     /**
      * Construct.
      * 
@@ -214,11 +216,11 @@ public FactHandle assertObject( Object object,
                                    boolean logical,
                                    Rule rule,
                                    Activation activation ) throws FactException {
-
+        FactHandleImpl handle ;
         this.getLock().lock( );
         try {
             // check if the object already exists in the WM
-            FactHandleImpl handle = (FactHandleImpl) this.identityMap.get( object );
+            handle = (FactHandleImpl) this.identityMap.get( object );
 
             // lets see if the object is already logical asserted
             FactStatus logicalState = (FactStatus) this.equalsMap.get( object );
@@ -237,6 +239,7 @@ public FactHandle assertObject( Object object,
                                       activation,
                                       activation.getPropagationContext( ),
                                       rule );
+                
                 return logicalState.getHandle( );
             }
 
@@ -294,7 +297,6 @@ public FactHandle assertObject( Object object,
                                       activation,
                                       activation.getPropagationContext( ),
                                       rule );
-
             }
 
             // new leaps stack token
@@ -380,12 +382,13 @@ public FactHandle assertObject( Object object,
                     }
                 }
             }
-
-            return handle;
+            propagateQueuedActions( );
         }
         finally {
-            this.getLock().unlock( );
+            this.getLock( ).unlock( );
         }
+
+        return handle;
     }
 
     /**
@@ -555,6 +558,8 @@ public void retractObject(FactHandle handle,
                                                                          activation );
 
             this.workingMemoryEventSupport.fireObjectRetracted( context, handle, oldObject );
+            
+            propagateQueuedActions();
         }
         finally {
             this.getLock().unlock( );
@@ -586,14 +591,37 @@ private final void invalidateActivation( LeapsTuple tuple ) {
         }
     }
 
+    
+    
+    public void addLogicalDependency( FactHandle handle,
+                                     Activation activation,
+                                     PropagationContext context,
+                                     Rule rule ) throws FactException {
+        super.addLogicalDependency( handle, activation, context, rule );
+
+        LinkedList activations = (LinkedList) this.rulesActivationsMap.get( rule );
+        if (activations == null) {
+            activations = new LinkedList( );
+            this.rulesActivationsMap.put( rule, activations );
+        }
+        activations.add( activation );
+    }
+
+    
+    public void removeLogicalDependencies( Activation activation,
+                                          PropagationContext context,
+                                          Rule rule ) throws FactException {
+        super.removeLogicalDependencies( activation, context, rule );
+    }
+
     /**
      * @see WorkingMemory
      */
-    public void modifyObject(FactHandle handle,
+    public void modifyObject( FactHandle handle,
                              Object object,
                              Rule rule,
                              Activation activation ) throws FactException {
-        this.getLock().lock( );
+        this.getLock( ).lock( );
         try {
 
             this.retractObject( handle );
@@ -624,9 +652,10 @@ public void modifyObject(FactHandle handle,
                                                                handle,
                                                                ( (FactHandleImpl) handle ).getObject( ),
                                                                object );
+            propagateQueuedActions( );
         }
         finally {
-            this.getLock().unlock( );
+            this.getLock( ).unlock( );
         }
     }
 
@@ -778,22 +807,36 @@ protected void removeRule( List rules ) {
         this.getLock( ).lock( );
         try {
             ArrayList ruleHandlesList;
-            LeapsRule rule;
+            LeapsRule leapsRule;
             RuleHandle ruleHandle;
             for (Iterator it = rules.iterator( ); it.hasNext( );) {
-                rule = (LeapsRule) it.next( );
+                leapsRule = (LeapsRule) it.next( );
                 // some times rules do not have ""normal"" constraints and only
                 // not and exists
-                if (rule.getNumberOfColumns( ) > 0) {
-                    ruleHandlesList = (ArrayList) this.leapsRulesToHandlesMap.remove( rule );
+                if (leapsRule.getNumberOfColumns( ) > 0) {
+                    ruleHandlesList = (ArrayList) this.leapsRulesToHandlesMap.remove( leapsRule );
                     for (int i = 0; i < ruleHandlesList.size( ); i++) {
                         ruleHandle = (RuleHandle) ruleHandlesList.get( i );
                         // 
-                        this.getFactTable( rule.getColumnClassObjectTypeAtPosition( i ) )
+                        this.getFactTable( leapsRule.getColumnClassObjectTypeAtPosition( i ) )
                             .removeRule( ruleHandle );
                     }
                 }
+                //
+            }
+            Rule rule = ((LeapsRule)rules.get(0)).getRule( );
+            List activations = (List) this.rulesActivationsMap.remove( rule );
+            if (activations != null) {
+                for (Iterator activationsIt = activations.iterator( ); activationsIt.hasNext( );) {
+                    Activation activation = (Activation) activationsIt.next( );
+                    ((LeapsTuple)activation.getTuple()).setActivation(null);
+                    this.removeLogicalDependencies( activation,
+                                                    activation.getPropagationContext( ),
+                                                    rule );
+                }
             }
+            
+            propagateQueuedActions();
         }
         finally {
             this.getLock( ).unlock( );"
8c3065c971a65448b29ee600d5c889b33e2afdb1,hadoop,MAPREDUCE-2766. Fixed NM to set secure permissions- for files and directories in distributed-cache. Contributed by Hitesh Shah.- svn merge -c r1195340 --ignore-ancestry ../../trunk/--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195341 13f79535-47bb-0310-9956-ffa450edef68-,c,https://github.com/apache/hadoop,"diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 41be54ab5bfae..223ff031ebfd8 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -1826,6 +1826,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3313. Fixed initialization of ClusterMetrics which was failing
     TestResourceTrackerService sometimes. (Hitesh Shah via vinodkv)
 
+    MAPREDUCE-2766. Fixed NM to set secure permissions for files and directories
+    in distributed-cache. (Hitesh Shah via vinodkv)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java
index 671f3ae30b8bf..85d1690701615 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/FSDownload.java
@@ -40,6 +40,7 @@
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.util.RunJar;
 import org.apache.hadoop.yarn.api.records.LocalResource;
+import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
 import org.apache.hadoop.yarn.util.ConverterUtils;
 
 /**
@@ -56,7 +57,13 @@ public class FSDownload implements Callable<Path> {
   private Configuration conf;
   private LocalResource resource;
   private LocalDirAllocator dirs;
-  private FsPermission cachePerms = new FsPermission((short) 0755);
+  private static final FsPermission cachePerms = new FsPermission(
+      (short) 0755);
+  static final FsPermission PUBLIC_FILE_PERMS = new FsPermission((short) 0555);
+  static final FsPermission PRIVATE_FILE_PERMS = new FsPermission(
+      (short) 0500);
+  static final FsPermission PUBLIC_DIR_PERMS = new FsPermission((short) 0755);
+  static final FsPermission PRIVATE_DIR_PERMS = new FsPermission((short) 0700);
 
   FSDownload(FileContext files, UserGroupInformation ugi, Configuration conf,
       LocalDirAllocator dirs, LocalResource resource, Random rand) {
@@ -150,6 +157,7 @@ public Path run() throws Exception {
             };
       });
       unpack(new File(dTmp.toUri()), new File(dFinal.toUri()));
+      changePermissions(dFinal.getFileSystem(conf), dFinal);
       files.rename(dst_work, dst, Rename.OVERWRITE);
     } catch (Exception e) {
       try { files.delete(dst, true); } catch (IOException ignore) { }
@@ -163,11 +171,56 @@ public Path run() throws Exception {
       conf = null;
       resource = null;
       dirs = null;
-      cachePerms = null;
     }
     return files.makeQualified(new Path(dst, sCopy.getName()));
   }
 
+  /**
+   * Recursively change permissions of all files/dirs on path based 
+   * on resource visibility.
+   * Change to 755 or 700 for dirs, 555 or 500 for files.
+   * @param fs FileSystem
+   * @param path Path to modify perms for
+   * @throws IOException
+   * @throws InterruptedException 
+   */
+  private void changePermissions(FileSystem fs, final Path path)
+      throws IOException, InterruptedException {
+    FileStatus fStatus = fs.getFileStatus(path);
+    FsPermission perm = cachePerms;
+    // set public perms as 755 or 555 based on dir or file
+    if (resource.getVisibility() == LocalResourceVisibility.PUBLIC) {
+      perm = fStatus.isDirectory() ? PUBLIC_DIR_PERMS : PUBLIC_FILE_PERMS;
+    }
+    // set private perms as 700 or 500
+    else {
+      // PRIVATE:
+      // APPLICATION:
+      perm = fStatus.isDirectory() ? PRIVATE_DIR_PERMS : PRIVATE_FILE_PERMS;
+    }
+    LOG.debug(""Changing permissions for path "" + path
+        + "" to perm "" + perm);
+    final FsPermission fPerm = perm;
+    if (null == userUgi) {
+      files.setPermission(path, perm);
+    }
+    else {
+      userUgi.doAs(new PrivilegedExceptionAction<Void>() {
+        public Void run() throws Exception {
+          files.setPermission(path, fPerm);
+          return null;
+        }
+      });
+    }
+    if (fStatus.isDirectory()
+        && !fStatus.isSymlink()) {
+      FileStatus[] statuses = fs.listStatus(path);
+      for (FileStatus status : statuses) {
+        changePermissions(fs, status.getPath());
+      }
+    }
+  }
+
   private static long getEstimatedSize(LocalResource rsrc) {
     if (rsrc.getSize() < 0) {
       return -1;
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourceRequest.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourceRequest.java
index 35f24851f7a10..7754baa73c250 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourceRequest.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalResourceRequest.java
@@ -33,6 +33,7 @@ public class LocalResourceRequest
   private final Path loc;
   private final long timestamp;
   private final LocalResourceType type;
+  private final LocalResourceVisibility visibility;
 
   /**
    * Wrap API resource to match against cache of localized resources.
@@ -43,13 +44,16 @@ public LocalResourceRequest(LocalResource resource)
       throws URISyntaxException {
     this(ConverterUtils.getPathFromYarnURL(resource.getResource()),
         resource.getTimestamp(),
-        resource.getType());
+        resource.getType(),
+        resource.getVisibility());
   }
 
-  LocalResourceRequest(Path loc, long timestamp, LocalResourceType type) {
+  LocalResourceRequest(Path loc, long timestamp, LocalResourceType type,
+      LocalResourceVisibility visibility) {
     this.loc = loc;
     this.timestamp = timestamp;
     this.type = type;
+    this.visibility = visibility;
   }
 
   @Override
@@ -114,7 +118,7 @@ public long getSize() {
 
   @Override
   public LocalResourceVisibility getVisibility() {
-    throw new UnsupportedOperationException();
+    return visibility;
   }
 
   @Override
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestFSDownload.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestFSDownload.java
index fda8817d99459..74aa57052c0d9 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestFSDownload.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestFSDownload.java
@@ -18,6 +18,12 @@
 
 package org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer;
 
+import static org.apache.hadoop.fs.CreateFlag.CREATE;
+import static org.apache.hadoop.fs.CreateFlag.OVERWRITE;
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.EnumSet;
@@ -28,29 +34,35 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+import junit.framework.Assert;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileContext;
-import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.LocalDirAllocator;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.LocalResource;
 import org.apache.hadoop.yarn.api.records.LocalResourceType;
+import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.FSDownload;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-
-import static org.apache.hadoop.fs.CreateFlag.*;
-
-
 import org.junit.AfterClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class TestFSDownload {
 
+  private static final Log LOG = LogFactory.getLog(TestFSDownload.class);
+  
   @AfterClass
   public static void deleteTestDir() throws IOException {
     FileContext fs = FileContext.getLocalFSFileContext();
@@ -61,7 +73,7 @@ public static void deleteTestDir() throws IOException {
     RecordFactoryProvider.getRecordFactory(null);
 
   static LocalResource createFile(FileContext files, Path p, int len,
-      Random r) throws IOException, URISyntaxException {
+      Random r, LocalResourceVisibility vis) throws IOException {
     FSDataOutputStream out = null;
     try {
       byte[] bytes = new byte[len];
@@ -75,10 +87,30 @@ static LocalResource createFile(FileContext files, Path p, int len,
     ret.setResource(ConverterUtils.getYarnUrlFromPath(p));
     ret.setSize(len);
     ret.setType(LocalResourceType.FILE);
+    ret.setVisibility(vis);
     ret.setTimestamp(files.getFileStatus(p).getModificationTime());
     return ret;
   }
 
+  static LocalResource createJar(FileContext files, Path p,
+      LocalResourceVisibility vis) throws IOException {
+    LOG.info(""Create jar file "" + p);
+    File jarFile = new File((files.makeQualified(p)).toUri());
+    FileOutputStream stream = new FileOutputStream(jarFile);
+    LOG.info(""Create jar out stream "");
+    JarOutputStream out = new JarOutputStream(stream, new Manifest());
+    LOG.info(""Done writing jar stream "");
+    out.close();
+    LocalResource ret = recordFactory.newRecordInstance(LocalResource.class);
+    ret.setResource(ConverterUtils.getYarnUrlFromPath(p));
+    FileStatus status = files.getFileStatus(p);
+    ret.setSize(status.getLen());
+    ret.setTimestamp(status.getModificationTime());
+    ret.setType(LocalResourceType.ARCHIVE);
+    ret.setVisibility(vis);
+    return ret;
+  }
+  
   @Test
   public void testDownload() throws IOException, URISyntaxException,
       InterruptedException {
@@ -88,6 +120,9 @@ public void testDownload() throws IOException, URISyntaxException,
       TestFSDownload.class.getSimpleName()));
     files.mkdir(basedir, null, true);
     conf.setStrings(TestFSDownload.class.getName(), basedir.toString());
+    
+    Map<LocalResource, LocalResourceVisibility> rsrcVis =
+        new HashMap<LocalResource, LocalResourceVisibility>();
 
     Random rand = new Random();
     long sharedSeed = rand.nextLong();
@@ -102,8 +137,19 @@ public void testDownload() throws IOException, URISyntaxException,
     int[] sizes = new int[10];
     for (int i = 0; i < 10; ++i) {
       sizes[i] = rand.nextInt(512) + 512;
+      LocalResourceVisibility vis = LocalResourceVisibility.PUBLIC;
+      switch (i%3) {
+      case 1:
+        vis = LocalResourceVisibility.PRIVATE;
+        break;
+      case 2:
+        vis = LocalResourceVisibility.APPLICATION;
+        break;       
+      }
+      
       LocalResource rsrc = createFile(files, new Path(basedir, """" + i),
-          sizes[i], rand);
+          sizes[i], rand, vis);
+      rsrcVis.put(rsrc, vis);
       FSDownload fsd =
           new FSDownload(files, UserGroupInformation.getCurrentUser(), conf,
               dirs, rsrc, new Random(sharedSeed));
@@ -115,6 +161,22 @@ public void testDownload() throws IOException, URISyntaxException,
         Path localized = p.getValue().get();
         assertEquals(sizes[Integer.valueOf(localized.getName())], p.getKey()
             .getSize());
+        FileStatus status = files.getFileStatus(localized);
+        FsPermission perm = status.getPermission();
+        System.out.println(""File permission "" + perm + 
+            "" for rsrc vis "" + p.getKey().getVisibility().name());
+        assert(rsrcVis.containsKey(p.getKey()));
+        switch (rsrcVis.get(p.getKey())) {
+        case PUBLIC:
+          Assert.assertTrue(""Public file should be 555"",
+              perm.toShort() == FSDownload.PUBLIC_FILE_PERMS.toShort());
+          break;
+        case PRIVATE:
+        case APPLICATION:
+          Assert.assertTrue(""Private file should be 500"",
+              perm.toShort() == FSDownload.PRIVATE_FILE_PERMS.toShort());          
+          break;
+        }
       }
     } catch (ExecutionException e) {
       throw new IOException(""Failed exec"", e);
@@ -122,5 +184,101 @@ public void testDownload() throws IOException, URISyntaxException,
       exec.shutdown();
     }
   }
+  
+  private void verifyPermsRecursively(FileSystem fs,
+      FileContext files, Path p,
+      LocalResourceVisibility vis) throws IOException {
+    FileStatus status = files.getFileStatus(p);
+    if (status.isDirectory()) {
+      if (vis == LocalResourceVisibility.PUBLIC) {
+        Assert.assertTrue(status.getPermission().toShort() ==
+          FSDownload.PUBLIC_DIR_PERMS.toShort());
+      }
+      else {
+        Assert.assertTrue(status.getPermission().toShort() ==
+          FSDownload.PRIVATE_DIR_PERMS.toShort());
+      }
+      if (!status.isSymlink()) {
+        FileStatus[] statuses = fs.listStatus(p);
+        for (FileStatus stat : statuses) {
+          verifyPermsRecursively(fs, files, stat.getPath(), vis);
+        }
+      }
+    }
+    else {
+      if (vis == LocalResourceVisibility.PUBLIC) {
+        Assert.assertTrue(status.getPermission().toShort() ==
+          FSDownload.PUBLIC_FILE_PERMS.toShort());
+      }
+      else {
+        Assert.assertTrue(status.getPermission().toShort() ==
+          FSDownload.PRIVATE_FILE_PERMS.toShort());
+      }
+    }      
+  }
+  
+  @Test
+  public void testDirDownload() throws IOException, InterruptedException {
+    Configuration conf = new Configuration();
+    FileContext files = FileContext.getLocalFSFileContext(conf);
+    final Path basedir = files.makeQualified(new Path(""target"",
+      TestFSDownload.class.getSimpleName()));
+    files.mkdir(basedir, null, true);
+    conf.setStrings(TestFSDownload.class.getName(), basedir.toString());
+    
+    Map<LocalResource, LocalResourceVisibility> rsrcVis =
+        new HashMap<LocalResource, LocalResourceVisibility>();
+  
+    Random rand = new Random();
+    long sharedSeed = rand.nextLong();
+    rand.setSeed(sharedSeed);
+    System.out.println(""SEED: "" + sharedSeed);
+
+    Map<LocalResource,Future<Path>> pending =
+      new HashMap<LocalResource,Future<Path>>();
+    ExecutorService exec = Executors.newSingleThreadExecutor();
+    LocalDirAllocator dirs =
+      new LocalDirAllocator(TestFSDownload.class.getName());
+    for (int i = 0; i < 5; ++i) {
+      LocalResourceVisibility vis = LocalResourceVisibility.PUBLIC;
+      switch (rand.nextInt()%3) {
+      case 1:
+        vis = LocalResourceVisibility.PRIVATE;
+        break;
+      case 2:
+        vis = LocalResourceVisibility.APPLICATION;
+        break;       
+      }
+      
+      LocalResource rsrc = createJar(files, new Path(basedir, ""dir"" + i
+          + "".jar""), vis);
+      rsrcVis.put(rsrc, vis);
+      FSDownload fsd =
+          new FSDownload(files, UserGroupInformation.getCurrentUser(), conf,
+              dirs, rsrc, new Random(sharedSeed));
+      pending.put(rsrc, exec.submit(fsd));
+    }
+    
+    try {
+      
+      for (Map.Entry<LocalResource,Future<Path>> p : pending.entrySet()) {
+        Path localized = p.getValue().get();
+        FileStatus status = files.getFileStatus(localized);
 
+        System.out.println(""Testing path "" + localized);
+        assert(status.isDirectory());
+        assert(rsrcVis.containsKey(p.getKey()));
+        
+        verifyPermsRecursively(localized.getFileSystem(conf),
+            files, localized, rsrcVis.get(p.getKey()));
+      }
+    } catch (ExecutionException e) {
+      throw new IOException(""Failed exec"", e);
+    } finally {
+      exec.shutdown();
+    }
+    
+    
+
+  }
 }
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceRetention.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceRetention.java
index 092ab1674cdc6..c425eb59ffb8e 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceRetention.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceRetention.java
@@ -23,6 +23,7 @@
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.yarn.api.records.LocalResourceType;
+import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
 import org.apache.hadoop.yarn.server.nodemanager.DeletionService;
 
 import org.junit.Test;
@@ -82,7 +83,7 @@ LocalResourcesTracker createMockTracker(String user, final long rsrcSize,
     for (int i = 0; i < nRsrcs; ++i) {
       final LocalResourceRequest req = new LocalResourceRequest(
           new Path(""file:///"" + user + ""/rsrc"" + i), timestamp + i * tsstep,
-          LocalResourceType.FILE);
+          LocalResourceType.FILE, LocalResourceVisibility.PUBLIC);
       final long ts = timestamp + i * tsstep;
       final Path p = new Path(""file:///local/"" + user + ""/rsrc"" + i);
       LocalizedResource rsrc = new LocalizedResource(req, null) {"
aeda373e85a6dacc6ee4db762184d229739af7fb,Mylyn Reviews,"317535: Fixed a bug preventing submit
",c,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java
index b52a99ab..bcf8c548 100644
--- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewData.java
@@ -7,7 +7,7 @@ public class ReviewData {
 	private boolean outgoing;
 	private Review review;
 	private ITask task;
-	// TODO state
+	private boolean dirty;
 
 	public ReviewData(ITask task, Review review) {
 		this.task=task;
@@ -34,9 +34,15 @@ public Review getReview() {
 		return review;
 	}
 
-	public Object getModificationDate() {
-		// TODO Auto-generated method stub
-		return null;
+	public void setDirty(boolean isDirty) {
+		this.dirty=isDirty;
 	}
 
+	public void setDirty() {
+		setDirty(true);
+	}
+	public boolean isDirty() {
+		return this.dirty;
+	}
+	
 }
diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
index beffd1ae..eeeadcf5 100644
--- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/ReviewsUtil.java
@@ -49,8 +49,9 @@ public static List<ReviewSubTask> getReviewSubTasksFor(
 		List<ReviewSubTask> resultList = new ArrayList<ReviewSubTask>();
 		try {
 			for (ITask subTask : taskContainer.getChildren()) {
-				if (subTask.getSummary().startsWith(""Review"")) { //$NON-NLS-1$
-
+				
+				if (ReviewsUtil.isMarkedAsReview(subTask)) {//.getSummary().startsWith(""Review"")) { //$NON-NLS-1$
+					// change to review data manager
 					for (Review review : getReviewAttachmentFromTask(
 							taskDataManager, repositoryModel, subTask)) {
 						// TODO change to latest etc
@@ -170,4 +171,14 @@ public static List<Review> getReviewAttachmentFromTask(
 	public static List<? extends ITargetPathStrategy> getPathFindingStrategies() {
 		return strategies;
 	}
+
+	public static boolean isMarkedAsReview(ITask task) {
+		boolean isReview = Boolean.parseBoolean(task
+				.getAttribute(ReviewConstants.ATTR_REVIEW_FLAG));
+		return isReview;
+	}
+
+	public static void markAsReview(ITask task) {
+		task.setAttribute(ReviewConstants.ATTR_REVIEW_FLAG, Boolean.TRUE.toString());
+	}
 }
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java
index 1c98ef33..242ceda5 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/CreateReviewAction.java
@@ -9,6 +9,7 @@
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
 import org.eclipse.mylyn.reviews.core.ReviewConstants;
+import org.eclipse.mylyn.reviews.core.ReviewsUtil;
 import org.eclipse.mylyn.reviews.core.model.review.Review;
 import org.eclipse.mylyn.reviews.core.model.review.ReviewFactory;
 import org.eclipse.mylyn.reviews.core.model.review.ScopeItem;
@@ -69,7 +70,7 @@ public boolean performFinish(TaskDataModel model,ScopeItem scope) {
 			TaskRepository taskRepository=model.getTaskRepository();
 			ITask newTask = TasksUiUtil.createOutgoingNewTask(taskRepository.getConnectorKind(), taskRepository.getRepositoryUrl());
 
-			newTask.setAttribute(ReviewConstants.ATTR_REVIEW_FLAG, Boolean.TRUE.toString());
+			ReviewsUtil.markAsReview(newTask);
 			TaskMapper initializationData=new TaskMapper(model.getTaskData());
 			TaskData taskData = TasksUiInternal.createTaskData(taskRepository, initializationData, null,
 					new NullProgressMonitor());
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java
index 9b14d067..e3648f50 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPart.java
@@ -294,7 +294,8 @@ public Image getImage(Object element) {
 		if (review.getResult() != null) {
 			Rating rating = review.getResult().getRating();
 			ratingList.setSelection(new StructuredSelection(rating));
-			commentText.setText(review.getResult().getText());
+			String comment = review.getResult().getText();
+			commentText.setText(comment!=null?comment:"""");
 		}
 		commentText.addModifyListener(new ModifyListener() {
 
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java
index e420174f..2620fd11 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/editors/ReviewTaskEditorPartAdvisor.java
@@ -16,7 +16,9 @@
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
 import org.eclipse.mylyn.reviews.core.ReviewConstants;
+import org.eclipse.mylyn.reviews.core.ReviewData;
 import org.eclipse.mylyn.reviews.core.ReviewDataManager;
+import org.eclipse.mylyn.reviews.core.ReviewsUtil;
 import org.eclipse.mylyn.reviews.core.model.review.Review;
 import org.eclipse.mylyn.reviews.ui.Messages;
 import org.eclipse.mylyn.reviews.ui.ReviewCommentTaskAttachmentSource;
@@ -37,8 +39,7 @@ public class ReviewTaskEditorPartAdvisor implements
 		ITaskEditorPartDescriptorAdvisor {
 
 	public boolean canCustomize(ITask task) {
-		boolean isReview = Boolean.parseBoolean(task
-				.getAttribute(ReviewConstants.ATTR_REVIEW_FLAG));
+		boolean isReview = ReviewsUtil.isMarkedAsReview(task);
 		return isReview;
 	}
 
@@ -72,32 +73,37 @@ public AbstractTaskEditorPart createPart() {
 	public void taskMigration(ITask oldTask, ITask newTask) {
 		ReviewDataManager dataManager = ReviewsUiPlugin.getDataManager();
 		Review review = dataManager.getReviewData(oldTask).getReview();
-		dataManager.storeTask(newTask, review);
+		dataManager.storeOutgoingTask(newTask, review);
+		ReviewsUtil.markAsReview(newTask);
 	}
 
 	public void afterSubmit(ITask task) {
 		try {
-			Review review = ReviewsUiPlugin.getDataManager()
-					.getReviewData(task).getReview();
-
-			TaskRepository taskRepository = TasksUiPlugin
-					.getRepositoryManager().getRepository(
-							task.getRepositoryUrl());
-			TaskData taskData = TasksUiPlugin.getTaskDataManager().getTaskData(
-					task);
-			// todo get which attachments have to be submitted
-			TaskAttribute attachmentAttribute = taskData.getAttributeMapper()
-					.createTaskAttachment(taskData);
-			byte[] attachmentBytes = createAttachment(review);
-
-			ReviewCommentTaskAttachmentSource attachment = new ReviewCommentTaskAttachmentSource(
-					attachmentBytes);
-
-			AbstractRepositoryConnector connector = TasksUi
-					.getRepositoryConnector(taskRepository.getConnectorKind());
-			connector.getTaskAttachmentHandler().postContent(taskRepository,
-					task, attachment, ""review result"", //$NON-NLS-1$
-					attachmentAttribute, new NullProgressMonitor());
+			ReviewData reviewData = ReviewsUiPlugin.getDataManager()
+					.getReviewData(task);
+			Review review = reviewData.getReview();
+
+			if (reviewData.isOutgoing() || reviewData.isDirty()) {
+				TaskRepository taskRepository = TasksUiPlugin
+						.getRepositoryManager().getRepository(
+								task.getRepositoryUrl());
+				TaskData taskData = TasksUiPlugin.getTaskDataManager()
+						.getTaskData(task);
+				// todo get which attachments have to be submitted
+				TaskAttribute attachmentAttribute = taskData
+						.getAttributeMapper().createTaskAttachment(taskData);
+				byte[] attachmentBytes = createAttachment(review);
+
+				ReviewCommentTaskAttachmentSource attachment = new ReviewCommentTaskAttachmentSource(
+						attachmentBytes);
+
+				AbstractRepositoryConnector connector = TasksUi
+						.getRepositoryConnector(taskRepository
+								.getConnectorKind());
+				connector.getTaskAttachmentHandler().postContent(
+						taskRepository, task, attachment, ""review result"", //$NON-NLS-1$
+						attachmentAttribute, new NullProgressMonitor());
+			}
 		} catch (CoreException e) {
 			e.printStackTrace();
 		}"
d6c09ee130cc88cc8317c7c2b02452ff6993f177,orientdb,Fixed bug on database drop in Maven Tests--,c,https://github.com/orientechnologies/orientdb,"diff --git a/core/src/test/java/com/orientechnologies/orient/core/index/OSimpleKeyIndexDefinitionTest.java b/core/src/test/java/com/orientechnologies/orient/core/index/OSimpleKeyIndexDefinitionTest.java
index 3fe018f8f28..caa8598aa62 100644
--- a/core/src/test/java/com/orientechnologies/orient/core/index/OSimpleKeyIndexDefinitionTest.java
+++ b/core/src/test/java/com/orientechnologies/orient/core/index/OSimpleKeyIndexDefinitionTest.java
@@ -148,7 +148,6 @@ public void testReload() {
 		final OSimpleKeyIndexDefinition loadedKeyIndexDefinition = new OSimpleKeyIndexDefinition();
 		loadedKeyIndexDefinition.fromStream(loadDocument);
 
-		databaseDocumentTx.close();
 		databaseDocumentTx.drop();
 
 		Assert.assertEquals(loadedKeyIndexDefinition, simpleKeyIndexDefinition);
diff --git a/core/src/test/java/com/orientechnologies/orient/core/storage/impl/local/OStorageLocalTest.java b/core/src/test/java/com/orientechnologies/orient/core/storage/impl/local/OStorageLocalTest.java
index b08ce2567de..0bd71d872a8 100644
--- a/core/src/test/java/com/orientechnologies/orient/core/storage/impl/local/OStorageLocalTest.java
+++ b/core/src/test/java/com/orientechnologies/orient/core/storage/impl/local/OStorageLocalTest.java
@@ -12,18 +12,18 @@
 
 @Test
 public class OStorageLocalTest {
-    private boolean oldStorageOpen;
+	private boolean	oldStorageOpen;
 
-    @BeforeMethod
-    public void beforeMethod() {
-        oldStorageOpen = OGlobalConfiguration.STORAGE_KEEP_OPEN.getValueAsBoolean();
-        OGlobalConfiguration.STORAGE_KEEP_OPEN.setValue(false);
-    }
+	@BeforeMethod
+	public void beforeMethod() {
+		oldStorageOpen = OGlobalConfiguration.STORAGE_KEEP_OPEN.getValueAsBoolean();
+		OGlobalConfiguration.STORAGE_KEEP_OPEN.setValue(false);
+	}
 
-    @AfterMethod
-    public void afterMethod() {
-       OGlobalConfiguration.STORAGE_KEEP_OPEN.setValue(oldStorageOpen);
-    }
+	@AfterMethod
+	public void afterMethod() {
+		OGlobalConfiguration.STORAGE_KEEP_OPEN.setValue(oldStorageOpen);
+	}
 
 	public void withLegacyPath() {
 		String dbPath = getDatabasePath();
@@ -40,7 +40,6 @@ public void withLegacyPath() {
 		// Something was added to dbPath so the legacy situation was simulated
 		dbPath += ""/foo"";
 		db = new ODatabaseDocumentTx(""local:"" + dbPath).open(""admin"", ""admin"");
-		db.close();
 		db.drop();
 		Assert.assertTrue(true);
 	}"
3e0e71690424ab386f97e3b3f18751748cf52e49,intellij-community,FrameWrapper: do not restore frame state as- iconified (IDEA-87792)--,c,https://github.com/JetBrains/intellij-community,"diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
index bde382d88062c..2eac7039600d0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
@@ -309,7 +309,7 @@ protected void loadFrameState() {
       }
     }
 
-    if (extendedState == Frame.ICONIFIED || extendedState == Frame.MAXIMIZED_BOTH && frame instanceof JFrame) {
+    if (extendedState == Frame.MAXIMIZED_BOTH && frame instanceof JFrame) {
       ((JFrame)frame).setExtendedState(extendedState);
     }
   }"
ce5970c5bf7bf7925b0830054da067c1c89e7b0f,Vala,"vapigen: fix a crash if type_name is used for pointer arguments

Fixes bug 614348.
",c,https://github.com/GNOME/vala/,"diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index dcd29d3ae1..f516fe9140 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -458,8 +458,8 @@ gst_tag_list_add ellipsis=""1""
 gst_tag_list_add_values ellipsis=""1""
 gst_tag_list_get_boolean.value is_out=""1""
 gst_tag_list_get_boolean_index.value is_out=""1""
-gst_tag_list_get_char.value is_out=""1"" type_name=""char""
-gst_tag_list_get_char_index.value is_out=""1"" type_name=""char""
+gst_tag_list_get_char.value type_name=""char"" is_out=""1""
+gst_tag_list_get_char_index.value type_name=""char"" is_out=""1""
 gst_tag_list_get_date.value is_out=""1"" nullable=""1"" value_owned=""1""
 gst_tag_list_get_date_index.value is_out=""1"" nullable=""1"" value_owned=""1""
 gst_tag_list_get_double.value is_out=""1""
@@ -476,8 +476,8 @@ gst_tag_list_get_pointer.value is_out=""1""
 gst_tag_list_get_pointer_index.value is_out=""1""
 gst_tag_list_get_string.value is_out=""1"" value_owned=""1""
 gst_tag_list_get_string_index.value is_out=""1"" value_owned=""1""
-gst_tag_list_get_uchar.value is_out=""1"" type_name=""uchar""
-gst_tag_list_get_uchar_index.value is_out=""1"" type_name=""uchar""
+gst_tag_list_get_uchar.value type_name=""uchar"" is_out=""1""
+gst_tag_list_get_uchar_index.value type_name=""uchar"" is_out=""1""
 gst_tag_list_get_uint.value is_out=""1""
 gst_tag_list_get_uint64.value is_out=""1""
 gst_tag_list_get_uint64_index.value is_out=""1""
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index d2e739ec32..727f57378d 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1764,7 +1764,14 @@ public class Vala.GIdlParser : CodeVisitor {
 						set_delegate_target_pos = true;
 						delegate_target_pos = eval (nv[1]).to_double ();
 					} else if (nv[0] == ""type_name"") {
-						((UnresolvedType) param_type).unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
+						var sym = new UnresolvedSymbol (null, eval (nv[1]));
+						if (param_type is UnresolvedType) {
+							((UnresolvedType) param_type).unresolved_symbol = sym;
+						} else {
+							// Overwrite old param_type, so ""type_name"" must be before any
+							// other param type modifying metadata
+							p.parameter_type = param_type = new UnresolvedType.from_symbol (sym, return_type.source_reference);
+						}
 					} else if (nv[0] == ""ctype"") {
 						p.ctype = eval (nv[1]);
 					} else if (nv[0] == ""type_arguments"") {"
233a1b898725fc39f3f14346c716b5f52b3f0e0a,camel,improved the camel-bam module to handle- concurrent processing better & dealing with JDBC/JPA exceptions if concurrent- updates to the same process occur at the same time; also added more better- tests--git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@563909 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/camel,"diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index ca95a39352679..d590b452ff48c 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -42,35 +42,38 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>javax.persistence</groupId>
       <artifactId>persistence-api</artifactId>
       <version>1.0</version>
     </dependency>
 
+    <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
       <type>test-jar</type>
-      <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
       <type>test-jar</type>
-      <optional>true</optional>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-juel</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
     <!--
@@ -88,12 +91,6 @@
         </dependency>
     -->
 
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.0.5</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
@@ -110,6 +107,7 @@
         <configuration>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
+          <forkMode>pertest</forkMode>
           <includes>
             <include>**/*Test.*</include>
           </includes>
@@ -163,6 +161,41 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>derby</id>
+      <build>
+        <testResources>
+          <testResource>
+            <directory>${basedir}/src/test/profiles/derby</directory>
+          </testResource>
+          <testResource>
+            <directory>${basedir}/src/test/resources</directory>
+          </testResource>
+        </testResources>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-entitymanager</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.derby</groupId>
+          <artifactId>derby</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
 
     <profile>
       <id>mysql</id>
@@ -188,8 +221,9 @@
           <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>hsqldb</groupId>
-          <artifactId>hsqldb</artifactId>
+          <groupId>mysql</groupId>
+          <artifactId>mysql-connector-java</artifactId>
+          <version>5.0.5</version>
           <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
index 2237b7412453d..b00d817dece2f 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.bam.model;
 
-import java.util.Date;
+import org.apache.camel.bam.processor.ProcessContext;
+import org.apache.camel.bam.rules.ActivityRules;
+import org.apache.camel.util.ObjectHelper;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -26,10 +28,8 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-
-import org.apache.camel.bam.processor.ProcessContext;
-import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.camel.util.ObjectHelper;
+import javax.persistence.Transient;
+import java.util.Date;
 
 /**
  * The default state for a specific activity within a process
@@ -56,7 +56,7 @@ public Long getId() {
 
     @Override
     public String toString() {
-        return ""ActivityState["" + getId() + "" "" + getActivityDefinition() + ""]"";
+        return ""ActivityState["" + getId() + "" on "" + getProcessInstance() + "" "" + getActivityDefinition() + ""]"";
     }
 
     public synchronized void processExchange(ActivityRules activityRules, ProcessContext context) throws Exception {
@@ -147,6 +147,15 @@ public void setTimeCompleted(Date timeCompleted) {
         }
     }
 
+    @Transient
+    public String getCorrelationKey() {
+        ProcessInstance pi = getProcessInstance();
+        if (pi == null) {
+            return null;
+        }
+        return pi.getCorrelationKey();
+    }
+
     // Implementation methods
     // -----------------------------------------------------------------------
 
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
index 3acc9b04ade76..a74913be344e5 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
@@ -19,15 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.UniqueConstraint;
+import javax.persistence.*;
 
 import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.commons.logging.Log;
@@ -39,27 +31,29 @@
  * @version $Revision: $
  */
 @Entity
-@UniqueConstraint(columnNames = {""correlationKey"" })
-public class ProcessInstance extends TemporalEntity {
+public class ProcessInstance  {
     private static final transient Log LOG = LogFactory.getLog(ProcessInstance.class);
     private ProcessDefinition processDefinition;
     private Collection<ActivityState> activityStates = new HashSet<ActivityState>();
     private String correlationKey;
+    private Date timeStarted;
+    private Date timeCompleted;
 
     public ProcessInstance() {
         setTimeStarted(new Date());
     }
 
     public String toString() {
-        return getClass().getName() + ""[id: "" + getId() + "", key: "" + getCorrelationKey() + ""]"";
+        return ""ProcessInstance["" + getCorrelationKey() + ""]"";
     }
 
-    // This crap is required to work around a bug in hibernate
-    @Override
     @Id
-    @GeneratedValue
-    public Long getId() {
-        return super.getId();
+    public String getCorrelationKey() {
+        return correlationKey;
+    }
+
+    public void setCorrelationKey(String correlationKey) {
+        this.correlationKey = correlationKey;
     }
 
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST })
@@ -80,15 +74,34 @@ public void setActivityStates(Collection<ActivityState> activityStates) {
         this.activityStates = activityStates;
     }
 
-    public String getCorrelationKey() {
-        return correlationKey;
+
+    @Transient
+    public boolean isStarted() {
+        return timeStarted != null;
     }
 
-    public void setCorrelationKey(String correlationKey) {
-        this.correlationKey = correlationKey;
+    @Transient
+    public boolean isCompleted() {
+        return timeCompleted != null;
+    }
+
+    @Temporal(TemporalType.TIME)
+    public Date getTimeStarted() {
+        return timeStarted;
+    }
+
+    public void setTimeStarted(Date timeStarted) {
+        this.timeStarted = timeStarted;
+    }
+
+    @Temporal(TemporalType.TIME)
+    public Date getTimeCompleted() {
+        return timeCompleted;
     }
 
-    // Helper methods
+    public void setTimeCompleted(Date timeCompleted) {
+        this.timeCompleted = timeCompleted;
+    }    // Helper methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
index 4a5acf317efff..ce221ab4d58a8 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
@@ -16,25 +16,27 @@
  */
 package org.apache.camel.bam.processor;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
+import javax.persistence.EntityExistsException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
 /**
  * A base {@link Processor} for working on <a
  * href=""http://activemq.apache.org/camel/bam.html"">BAM</a> which a derived
  * class would do the actual persistence such as the {@link JpaBamProcessor}
- * 
+ *
  * @version $Revision: $
  */
 public abstract class BamProcessorSupport<T> implements Processor {
@@ -42,6 +44,15 @@ public abstract class BamProcessorSupport<T> implements Processor {
     private Class<T> entityType;
     private Expression<Exchange> correlationKeyExpression;
     private TransactionTemplate transactionTemplate;
+    private int maximumRetries = 30;
+
+    public int getMaximumRetries() {
+        return maximumRetries;
+    }
+
+    public void setMaximumRetries(int maximumRetries) {
+        this.maximumRetries = maximumRetries;
+    }
 
     protected BamProcessorSupport(TransactionTemplate transactionTemplate, Expression<Exchange> correlationKeyExpression) {
         this.transactionTemplate = transactionTemplate;
@@ -49,12 +60,12 @@ protected BamProcessorSupport(TransactionTemplate transactionTemplate, Expressio
 
         Type type = getClass().getGenericSuperclass();
         if (type instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = (ParameterizedType)type;
+            ParameterizedType parameterizedType = (ParameterizedType) type;
             Type[] arguments = parameterizedType.getActualTypeArguments();
             if (arguments.length > 0) {
                 Type argumentType = arguments[0];
                 if (argumentType instanceof Class) {
-                    this.entityType = (Class<T>)argumentType;
+                    this.entityType = (Class<T>) argumentType;
                 }
             }
         }
@@ -70,27 +81,46 @@ protected BamProcessorSupport(TransactionTemplate transactionTemplate, Expressio
     }
 
     public void process(final Exchange exchange) {
-        transactionTemplate.execute(new TransactionCallback() {
-            public Object doInTransaction(TransactionStatus status) {
-                try {
-                    Object key = getCorrelationKey(exchange);
+        Object entity = null;
+        for (int i = 0; entity == null && i < maximumRetries; i++) {
+            if (i > 0) {
+                LOG.info(""Retry attempt due to duplicate row: "" + i);
+            }
+            entity = transactionTemplate.execute(new TransactionCallback() {
+                public Object doInTransaction(TransactionStatus status) {
+                    try {
+                        Object key = getCorrelationKey(exchange);
 
-                    T entity = loadEntity(exchange, key);
+                        T entity = loadEntity(exchange, key);
 
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug(""Correlation key: "" + key + "" with entity: "" + entity);
-                    }
-                    processEntity(exchange, entity);
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug(""Correlation key: "" + key + "" with entity: "" + entity);
+                        }
+                        processEntity(exchange, entity);
 
-                    return entity;
-                } catch (Exception e) {
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug(""Caught: "" + e, e);
+                        return entity;
+                    }
+                    catch (JpaSystemException e) {
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug(""Likely exception is due to duplicate row in concurrent setting: "" + e, e);
+                        }
+                        LOG.info(""Attempt to insert duplicate row due to concurrency issue, so retrying: "" + e);
+                        return retryDueToDuplicate(status);
+                    }
+                    catch (DataIntegrityViolationException e) {
+                        Throwable throwable = e.getCause();
+                        if (throwable instanceof EntityExistsException) {
+                            LOG.info(""Attempt to insert duplicate row due to concurrency issue, so retrying: "" + throwable);
+                            return retryDueToDuplicate(status);
+                        }
+                        return onError(status, throwable);
+                    }
+                    catch (Throwable e) {
+                        return onError(status, e);
                     }
-                    throw new RuntimeCamelException(e);
                 }
-            }
-        });
+            });
+        }
     }
 
     // Properties
@@ -116,4 +146,15 @@ protected Object getCorrelationKey(Exchange exchange) throws NoCorrelationKeyExc
         }
         return value;
     }
+
+    protected Object retryDueToDuplicate(TransactionStatus status) {
+        status.setRollbackOnly();
+        return null;
+    }
+
+    protected Object onError(TransactionStatus status, Throwable e) {
+        status.setRollbackOnly();
+        LOG.error(""Caught: "" + e, e);
+        throw new RuntimeCamelException(e);
+    }
 }
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
index 84b249e01ebf2..09026f19d585c 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
@@ -18,12 +18,12 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
+import org.apache.camel.Processor;
 import org.apache.camel.bam.model.ActivityState;
 import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.transaction.support.TransactionTemplate;
 
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
index 15d9c5f987348..281f5815351ae 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
@@ -16,30 +16,34 @@
  */
 package org.apache.camel.bam.processor;
 
-import java.util.List;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
 import org.apache.camel.bam.model.ProcessDefinition;
 import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.camel.util.IntrospectionSupport;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.transaction.support.TransactionTemplate;
 
+import java.util.List;
+
 /**
  * A base class for JPA based BAM which can use any entity to store the process
  * instance information which allows derived classes to specialise the process
  * instance entity.
- * 
+ *
  * @version $Revision: $
  */
 public class JpaBamProcessorSupport<T> extends BamProcessorSupport<T> {
+    private static final transient Log LOG = LogFactory.getLog(JpaBamProcessorSupport.class);
+    
     private ActivityRules activityRules;
     private JpaTemplate template;
     private String findByKeyQuery;
     private String keyPropertyName = ""correlationKey"";
+    private boolean correlationKeyIsPrimary = true;
 
     public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, JpaTemplate template, Expression<Exchange> correlationKeyExpression, ActivityRules activityRules, Class<T> entitytype) {
         super(transactionTemplate, correlationKeyExpression, entitytype);
@@ -88,24 +92,48 @@ public void setTemplate(JpaTemplate template) {
         this.template = template;
     }
 
+    public boolean isCorrelationKeyIsPrimary() {
+        return correlationKeyIsPrimary;
+    }
+
+    public void setCorrelationKeyIsPrimary(boolean correlationKeyIsPrimary) {
+        this.correlationKeyIsPrimary = correlationKeyIsPrimary;
+    }
+
     // Implementatiom methods
     // -----------------------------------------------------------------------
     protected T loadEntity(Exchange exchange, Object key) {
-        List<T> list = template.find(getFindByKeyQuery(), key);
-        T entity = null;
-        if (!list.isEmpty()) {
-            entity = list.get(0);
-        }
+        T entity = findEntityByCorrelationKey(key);
         if (entity == null) {
             entity = createEntity(exchange, key);
             setKeyProperty(entity, key);
             ProcessDefinition definition = ProcessDefinition.getRefreshedProcessDefinition(template, getActivityRules().getProcessRules().getProcessDefinition());
             setProcessDefinitionProperty(entity, definition);
             template.persist(entity);
+
+            // Now we must flush to avoid concurrent updates clashing trying to insert the
+            // same row
+            LOG.debug(""About to flush on entity: "" + entity + "" with key: "" + key);
+            template.flush();
         }
         return entity;
     }
 
+    protected T findEntityByCorrelationKey(Object key) {
+        if (isCorrelationKeyIsPrimary()) {
+            return template.find(getEntityType(), key);
+        }
+        else {
+            List<T> list = template.find(getFindByKeyQuery(), key);
+            if (list.isEmpty()) {
+                return null;
+            }
+            else {
+                return list.get(0);
+            }
+        }
+    }
+
     /**
      * Sets the key property on the new entity
      */
@@ -121,14 +149,15 @@ protected void setProcessDefinitionProperty(T entity, ProcessDefinition processD
      * Create a new instance of the entity for the given key
      */
     protected T createEntity(Exchange exchange, Object key) {
-        return (T)exchange.getContext().getInjector().newInstance(getEntityType());
+        return (T) exchange.getContext().getInjector().newInstance(getEntityType());
     }
 
     protected void processEntity(Exchange exchange, T entity) throws Exception {
         if (entity instanceof Processor) {
-            Processor processor = (Processor)entity;
+            Processor processor = (Processor) entity;
             processor.process(exchange);
-        } else {
+        }
+        else {
             // TODO add other extension points - eg. passing in Activity
             throw new IllegalArgumentException(""No processor defined for this route"");
         }
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
index 2373fa0dbde6a..b0118e593268e 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
@@ -74,16 +74,6 @@ public void processExchange(Exchange exchange, ProcessInstance process) {
     public ActivityDefinition getActivityDefinition() {
         // lets always query for it, to avoid issues with refreshing before a commit etc
         return builder.findOrCreateActivityDefinition(activityName);
-/*
-        if (activityDefinition == null) {
-            activityDefinition = builder.findOrCreateActivityDefinition(activityName);
-        }
-        else {
-            // lets refresh it
-            builder.getJpaTemplate().refresh(activityDefinition);
-        }
-        return activityDefinition;
-*/
     }
 
     public void setActivityDefinition(ActivityDefinition activityDefinition) {
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
index 0f6c2514a7cf3..34fc2d36aa12e 100644
--- a/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
+++ b/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
@@ -17,28 +17,26 @@
 package org.apache.camel.bam;
 
 import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
-
+import static org.apache.camel.util.Time.seconds;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
-import static org.apache.camel.util.Time.seconds;
-
 /**
  * @version $Revision: $
  */
 public class BamRouteTest extends SpringTestSupport {
+    protected MockEndpoint overdueEndpoint;
 
-    public void testSendingToFirstActivityOnlyResultsInOverdueMessage() throws Exception {
-        MockEndpoint overdueEndpoint = resolveMandatoryEndpoint(""mock:overdue"", MockEndpoint.class);
+    public void testBam() throws Exception {
         overdueEndpoint.expectedMessageCount(1);
 
         template.sendBody(""direct:a"", ""<hello id='123'>world!</hello>"");
 
-        overdueEndpoint.assertIsSatisfied(5000);
+        overdueEndpoint.assertIsSatisfied();
     }
 
     protected ClassPathXmlApplicationContext createApplicationContext() {
@@ -48,7 +46,11 @@ protected ClassPathXmlApplicationContext createApplicationContext() {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+
         camelContext.addRoutes(createRouteBuilder());
+
+        overdueEndpoint = resolveMandatoryEndpoint(""mock:overdue"", MockEndpoint.class);
+        overdueEndpoint.setDefaulResultWaitMillis(8000);
     }
 
     protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
new file mode 100644
index 0000000000000..8714dc1f29dd4
--- /dev/null
+++ b/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
@@ -0,0 +1,43 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.bam;
+
+import static org.apache.camel.language.juel.JuelExpression.el;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class MultipleActivitiesConcurrentlyTest extends MultipleProcessesTest {
+
+    @Override
+    public void testBam() throws Exception {
+        overdueEndpoint.expectedMessageCount(1);
+        overdueEndpoint.message(0).predicate(el(""${in.body.correlationKey == '124'}""));
+
+        Thread thread = new Thread(""B sender"") {
+            public void run() {
+                sendBMessages();
+            }
+        };
+        thread.start();
+
+        sendAMessages();
+
+        overdueEndpoint.assertIsSatisfied();
+    }
+}
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
new file mode 100644
index 0000000000000..c9cbf4456933f
--- /dev/null
+++ b/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
@@ -0,0 +1,48 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the ""License""); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.bam;
+
+import static org.apache.camel.language.juel.JuelExpression.el;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class MultipleProcessesTest extends BamRouteTest {
+
+    @Override
+    public void testBam() throws Exception {
+        overdueEndpoint.expectedMessageCount(1);
+        overdueEndpoint.message(0).predicate(el(""${in.body.correlationKey == '124'}""));
+
+        sendAMessages();
+        sendBMessages();
+
+        overdueEndpoint.assertIsSatisfied();
+    }
+
+    protected void sendAMessages() {
+        template.sendBody(""direct:a"", ""<hello id='123'>A</hello>"");
+        template.sendBody(""direct:a"", ""<hello id='124'>B</hello>"");
+        template.sendBody(""direct:a"", ""<hello id='125'>C</hello>"");
+    }
+
+    protected void sendBMessages() {
+        template.sendBody(""direct:b"", ""<hello id='123'>A</hello>"");
+        template.sendBody(""direct:b"", ""<hello id='125'>C</hello>"");
+    }
+}
diff --git a/components/camel-bam/src/test/profiles/derby/META-INF/persistence.xml b/components/camel-bam/src/test/profiles/derby/META-INF/persistence.xml
new file mode 100644
index 0000000000000..1ee96e339587a
--- /dev/null
+++ b/components/camel-bam/src/test/profiles/derby/META-INF/persistence.xml
@@ -0,0 +1,35 @@
+<?xml version=""1.0"" encoding=""UTF-8""?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the ""License"");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an ""AS IS"" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<persistence xmlns=""http://java.sun.com/xml/ns/persistence""
+             xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""
+             version=""1.0"">
+
+  <persistence-unit name=""bam"" transaction-type=""RESOURCE_LOCAL"">
+    <class>org.apache.camel.bam.model.ActivityDefinition</class>
+    <class>org.apache.camel.bam.model.ActivityState</class>
+    <class>org.apache.camel.bam.model.ProcessDefinition</class>
+    <class>org.apache.camel.bam.model.ProcessInstance</class>
+
+    <properties>
+      <property name=""hibernate.dialect"" value=""org.hibernate.dialect.DerbyDialect""/>
+      <property name=""hibernate.connection.driver_class"" value=""org.apache.derby.jdbc.EmbeddedDriver""/>
+      <property name=""hibernate.connection.url"" value=""jdbc:derby:target/test/database;create=true""/>
+      <property name=""hibernate.hbm2ddl.auto"" value=""create""/>
+    </properties>
+
+  </persistence-unit>
+</persistence>
diff --git a/components/camel-bam/src/test/profiles/mysql/META-INF/persistence.xml b/components/camel-bam/src/test/profiles/mysql/META-INF/persistence.xml
index ad93d7cbd1b1d..5b76d5d3cab1c 100644
--- a/components/camel-bam/src/test/profiles/mysql/META-INF/persistence.xml
+++ b/components/camel-bam/src/test/profiles/mysql/META-INF/persistence.xml
@@ -28,6 +28,11 @@
       <property name=""hibernate.dialect"" value=""org.hibernate.dialect.MySQLDialect""/>
       <property name=""hibernate.connection.driver_class"" value=""com.mysql.jdbc.Driver""/>
       <property name=""hibernate.connection.url"" value=""jdbc:mysql://localhost/camel_bam?relaxAutoCommit=true""/>
+
+      <!-- TODO change to correct user -->
+      <property name=""hibernate.connection.username"" value=""jstrachan""/>
+      <!--<property name=""hibernate.connection.password"" value=""""/>-->
+
       <property name=""hibernate.hbm2ddl.auto"" value=""create""/>
     </properties>
 
diff --git a/components/camel-bam/src/test/resources/log4j.properties b/components/camel-bam/src/test/resources/log4j.properties
index 0fe69a1406688..7aab19225406e 100644
--- a/components/camel-bam/src/test/resources/log4j.properties
+++ b/components/camel-bam/src/test/resources/log4j.properties
@@ -18,12 +18,13 @@
 #
 # The logging properties used for eclipse testing, We want to see debug output on the console.
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=DEBUG, out
 
-#log4j.logger.org.apache.activemq=DEBUG
+# uncomment the next line to debug Camel
 log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
+
+#log4j.logger.org.springframework=WARN
+#log4j.logger.org.hibernate=WARN
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender
diff --git a/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml b/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
index ace49a9c84cc6..e60477e5471e7 100644
--- a/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
+++ b/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
@@ -31,6 +31,12 @@
       <property name=""hibernate.connection.password"" value=""""/>
       <property name=""hibernate.connection.url"" value=""jdbc:hsqldb:mem:camel_bam""/>
       <property name=""hibernate.hbm2ddl.auto"" value=""create""/>
+
+      <!-- debugging flags -->
+<!--
+      <property name=""hibernate.show_sql"" value=""true""/>
+      <property name=""hibernate.format_sql"" value=""true""/>
+-->
     </properties>
 
   </persistence-unit>"
cef50b097b3a9613534405f03c3b1e6aaa404f09,Delta Spike,"DELTASPIKE-398 add handling for @Dependent scoped beans.

This is important as we need a way to properly destroy them.
",c,https://github.com/apache/deltaspike,"diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java
index ca7d0c759..daea20b3d 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java
@@ -302,6 +302,33 @@ public static <T> List<T> getContextualReferences(Class<T> type,
         return result;
     }
 
+    public static <T> DependentProvider<T> getDependent(Class<T> type, Annotation... qualifiers)
+    {
+        BeanManager beanManager = getBeanManager();
+        Set<Bean<?>> beans = beanManager.getBeans(type, qualifiers);
+        Bean<?> bean = beanManager.resolve(beans);
+        return createDependentProvider(beanManager, type, (Bean<T>) bean);
+    }
+
+    public static <T> DependentProvider<T> getDependent(String name)
+    {
+        BeanManager beanManager = getBeanManager();
+        Set<Bean<?>> beans = beanManager.getBeans(name);
+        Bean<?> bean = beanManager.resolve(beans);
+        Class beanClass = bean.getBeanClass();
+
+        return createDependentProvider(beanManager, (Class<T>) beanClass, (Bean<T>) bean);
+    }
+
+    private static <T> DependentProvider<T> createDependentProvider(BeanManager beanManager, Class<T> type,
+                                                                    Bean<T> bean)
+    {
+        CreationalContext<T> cc = beanManager.createCreationalContext(bean);
+        T instance = (T) beanManager.getReference(bean, type, cc);
+
+        return new DependentProvider<T>(bean, cc, instance);
+    }
+
     /**
      * Get a set of {@link Bean} definitions by type independent of the qualifier.
      *
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java
new file mode 100644
index 000000000..a63fe8391
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * ""License""); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * ""AS IS"" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.api.provider;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.inject.Provider;
+
+/**
+ * A {@link Provider} for &#064;Dependent scoped contextual instances.
+ * We need this to be apble to properly clean them up when they are not
+ * needed anymore via the {@link #destroy()} method.
+ *
+ * Instances of this class can be retrieved using the {@link BeanProvider}.
+ */
+public class DependentProvider<T> implements Provider<T>
+{
+    private T instance;
+    private CreationalContext<T> creationalContext;
+    private Bean<T> bean;
+
+    DependentProvider(Bean<T> bean, CreationalContext<T> creationalContext, T instance)
+    {
+        this.bean = bean;
+        this.creationalContext = creationalContext;
+        this.instance = instance;
+    }
+
+    @Override
+    public T get()
+    {
+        return instance;
+    }
+
+    public void destroy()
+    {
+        bean.destroy(instance, creationalContext);
+    }
+}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
index 010b44e2a..abbeb9834 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
@@ -20,6 +20,7 @@
 
 
 import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.deltaspike.core.api.provider.DependentProvider;
 import org.apache.deltaspike.test.util.ArchiveUtils;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -196,10 +197,33 @@ public void injectBeansInNonManagedInstance() throws Exception
     }
 
     @Test
-    public void dependentBeanResolving() throws Exception
+    public void testDependentBeanResolving() throws Exception
     {
-        DependentTestBean dependentTestBean = BeanProvider.getContextualReference(DependentTestBean.class);
-        Assert.assertNotNull(dependentTestBean);
+        DependentProvider<DependentTestBean> dependentTestBeanProvider = BeanProvider.getDependent(DependentTestBean.class);
+        checkDependentProvider(dependentTestBeanProvider);
+    }
+
+    @Test
+    public void testNamedDependentBeanResolving() throws Exception
+    {
+        DependentProvider<DependentTestBean> dependentTestBeanProvider = BeanProvider.getDependent(""dependentTestBean"");
+        checkDependentProvider(dependentTestBeanProvider);
+    }
+
+    private void checkDependentProvider(DependentProvider<DependentTestBean> dependentTestBeanProvider)
+    {
+        Assert.assertNotNull(dependentTestBeanProvider);
+
+        DependentTestBean instance = dependentTestBeanProvider.get();
+        Assert.assertNotNull(instance);
+
+        Assert.assertEquals(42, instance.getI());
+        instance.setI(21);
+        Assert.assertEquals(21, instance.getI());
+
+        Assert.assertFalse(instance.isDestroyed());
+        dependentTestBeanProvider.destroy();
+        Assert.assertTrue(instance.isDestroyed());
     }
 
 }
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java
index 31630bb17..1bda0b448 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java
@@ -18,12 +18,16 @@
 */
 package org.apache.deltaspike.test.core.api.provider;
 
+import javax.annotation.PreDestroy;
 import javax.enterprise.context.Dependent;
+import javax.inject.Named;
 
 @Dependent
+@Named
 public class DependentTestBean
 {
     private int i = 42;
+    private boolean destroyed = false;
 
     public int getI()
     {
@@ -34,4 +38,14 @@ public void setI(int i)
     {
         this.i = i;
     }
+
+    public boolean isDestroyed()
+    {
+        return destroyed;
+    }
+
+    @PreDestroy
+    public void cleanUp() {
+        destroyed = true;
+    }
 }"
d01c679b68de847191b3f4592946eae9715a0136,Vala,"glib-2.0: mark return value of GLib.MappedFile.get_contents as unowned
",c,https://github.com/GNOME/vala/,"diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index b349aa10ba..bee2d1a647 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -2651,7 +2651,7 @@ namespace GLib {
 	public class MappedFile {
 		public MappedFile (string filename, bool writable) throws FileError;
 		public size_t get_length ();
-		public char* get_contents ();
+		public unowned char* get_contents ();
 	}
 
 	[CCode (cname = ""stdin"", cheader_filename = ""stdio.h"")]"